1.14 sync with develop (#3660)

* Rework tools.cmake and add C flags (#3110)

* Fix gh pages so that the doxygen files are uploaded (#3102)

* Add workspace path
* add debug
* Make one job so workspace files are available
* Put doxygen docs under docs folder in gh-pages

* Fix a misc warning in test/vol.c (#3112)

The compiler complains about using integers instead of size_t
for some sizes.

* Remove H5detect and H5make_libsettings (#3104)

Removes H5detect and H5make_libsettings from the build and replaces
their functionality with things that don't affect cross-compiling.

H5detect --> floating-point types are now detected on library load
H5make_libsettings --> Moved functionality to a new H5build_settings.c template file

* clang-tidy clang-analyzer-core issues addressed (#3113)

src/H5system.c:1293:13: warning: Dereference of null pointer
[clang-analyzer-core.NullDereference]
src/H5trace.c:4048:17: warning: Passed-by-value struct argument contains
uninitialized data (e.g., via the field chain: 'initial.user')
[clang-analyzer-core.CallAndMessage]

* Add note for issue 3056 (#3117)

* Use 1.14 toolchain (#3116)

* Remove the checkposix script (#3122)

This script was used to ensure that all non-HDF5 calls were prefixed
with 'HD'. We are removing this scheme so this script is no longer
needed.

* Remove unused HD macros (#3120)

* Remove unused HD macros
The library prefixes most C and POSIX API calls with 'HD'. We are
going to start removing these so the code looks like normal C.

This PR removes most of the unused HD markup macros.

* Replace ntohl/ntohs

* Adds an optional version arg to bin/format_source (#3119)

* Clean up mirror VFD code in utils dir (#3121)

* Remove dead code
* Replace mybzero with memset
* Replace hbool_t/TRUE/FALSE with bool/true/false

* Fix spelling issues flagged by codespell (#3130)

* Make autogen.sh output message consistent (#3128)

* Add Python for HDF-EOS zoo description (#3129)

* Fix function name in comment in ros3 VFD (#3131)

* Revert long double checks (#3133)

* Revert "Remove long double conversion work-arounds (#3097)"

This reverts commit 1e1dac1dac58fa18f6b7788346d1ba7d3315b0f9.

* Update comments to reflect newer systems

* Add java options to build scripts (#3127)

* Add java options to build scripts

Previously, cmakehdf5 turned on compiling of the java interface
by default due to a value set in cacheinit.cmake.

Now, consistent with how Fortran and CPP interfaces are handled,
the script overwrites this default value to disable the libraries,
fixing #2958.

I also implemented the --enable-java/--disable java options for
cmakehdf5, and -java for buildhdf5.

Allen said these scripts should mention that
compilers are to be specified in environment variables, but missing
compilers causes errors at the CMake level, and
CMake's error messages are already pretty informative (See the one
in #2958 about JAVA_COMPILER).

* Removed .lnt linter files (#3143)

These were last usefully modified in 2004

* Fix path to libhdf5.settings in cmakehdf5 (#3140)

* Many clang -Wextra-semi-stmt fixes (#2537)

* Adds semicolons to function-like macros
* Adds a do..while(0) loop to some macros
* Removes semicolons when inappropriate, especially H5E_TRY_BEGIN/END

* Remove HD prefix from network calls (#3142)

HDsocket(), etc. Only affects the mirror VFD and its test code.

* Remove hbool_t/TRUE/FALSE from java (#3145)

Replaces with bool/true/false

* CMake: (feature) ROS3 and cmake config file. (#3146)

- Added a cmake variable to the hdf5-config.cmake file which
  indicate if the library has been build with or without the
  read-only S3 functionality.

* Define minimal permissions for new GitHub workflows (#3147)

* Track s3 i/o when S3COMMS_DEBUG enabled (#3139)

* Track s3 i/o when S3COMMS_DEBUG enabled

* Fix the snapshots workflow (#3148)

* Add upload url as artifact
* Change doxygen path and comment log-url upload
* zip doxygen files for upload
* add workspace var

* chore: fix grammar (#3150)

* chore: fix grammar

* Removes the HD prefix from java C99 calls (#3149)

POSIX calls (HDstrndup, etc.) are unchanged

* Correct the zip usage (#3153)

* Many fixes to various compiler warnings (#3124)

* Fixed various -Wmissing-variable-declarations by adding static keyword
* In a few cases, renamed the variable suffix from _g to _s.
* Fixed some -Wmissing-variable-declarations by using different declaration macros
* Fixed various -Wconditional-uninitialized warnings by just initializing variable to zero
* Fixed various -Wcomma warnings
* Fixed clang -Wstrict-prototypes warnings
* Fixed various -Wunused-variable warnings
* Updated some casts to fix the only 3 -Wcast-qual warnings
* Fixed the only -Wsometimes-uninitialized warning

* Create Security Policy (#3152)

* Fix #1978 h5vers usage message. (#3162)

Update Platforms Tested in RELEASE.txt.

* speed-up building HDF5 (#3087)

Disables building the tests when building the netCDF, etc.

* Remove dead code behind #ifdef OLD_WAY (#3163)

* Remove H5F_evict_tagged_metadata() (#3165)

The rest of the library just calls H5AC_evict_tagged_metadata()
directly.

* Add missing space in zip command (#3167)

* Fixed check for a VOL's async compatibility  (#3164)

* cap flag fix in test

* added async comp. output

* Update Linux workflows (#3173)

* Consolidate environment setup
* Turn on ros3 VFD in CMake (Linux only)

* Add gh-pages doxygen link (#3175)

* Fix the doxygen to gh pages and artifact creation (#3176)

* Tidy the list of options in main.yml (#3181)

* Remove HD/hbool_t from fortran (#3182)

* Remove HD/hbool_t from high-level lib (#3183)

* Remove HDva_(arg|copy|end|start) (#3184)

* Drop HD prefix & hbool_t from H5TS (#3180)

* Remove HD from fork/exec*/wait* (#3190)

These are not C99 but are hidden behind ifdefs and are highly
unlikely to ever have non-POSIX equivalents.

* Fix assertion failure when attempting to use IOC VFD directly (#3187)

* Rename HDqsort() to qsort() (#3193)

* Rename HDqsort() to qsort()

* Committing clang-format changes

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Rename HDpipe() to pipe() (#3192)

Pipe is POSIX but implemented in Microsoft's CRT

* Rename HDassert() to assert() (#3191)

* Change HDassert to assert

* Fix bin/make_err

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

* Add note about HDF5_VOL_CONNECTOR to tools usage (#3159)

* Rename HDsystem() to system() (#3197)

system() is only used in the iopipe test and the things it calls
(which are POSIX-y) are protected by an ifdef.

* Remove HD from HDposix_memalign() (#3196)

The posix_memalign call is only used in the direct VFD, which can only
be built if posix_memalign() is available.

* Remove HD from memory allocate/free calls (#3195)

* HDcalloc
* HDfree
* HDmalloc
* HDrealloc

* chore: fix grammar (#3207)

* docs: remove redundancy in Data Transfer section of user guide (#3208)

* Remove checks for setsysinfo, which is unused (#3205)

* Autotools
* CMake

* Remove HD from protected POSIX calls (#3203)

These calls are non-C99 but protected by ifdefs and have no Windows
equivalents:
* HDalarm
* HDasprintf
* HDclock_gettime
* HDfcntl
* HDgethostname
* HDgetrusage
* HDsymlink

* Rename HDato*() to ato*() (#3201)

* Remove some "Programmer" comments (#3209)

These are meaningless noise.

Removes the "Programmer" lines on comment start lines:

    /* Programmer: John Smith

These complicate my sed script that will rip out the rest of
the comments.

* Rename HDexit() and related to exit(), etc. (#3202)

* HDatexit
* HDexit
* HD_exit

* Remove HD from strto* calls (#3204)

* HDstrtod
* HDstrtol
* HDstrtoll
* HDstrtoul
* HDstrtoull
* HDstrtoumax

* Remove HD from C std lib file ops (#3206)

* HDfclose
* HDferror
* HDfeof
* HDfflush
* HDfopen
* HDfread
* HDfwrite

* Remove programmer/date from comments (#3210)

* Removes Programmer: and Date: fields
* Fixes a few Modifications: fields leftover from previous work

* Remove HD from HDmem* calls (#3211)

* Remove HD from HDis* (e.g., isalpha) (#3212)

* HDisalnum
* HDisalpha
* HDiscntrl
* HDisdigit
* HDisgraph
* HDislower
* HDisprint
* HDispunct
* HDisspace
* HDisupper
* HDisxdigit

* Update actions for release option, fix branch for daily build (#3185)

* Update actions for release option, fix branch for daily build

* Scheduled workflows run on latest commit on the develop

* Add snapshots location

* docs: improve consistency in verb form (#3076) (#3188)

* fix gh action if statements (#3213)

* Adjust presets timeout and fix build script VS versions (#3215)

* Several ros3vfd logging improvements

* Committing clang-format changes

* Update COPYING (#3231)

Fixed old support URL.

* addresses compilation fortran warnings on Frontier (#3236)

* Fix doc for H5allocate_memory (#3240)

* merge bbrelease to release (#3232)

* merge bbrelease to release

* Fix pre-req workflow

* Replace support.hdfgroup.org URLs for alternative COPYING file (#3228)

* Replace support.hdfgroup.org URLs for alternative COPYING file
locations in copyright headers with https://www.hdfgroup.org/licenses.
Replace  support.hdfgroup.org URL for alternative COPYING_LBNL_HDF5
with github URL.
Tweak chkcopyright script for change from UICOPYRIGHTSTR to
THGCOPYRIGHTSTR.

* Replace 1_10 reference with develop branch (#3227)

* Switch CI to use release script (#3242)

* Subfiling VFD source cleanup (#3241)

* Subfiling VFD source cleanup

Modularize Subfiling CMake code into separate CMakeLists.txt file

Update Mercury util code to latest version and update Copyright

Generate mercury_util_config.h header file instead of using
pre-generated file

Remove unnecessary Mercury functionality

Fix minor warning in Subfiling VFD code

* Remove Mercury headers from Autotools publicly-distributed header list

* install h5fuse.sh in bin dir. (#3244)

* Disable h5py until fixed properly without spack (#3243)

* ROS3: (feature) Temporary security credentials (#3030)

- Implemented support for AWS temporary security credentials.
  For this kind of credentials also a session/security token
  should be included in the request by adding the
  x-amz-security-token header.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Co-authored-by: Jordan Henderson <jhenderson@hdfgroup.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Avoid truncating at null byte when copying to std::string (#3083)



---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix CMake builds when Subfiling VFD isn't enabled (#3250)

* Fix CMake builds when Subfiling VFD isn't enabled

* Add Subfiling VFD entry to hdf5-config.cmake.in

* Fix some warnings in developer builds (#3247)

* Fix some warnings in developer builds

* Switch approach to Winline flag

* Fixed more warnings about extra semicolons (#3249)

* Require semi-colon after H5_CHECK_OVERFLOW calls



Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix warning in H5C__UPDATE_STATS_FOR_DIRTY_PIN macro (#3259)

Add braces to H5C__UPDATE_STATS_FOR_DIRTY_PIN macro to fix warning
causing Werror Release builds to fail

* Update DEFAULT_API_VERSION documentation for CMake (#3255)

* Update DEFAULT_API_VERSION documentation for CMake

* Fix hint

---------

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* changed the scope of #ifdef DOXYGEN to now include H5D multi-functions (#3254)

* Option changed but not all references (#3252)

* Option changed but not all references

* remove quotes from binary var

* Move 1.12.3 release to October (#3263)

* Fixed some -Wunused-variable warnings and one Wsometimes-uninitialized warning (#3260)

* removed the use of encoded single apostrophe (#3261)

* removed the use of encoded single apostrophe, and fix H5Dread_chunk from write to read

* updated sanitizer paragraph
* fixed brief description for H5Fget_info

* ROS3: (fix) Replaced HDfprintf (#3266)

- Replaced the HDfprintf() functions by fprintf() to be consistent
  with other parts of the library.

* chore: make VRFY output consistent (#3268)

* CMake: (fix) Threads dependency (#3267)

- If the HDF5 library has been build with either thread-safety or
  subfiling VFD feature on it will have an additional dependency
  on a threading library. This dependency has been added to the
  hdf-config.cmake.in file.

* chore: fix grammar - get hang -> get hung (#3272)

* Another round of fixing -Wextra-semi-stmt warnings (#3264)



Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* chore: fix typo - persent -> present (#3273)

* Remove py-pip from h5py action (#3265)

* Update release schedule (#3317)

* Move 1.12.3 to November
* Add 1.14.3 in October

* Update README.md w/ 1.4.3 info (#3318)

* Switch parallel compression to use vector I/O (#3245)

Updates parallel compression feature to use vector I/O instead of
creating and passing down MPI derived types to VFD

* Fix incorrect error check in H5Ofill.c for undefined fill values (#3312)

* Fix H5Otoken_to_str call in h5dump and other minor cleanup (#3314)

* Fix loading plugin fails with missing directory GH issue #3248 (#3315)

* Made HGOTO_ERROR a do-while loop (#3308)

* Made HGOTO_ERROR a do-while loop

* Update files to skip list and ignore_words_list  (#3321)

* Update files to skip list and ignore_words_list for codespell to not
check files generated by autotools.  Autotools generate misspellings
that can't be fixed in HDF5 code.

* Windows runtime items go into the bin folder (#3320)

* A couple of documentation items to fix (#3332)

* Fix h5repack for variable-length datatyped datasets (#3331)

* Fix CVE-2018-11202 (#3330)

A malformed file could result in chunk index memory leaks. Under most
conditions (i.e., when the --enable-using-memchecker option is NOT
used), this would result in a small memory leak and and infinite loop
and abort when shutting down the library. The infinite loop would be
due to the "free list" package not being able to clear its resources
so the library couldn't shut down. When the "using a memory checker"
option is used, the free lists are disabled so there is just a memory
leak with no abort on library shutdown.

The chunk index resources are now correctly cleaned up when reading
misparsed files and valgrind confirms no memory leaks.

* Fix CVE-2018-13867 (#3336)

* Fixes the last of the -Wextra-semi-stmt warnings (#3326)

* Fixed extra semi warning by adjusting alternative macro definitions

* Find-replace H5E_END_TRY; -> H5E_END_TRY

* Made H5Epush_goto a do-while loop, fixed indentation

* Made GOTOERROR and ERRMSG do-while loops

* Made Hgoto_error and Hgoto_done  do-while loops

* Made vrfy_cint_type and vrfy_ctype  do-while loops

* Made TEST_TYPE_CONTIG and others do-while loops

* Removed extraneous semi-colons

* Committing clang-format changes

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix a typo in RELEASE.txt

* Fix assertion failure in H5D__mpio_collective_filtered_vec_io (#3340)

* Make h5dump spacing consistent when printing VLEN datatype (#3351)

* Fix for the bug exposed from running test/set_extent.c when selection… (#3319)

* Fix for the bug exposed from running test/set_extent.c when selection I/O is enabled.
This is a fix from Neil.
The test/set_extent.c is modified to test for selection I/O enabled.

* Add Fortran ES module to deploy list (#3341)

* Add Fortran ES module to deploy list

* Change fortran mod file export to use a list of names

* test(parallel): verify FALSE case (#3356)

* Implementation of the mpio driver with selection I/O. (#3222)

* This changes the default selection I/O to on for MPIO.

* Work around a testphdf5 failure on Cray MPICH machines (#3361)

* set H5_PAC_C_MAX_REAL_PRECISION default to 0 when cross sompiling with (#3364)

CMake to fix Fortran build failures.

* Add RELEASE.txt notes for recent selection I/O work. (#3374)

* Fix possible performance regression introduced with in-place type conversion in 1.14.2 (#3376)

* Correct script (#3377)

* Correct CI settings (#3384)

* Correct CI settings

* Correct plugin file name

* restore CI tarball name prefix to match bin/release (#3385)

* Fix assertion failure during file close on error (#3387)

* Fix compile failures with H5C_DO_MEMORY_SANITY_CHECKS enabled (#3388)

* Fix valgrind warning about write of uninitialized bytes (#3389)

* Fix valgrind warning about write of uninitialized bytes in ScaleOffset filter (#3390)

* Update presets, examples uncompress, szip cache (#3391)

* Fix serial to parallel chunked dataset file space allocation bug (#3394)

* chore: fix typo (#3405)

* Fix for CVE-2016-4332 (#3406)

This CVE issue was previously listed as fixed (via HDFFV-9950) back in
2016, but with no confirmation test. Now that test files exist for
the 2016 Talos CVE issues, we found that CVE-2016-4332 can raise an
assert in debug builds.

This fix replaces the assert with pointer checks that don't raise
errors or asserts. Since the function is in cleanup code, we do our
best to close and free things, even when presented with partially-
initialized structs.

Fixes CVE-2016-4332 and HDFFV-9950 (confirmed via the cve_hdf5 repo)

* Fix ph5diff tests for MPIEXEC_MAX_NUMPROCS=1 (#3407)

* Enable szip by default in Autotools (#3412)

Since libaec is so prevalent and BSD-licensed for both encode and
decode, we build the szip filter by default when the szip or aec
libraries are found.

* Re-enable SZIP default to ON in CMake (#3414)

The Autotools were handled in a separate commit

* Fix Heap-buffer-overflow WRITE in H5MM_memcpy (#3368)

* Add Intel oneAPI actions (#2949) (#2977)

* ci: add Intel oneAPI actions (#2949)

* ci: fix CMake installation

* ci: use absolute paths for libtool installation

* ci(oneAPI): update compiler versions and use cron

* Add RELEASE.txt entry for compound performance regression fix (#3376) (#3416)

* chore: remove gubbins comment (#3420)

* Add other types and full type to enum/str/vlen dataformat for structblock[begin/end] (#3353)

* Avoid H5Ocopy in h5repack for variable-length string types (#3419)

* Skip atomicity tests for OpenMPI major versions < 5 (#3421)

* Fix an issue with use of uninitialized memory in trefer_deprec.c test (#3422)

* Add parallel examples in doxygen (#3413)

* Fix use of uninitialized value in testpar/t_dset.c test (#3423)

* Remove extraneous "33" in RELEASE.txt (#3425)

* Revise file close assertion failure fix (#3418)

* Remove intel oneapi warning (#3426)

* Fix for CVE-2018-15671.  h5stat -S $POC will result in a crash with segmenetation fault. (#3427)

It is because the object in the testfile points back to the root group.
When the tool tries to traverse the object, it goes back to the root group and then back again.

* chore: match function call and VRFY() output (#3428)

* Fix the Fortran extension used in example links (#3430)

* Put H5T_CONV_ab macros in do..while loops (#3432)

Ever since a recent round of macro cleanup, bin/trace and clang-format
have been bickering over what H5Tconv.c should look like and neither
produces readable code.

This change puts the top-level H5T_CONV_ab macros in do..while loops,
adds appropriate semicolons, and adds the missing H5_CLANG_DIAG_ON|OFF
and H5_GCC_CLANG_DIAG_ON|OFF macros to the list of statement macros
clang-format recognizes. H5Tconv.c is now readable and both bin/trace
and clang-format are happy.

* Convert some H5MM calls to standard C equivalents (#2382)

* H5MM_calloc and malloc are now mapped to stdlib C calls
* H5MM_memcpy now maps directly to memcpy in release builds
* H5MM_memcpy is still implemented as a separate function that
   checks for buffer overlap when H5MM_DEBUG is defined
   (default w/ debug builds)
* Switches many library memcpy calls to use H5MM_memcpy
* Fixes a possible zero allocation in H5Olayout.c

* Add 1.14.4 to the release schedule (#3434)

* Output stderr file in CMake testing on failure (#3431)

* Add Intel oneAPI badges (#3433)

* Add a CVE regression test action (#3445)

*

* Disable SZIP for Intel oneAPI Action (#3449)

* Disable SZIP for Intel oneAPI Action

* Disable Fortran and parallel

* Update VOL CMake for REST VOL (#3450)

* Update VOL CMake for REST VOL

* Prevent linking static libs to VOLs

* Add an h5py badge to README.md (#3477)

* Removed all the ranks printing out testing information (#3457)

* Fix Subfiling VFD IOC assignment bug (#3456)

* Correct java test dimension (#3482)

* Support CMake VOL builds with FetchContent from local directory (#3455)

* Update VOL CMake for REST VOL

* Prevent linking static libs to VOLs

* index on fetch_local: 5c5c3f1505 Prevent linking static libs to VOLs

* index on (no branch): 9a36d3e7b1 On fetch_local: WIP:add source dir fetch option for vols

* Allow building of VOL from local source

* Move LOCAL_DIR option to HDF5_VOL_ALLOW_EXTERNAL

* Fix the Fortran include dir in install config files (#3454)

* Convert hbool_t --> bool in examples (#3492)

* Fix some minor formatting for consistency (#3499)

* Create scorecard.yml (#3508)

Bring in OSSF Scorecard code scanner as a GitHub action

* Convert hbool_t --> bool in testpar (#3495)

* hbool_t/TRUE/FALSE --> bool/true/false in tools (#3491)

* Convert hbool_t --> bool in test (#3494)

* Convert hbool_t --> bool in src (#3496)

* hbool_t --> bool in src

* Does not remove TRUE/FALSE
* Public header files are unchanged
* Public API calls are unchanged

* TRUE/FALSE --> true/false in src

* Add deprecation notice for hbool_t

* Added new Fortran API wrappers (#3511)

* Added new wrappers for
h5get_free_list_sizes_f
H5Sselect_intersect_block_f
H5Sselect_shape_same_f
h5pget_no_selection_io_cause_f
h5pget_mpio_no_collective_cause_f
H5Lvisit_by_name_f
H5Lvisit_f
H5Fget_info_f
h5dwrite_chunk_f
h5dread_chunk_f

* added h5pget_file_space_page_size_f, h5pset_file_space_page_size_f, h5pget_file_space_strategy_f, h5pset_file_space_strategy_f, h5info tests

* added fortran tests

* Update tH5F.F90

* misc. fortran fixes for failing CI dailty tests (#3523)

* fixed H5Lvisit* interface

* changed integer type for direct write

* Consistent initialization of hid_t in the tests (#3521)

* Fix windows cpack with debug (#3525)

* Add missing row for the ROS3 VFD in table #3415 (#3517)

* fixed nvidia compiler issue (#3527)

* Identify functions in a subgroup (#3530)

* quiet warning on sunspot (gcc 11.2.0) (#3534)

* Add API examples doxygen page (#3500)

* removed C_INT32_T from Fortran APIs (#3537)

* Add NVHPC 23.7 GitHub Actions (#3509)

* Add NVHPC 27.3 GitHub Actions

* Address @derobins review

* Remove HD prefix from math functions (#3538)

* Remove HD prefix from HDlog10 calls (#3539)

Was missed in a previous commit and causes building subfiling to
fail.

* fixed arg to C H5Dwrite_chunk (#3541)

* Strip HD prefix from string/char C API calls (#3540)

* Strip HD prefix from string/char C API calls

* HD(f)(put|get)(s|c)
* HDstr*
* HDv*printf
* HD(s)(print|scan)f
* HDperror

But NOT:

* HDstrcase*
* HDvasprintf
* HDstrtok_r
* HDstrndup

As those are not C99 and have portability work-around
implementations. They will be handled later.

* Fix th5_system.c screwup

* Convert main.yml CI into callable workflows (#3529)

* Fix broken URL. (#3546)

* Fix grammar (#3545)

* Update oneAPI-C/A badge yml links. (#3564)

* Check return values from HDF5 API calls. (#3556)

* Adds link to h5fuse.sh in testpar for autotools (#3557)

* Make the h5fuse.sh utility available to parallel subfiling tests so h5fuse testing is not skipped.

* Some minor formatting and text changes (#3563)

* Fix typos and grammar in t_pread. (#3565)

* Fix typo (givin->given) in test/testframe.c. (#3567)

* Fix ifx unused variable hdferr warning. (#3568)

* Correct comments about H5Z_FILTER_NONE (#3572)

* Update release script. (#3577)

* fixed function declaration (#3579)

* Fixed GH-3554 (#3584)

Removed the extra condition

* Remove h5dwalk.1 man page. (#3589)

* Removed the use of -commons linking option on Darwin (#3581)

Removed the use of -commons linking option on Darwin as COMMON and EQUIVALENCE is no long used

* Fix docs for H5Pset_dxpl_mpio_collective_opt() (#3594)

* Fix typo: arange->arrange in src/H5Cmpio.c. (#3597)

* Fix docs for H5Acreate2 and H5Acreate_by_name (#3598)

* Use HDoff_t with lseek consistently (#3600)

lseek on Windows uses __int64 for both the offset and return type
instead of off_t like most POSIX systems. This changes ensures we
use HDoff_t (which is typdef'd correctly on Windows) w/ lseek.

* Replaces HDgetenv with getenv (#3599)

* Develop tools move (#3580)

Reorganizes the tools files to support the VOL tests

* Clean up Subfiling VFD header doxygen formatting (#3601)

* Remove `sh` to run bash script. (#3590)

* Correct path name of ddl file to be changed (#3607)

* Fix potential uninitialized variable (#3602)

Moves a union initialization up a bit so it's performed before code
that can jump to the cleanup target, where file descriptors could
be checked without being initialized.

This could only happen in test code and only in an out-of-memory
situation.

Fixes Coverity 1542254

* Remove unnecessary assignment in test generator (#3603)

Fixes what looks like a copy/paste/modify error in the format convert
test file generator, where an array element is assigned one value
and them immediately overwritten by another value.

Fixes Coverity issue 1542285

* Remove useless define TRUE/FALSE statements. (#3604)

* Fix typo behaviour and dependes. (#3605)

* Fix typos (#3609)

* Fixed unused variable in H5CS.c (#3552) (#3612)

* Fixed #3552

* Fix grammar (#3614)

* Cleanup unused statements (#3553) (#3617)

Removed unnecessary assert statements and noise comments.

* Fix Intel oneAPI icc warning (#3619)

* Fix several spelling/grammar issues (#3621)

* Add HPC CDash to README.md (#3623)

* Disable static + thread-safe on Windows w/ CMake (#3622)

The thread-safety feature on Windows requires a hook in DllMain() and
thus is only available when HDF5 is built as a shared library.

This was previously a warning, but has now been elevated to a fatal
error that cannot be overridden with ALLOW_UNSUPPORTED.

Fixes GitHub #3613

* Remove unused member from H5D_shared_t struct. (#3628)

* Remove old EXTERNALPROJECT_ADD in favor of FETCH_CONTENT (#3624)

* Fix grammar (#3635)

* Disambiguate error output messages. (#3634)

* Disambiguate error output messages.

* Address @brtnfld review.

* Fail CMake on Windows when sub-filing VFD is enabled (#3636)

* Improve consistency in past tense usage (#3638)

* Split out test logic to separate file (#3639)

* Drop MPI-2 support (#3643)

* Switch IEEE flags for NAG Fortran (#3644)

Default is -ieee=stop, which causes problems when the H5T
module performs floating-point type introspection.

The new mode is -ieee=full

* Remove 1.10.11 info from README.md (#3646)

* Fixes GH#1027 compilation error (#3654)

* Remove 1.10 badge (#3650)

* Use real URLs and updated names for plugins (#3651)

* synchronize TGZ naming convention/usage

* Update parallel compression feature to support multi-dataset I/O (#3591)

* Add more tests for selection I/O. (#3528)

* Adjust 1.14 files after merging

---------

1110 files changed, 4721 insertions, 4666 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 502b2ec..924f9f3 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -183,7 +183,7 @@ is_exclude_path(char *path, h5trav_type_t type, diff_opt_t *opts)
     while (NULL != exclude_path_ptr) {
         /* if exclude path is in group, exclude its members as well */
         if (exclude_path_ptr->obj_type == H5TRAV_TYPE_GROUP) {
-            ret_cmp = HDstrncmp(exclude_path_ptr->obj_path, path, HDstrlen(exclude_path_ptr->obj_path));
+            ret_cmp = strncmp(exclude_path_ptr->obj_path, path, strlen(exclude_path_ptr->obj_path));
             if (ret_cmp == 0) { /* found matching members */
                 size_t len_grp;
 
@@ -192,7 +192,7 @@ is_exclude_path(char *path, h5trav_type_t type, diff_opt_t *opts)
                  * This verifies if “/grp1/dset1” is only under “/grp1”, but
                  * not under “/grp1xxx/” group.
                  */
-                len_grp = HDstrlen(exclude_path_ptr->obj_path);
+                len_grp = strlen(exclude_path_ptr->obj_path);
                 if (path[len_grp] == '/') {
                     /* belong to excluded group! */
                     ret_value = 1;
@@ -202,7 +202,7 @@ is_exclude_path(char *path, h5trav_type_t type, diff_opt_t *opts)
         }
         /* exclude target is not group, just exclude the object */
         else {
-            ret_cmp = HDstrcmp(exclude_path_ptr->obj_path, path);
+            ret_cmp = strcmp(exclude_path_ptr->obj_path, path);
             if (ret_cmp == 0) { /* found matching object */
                 /* excluded non-group object */
                 ret_value = 1;
@@ -247,7 +247,7 @@ is_exclude_attr(const char *path, h5trav_type_t type, diff_opt_t *opts)
     while (NULL != exclude_ptr) {
         /* if exclude path is in group, exclude its members as well */
         if (exclude_ptr->obj_type == H5TRAV_TYPE_GROUP) {
-            ret_cmp = HDstrncmp(exclude_ptr->obj_path, path, HDstrlen(exclude_ptr->obj_path));
+            ret_cmp = strncmp(exclude_ptr->obj_path, path, strlen(exclude_ptr->obj_path));
             if (ret_cmp == 0) { /* found matching members */
                 size_t len_grp;
 
@@ -256,7 +256,7 @@ is_exclude_attr(const char *path, h5trav_type_t type, diff_opt_t *opts)
                  * This verifies if “/grp1/dset1” is only under “/grp1”, but
                  * not under “/grp1xxx/” group.
                  */
-                len_grp = HDstrlen(exclude_ptr->obj_path);
+                len_grp = strlen(exclude_ptr->obj_path);
                 if (path[len_grp] == '/') {
                     /* belong to excluded group! */
                     ret_value = 1;
@@ -266,7 +266,7 @@ is_exclude_attr(const char *path, h5trav_type_t type, diff_opt_t *opts)
         }
         /* exclude target is not group, just exclude the object */
         else {
-            ret_cmp = HDstrcmp(exclude_ptr->obj_path, path);
+            ret_cmp = strcmp(exclude_ptr->obj_path, path);
             if (ret_cmp == 0) { /* found matching object */
                 /* excluded non-group object */
                 ret_value = 1;
@@ -368,11 +368,11 @@ build_match_list(const char *objname1, trav_info_t *info1, const char *objname2,
     H5TOOLS_DEBUG("objname1 = %s objname2 = %s ", objname1, objname2);
 
     /* if obj1 is not root */
-    if (HDstrcmp(objname1, "/") != 0)
-        path1_offset = HDstrlen(objname1);
+    if (strcmp(objname1, "/") != 0)
+        path1_offset = strlen(objname1);
     /* if obj2 is not root */
-    if (HDstrcmp(objname2, "/") != 0)
-        path2_offset = HDstrlen(objname2);
+    if (strcmp(objname2, "/") != 0)
+        path2_offset = strlen(objname2);
 
     /*--------------------------------------------------
      * build the list
@@ -384,7 +384,7 @@ build_match_list(const char *objname1, trav_info_t *info1, const char *objname2,
         type2_l  = info2->paths[curr2].type;
 
         /* criteria is string compare */
-        cmp = HDstrcmp(path1_lp, path2_lp);
+        cmp = strcmp(path1_lp, path2_lp);
         if (cmp == 0) {
             if (!is_exclude_path(path1_lp, type1_l, opts)) {
                 infile[0] = 1;
@@ -508,7 +508,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
             }
             else if (ret_value == 0) {
                 /* no dangling link option given and detect dangling link */
-                tinfo->symlink_visited.dangle_link = TRUE;
+                tinfo->symlink_visited.dangle_link = true;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
                     opts->err_stat = H5DIFF_ERR; /* make dangling link is error */
@@ -523,7 +523,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
             if (symlink_visit_add(&(tinfo->symlink_visited), linfo->type, NULL, lnk_info.trg_path) < 0)
                 H5TOOLS_GOTO_DONE(SUCCEED);
 
-            if (h5trav_visit(tinfo->fid, path, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, tinfo,
+            if (h5trav_visit(tinfo->fid, path, true, true, trav_grp_objs, trav_grp_symlinks, tinfo,
                              H5O_INFO_BASIC) < 0) {
                 parallel_print("Error: Could not get file contents\n");
                 opts->err_stat = H5DIFF_ERR;
@@ -537,7 +537,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
             }
             else if (ret_value == 0) {
                 /* no dangling link option given and detect dangling link */
-                tinfo->symlink_visited.dangle_link = TRUE;
+                tinfo->symlink_visited.dangle_link = true;
                 trav_info_visit_lnk(path, linfo, tinfo);
                 if (opts->no_dangle_links)
                     opts->err_stat = H5DIFF_ERR; /* make dangling link is error */
@@ -555,7 +555,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata)
             if (symlink_visit_add(&(tinfo->symlink_visited), linfo->type, ext_fname, ext_path) < 0)
                 H5TOOLS_GOTO_DONE(SUCCEED);
 
-            if (h5trav_visit(tinfo->fid, path, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, tinfo,
+            if (h5trav_visit(tinfo->fid, path, true, true, trav_grp_objs, trav_grp_symlinks, tinfo,
                              H5O_INFO_BASIC) < 0) {
                 parallel_print("Error: Could not get file contents\n");
                 opts->err_stat = H5DIFF_ERR;
@@ -703,47 +703,47 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     /* if any object is specified */
     if (objname1) {
         /* make the given object1 fullpath, start with "/"  */
-        if (HDstrncmp(objname1, "/", 1) != 0) {
+        if (strncmp(objname1, "/", 1) != 0) {
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if (asprintf(&obj1fullname, "/%s", objname1) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
 #else  /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
-            if ((obj1fullname = (char *)malloc(HDstrlen(objname1) + 2)) == NULL)
+            if ((obj1fullname = (char *)malloc(strlen(objname1) + 2)) == NULL)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
 
-            HDstrcpy(obj1fullname, "/");
-            HDstrcat(obj1fullname, objname1);
+            strcpy(obj1fullname, "/");
+            strcat(obj1fullname, objname1);
 #endif /* H5_HAVE_ASPRINTF */
         }
         else
-            obj1fullname = HDstrdup(objname1);
+            obj1fullname = strdup(objname1);
         H5TOOLS_DEBUG("obj1fullname = %s", obj1fullname);
 
         /* make the given object2 fullpath, start with "/" */
-        if (HDstrncmp(objname2, "/", 1) != 0) {
+        if (strncmp(objname2, "/", 1) != 0) {
 #ifdef H5_HAVE_ASPRINTF
             /* Use the asprintf() routine, since it does what we're trying to do below */
             if (asprintf(&obj2fullname, "/%s", objname2) < 0)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
 #else  /* H5_HAVE_ASPRINTF */
             /* (malloc 2 more for "/" and end-of-line) */
-            if ((obj2fullname = (char *)malloc(HDstrlen(objname2) + 2)) == NULL)
+            if ((obj2fullname = (char *)malloc(strlen(objname2) + 2)) == NULL)
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "name buffer allocation failed");
-            HDstrcpy(obj2fullname, "/");
-            HDstrcat(obj2fullname, objname2);
+            strcpy(obj2fullname, "/");
+            strcat(obj2fullname, objname2);
 #endif /* H5_HAVE_ASPRINTF */
         }
         else
-            obj2fullname = HDstrdup(objname2);
+            obj2fullname = strdup(objname2);
         H5TOOLS_DEBUG("obj2fullname = %s", obj2fullname);
 
         /*----------------------------------------------------------
          * check if obj1 is root, group, single object or symlink
          */
         H5TOOLS_DEBUG("h5diff check if obj1=%s is root, group, single object or symlink", obj1fullname);
-        if (!HDstrcmp(obj1fullname, "/")) {
+        if (!strcmp(obj1fullname, "/")) {
             obj1type = H5TRAV_TYPE_GROUP;
         }
         else {
@@ -793,7 +793,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
          * check if obj2 is root, group, single object or symlink
          */
         H5TOOLS_DEBUG("h5diff check if obj2=%s is root, group, single object or symlink", obj2fullname);
-        if (!HDstrcmp(obj2fullname, "/")) {
+        if (!strcmp(obj2fullname, "/")) {
             obj2type = H5TRAV_TYPE_GROUP;
         }
         else {
@@ -843,9 +843,9 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     else {
         H5TOOLS_DEBUG("h5diff no object specified");
         /* set root group */
-        obj1fullname = (char *)HDstrdup("/");
+        obj1fullname = (char *)strdup("/");
         obj1type     = H5TRAV_TYPE_GROUP;
-        obj2fullname = (char *)HDstrdup("/");
+        obj2fullname = (char *)strdup("/");
         obj2type     = H5TRAV_TYPE_GROUP;
     }
 
@@ -961,7 +961,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
 
     both_objs_grp = (obj1type == H5TRAV_TYPE_GROUP && obj2type == H5TRAV_TYPE_GROUP);
     if (both_objs_grp) {
-        H5TOOLS_DEBUG("h5diff both_objs_grp TRUE");
+        H5TOOLS_DEBUG("h5diff both_objs_grp true");
         /*
          * traverse group1
          */
@@ -969,7 +969,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         /* optional data pass */
         info1_grp->opts = (diff_opt_t *)opts;
 
-        if (h5trav_visit(file1_id, obj1fullname, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, info1_grp,
+        if (h5trav_visit(file1_id, obj1fullname, true, true, trav_grp_objs, trav_grp_symlinks, info1_grp,
                          H5O_INFO_BASIC) < 0) {
             parallel_print("Error: Could not get file contents\n");
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not get file contents");
@@ -983,7 +983,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
         /* optional data pass */
         info2_grp->opts = (diff_opt_t *)opts;
 
-        if (h5trav_visit(file2_id, obj2fullname, TRUE, TRUE, trav_grp_objs, trav_grp_symlinks, info2_grp,
+        if (h5trav_visit(file2_id, obj2fullname, true, true, trav_grp_objs, trav_grp_symlinks, info2_grp,
                          H5O_INFO_BASIC) < 0) {
             parallel_print("Error: Could not get file contents\n");
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "Could not get file contents");
@@ -996,13 +996,13 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
     if (g_Parallel) {
         int i;
 
-        if ((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME)) {
+        if ((strlen(fname1) > MAX_FILENAME) || (strlen(fname2) > MAX_FILENAME)) {
             fprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME);
             MPI_Abort(MPI_COMM_WORLD, 0);
         } /* end if */
 
-        HDstrcpy(filenames[0], fname1);
-        HDstrcpy(filenames[1], fname2);
+        strcpy(filenames[0], fname1);
+        strcpy(filenames[1], fname2);
 
         /* Alert the worker tasks that there's going to be work. */
         for (i = 1; i < g_nTasks; i++)
@@ -1028,7 +1028,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
 
             parallel_print("\n");
             /* if given objects is group under root */
-            if (HDstrcmp(obj1fullname, "/") != 0 || HDstrcmp(obj2fullname, "/") != 0)
+            if (strcmp(obj1fullname, "/") != 0 || strcmp(obj2fullname, "/") != 0)
                 parallel_print("group1   group2\n");
             else
                 parallel_print("file1     file2\n");
@@ -1126,9 +1126,9 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
      * if not root, prepare object name to be pre-appended to group path to
      * make full path
      */
-    if (HDstrcmp(grp1, "/") != 0)
+    if (strcmp(grp1, "/") != 0)
         grp1_path = grp1;
-    if (HDstrcmp(grp2, "/") != 0)
+    if (strcmp(grp2, "/") != 0)
         grp2_path = grp2;
 
     /*-------------------------------------------------------------------------
@@ -1186,13 +1186,13 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                     H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
                 }
 #else  /* H5_HAVE_ASPRINTF */
-            if ((obj1_fullpath = (char *)malloc(HDstrlen(grp1_path) + HDstrlen(table->objs[i].name) + 1)) ==
+            if ((obj1_fullpath = (char *)malloc(strlen(grp1_path) + strlen(table->objs[i].name) + 1)) ==
                 NULL) {
                 H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
             }
             else {
-                HDstrcpy(obj1_fullpath, grp1_path);
-                HDstrcat(obj1_fullpath, table->objs[i].name);
+                strcpy(obj1_fullpath, grp1_path);
+                strcat(obj1_fullpath, table->objs[i].name);
             }
 #endif /* H5_HAVE_ASPRINTF */
                 H5TOOLS_DEBUG("diff_match path1 - %s", obj1_fullpath);
@@ -1204,22 +1204,22 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                     H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
                 }
 #else  /* H5_HAVE_ASPRINTF */
-            if ((obj2_fullpath = (char *)malloc(HDstrlen(grp2_path) + HDstrlen(table->objs[i].name) + 1)) ==
+            if ((obj2_fullpath = (char *)malloc(strlen(grp2_path) + strlen(table->objs[i].name) + 1)) ==
                 NULL) {
                 H5TOOLS_ERROR(H5DIFF_ERR, "name buffer allocation failed");
             }
             else {
-                HDstrcpy(obj2_fullpath, grp2_path);
-                HDstrcat(obj2_fullpath, table->objs[i].name);
+                strcpy(obj2_fullpath, grp2_path);
+                strcat(obj2_fullpath, table->objs[i].name);
             }
 #endif /* H5_HAVE_ASPRINTF */
                 H5TOOLS_DEBUG("diff_match path2 - %s", obj2_fullpath);
 
                 /* get index to figure out type of the object in file1 */
-                while (info1->paths[idx1].path && (HDstrcmp(obj1_fullpath, info1->paths[idx1].path) != 0))
+                while (info1->paths[idx1].path && (strcmp(obj1_fullpath, info1->paths[idx1].path) != 0))
                     idx1++;
                 /* get index to figure out type of the object in file2 */
-                while (info2->paths[idx2].path && (HDstrcmp(obj2_fullpath, info2->paths[idx2].path) != 0))
+                while (info2->paths[idx2].path && (strcmp(obj2_fullpath, info2->paths[idx2].path) != 0))
                     idx2++;
 
                 /* Set argdata to pass other args into diff() */
@@ -1246,14 +1246,14 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id,
                      */
 
                     /*Set up args to pass to worker task. */
-                    if (HDstrlen(obj1_fullpath) > 255 || HDstrlen(obj2_fullpath) > 255) {
+                    if (strlen(obj1_fullpath) > 255 || strlen(obj2_fullpath) > 255) {
                         printf("The parallel diff only supports object names up to 255 characters\n");
                         MPI_Abort(MPI_COMM_WORLD, 0);
                     } /* end if */
 
                     /* set args struct to pass */
-                    HDstrcpy(args.name1, obj1_fullpath);
-                    HDstrcpy(args.name2, obj2_fullpath);
+                    strcpy(args.name1, obj1_fullpath);
+                    strcpy(args.name2, obj2_fullpath);
                     args.opts                   = *opts;
                     args.argdata.type[0]        = info1->paths[idx1].type;
                     args.argdata.type[1]        = info2->paths[idx2].type;
@@ -1534,9 +1534,9 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
     hid_t         type2_id        = H5I_INVALID_HID;
     hid_t         grp1_id         = H5I_INVALID_HID;
     hid_t         grp2_id         = H5I_INVALID_HID;
-    hbool_t       is_dangle_link1 = FALSE;
-    hbool_t       is_dangle_link2 = FALSE;
-    hbool_t       is_hard_link    = FALSE;
+    bool          is_dangle_link1 = false;
+    bool          is_dangle_link2 = false;
+    bool          is_hard_link    = false;
     hsize_t       nfound          = 0;
     h5trav_type_t object_type;
     diff_err_t    ret_value = opts->err_stat;
@@ -1577,7 +1577,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error");
             }
             else
-                is_dangle_link1 = TRUE;
+                is_dangle_link1 = true;
         }
 
         /* target object2 - get type and name */
@@ -1592,7 +1592,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
                 H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "dangling link is error");
             }
             else
-                is_dangle_link2 = TRUE;
+                is_dangle_link2 = true;
         }
 
         /* found dangling link */
@@ -1810,7 +1810,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_
              */
         case H5TRAV_TYPE_LINK: {
             H5TOOLS_DEBUG("H5TRAV_TYPE_LINK 1:%s  2:%s ", path1, path2);
-            status = HDstrcmp(linkinfo1.trg_path, linkinfo2.trg_path);
+            status = strcmp(linkinfo1.trg_path, linkinfo2.trg_path);
 
             /* if the target link name is not same then the links are "different" */
             nfound = (status != 0) ? 1 : 0;
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index d16c855..12bf56a 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -27,7 +27,7 @@
  *------------------------------------------------------------------------*/
 typedef struct {
     h5trav_type_t type[2];
-    hbool_t       is_same_trgobj;
+    bool          is_same_trgobj;
 } diff_args_t;
 /*-------------------------------------------------------------------------
  * command line options
@@ -61,7 +61,7 @@ typedef struct {
     int                       use_system_epsilon;     /* flag to use system epsilon (1 or 0) */
     int                       percent_bool;           /* relative error to compare*/
     double                    percent;                /* relative error value */
-    hbool_t                   follow_links;           /* follow symbolic links */
+    bool                      follow_links;           /* follow symbolic links */
     int                       no_dangle_links;        /* return error when find dangling link */
     int                       cmn_objs;               /* do we have common objects */
     int                       not_cmp;                /* are the objects comparable */
@@ -90,8 +90,8 @@ typedef struct {
     struct subset_t          *sset[2];                 /* subsetting parameters */
     h5tools_vol_info_t        vol_info[2];             /* VOL information for input file, output file */
     h5tools_vfd_info_t        vfd_info[2];             /* VFD information for input file, output file */
-    hbool_t                   custom_vol[2];           /* Using a custom input, output VOL? */
-    hbool_t                   custom_vfd[2];           /* Using a custom input, output VFD? */
+    bool                      custom_vol[2];           /* Using a custom input, output VOL? */
+    bool                      custom_vfd[2];           /* Using a custom input, output VFD? */
 } diff_opt_t;
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index abb81b9..d8c9ac6 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -80,32 +80,32 @@
  *-------------------------------------------------------------------------
  */
 
-static hbool_t not_comparable;
+static bool not_comparable;
 
 #define PER(A, B)                                                                                            \
     do {                                                                                                     \
         per            = -1;                                                                                 \
-        not_comparable = FALSE;                                                                              \
-        both_zero      = FALSE;                                                                              \
+        not_comparable = false;                                                                              \
+        both_zero      = false;                                                                              \
         if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
-            both_zero = TRUE;                                                                                \
+            both_zero = true;                                                                                \
         if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = (double)ABS((double)((B) - (A)) / (double)(A));                                            \
         else                                                                                                 \
-            not_comparable = TRUE;                                                                           \
+            not_comparable = true;                                                                           \
     } while (0)
 
 #define PER_UNSIGN(TYPE, A, B)                                                                               \
     do {                                                                                                     \
         per            = -1;                                                                                 \
-        not_comparable = FALSE;                                                                              \
-        both_zero      = FALSE;                                                                              \
+        not_comparable = false;                                                                              \
+        both_zero      = false;                                                                              \
         if (H5_DBL_ABS_EQUAL(0, (double)(A)) && H5_DBL_ABS_EQUAL(0, (double)(B)))                            \
-            both_zero = TRUE;                                                                                \
+            both_zero = true;                                                                                \
         if (!H5_DBL_ABS_EQUAL(0, (double)(A)))                                                               \
             per = ABS((double)((TYPE)((B) - (A))) / (double)(A));                                            \
         else                                                                                                 \
-            not_comparable = TRUE;                                                                           \
+            not_comparable = true;                                                                           \
     } while (0)
 
 #define PDIFF(a, b) (((b) > (a)) ? ((b) - (a)) : ((a) - (b)))
@@ -121,14 +121,14 @@ typedef struct mcomp_t {
  * local prototypes
  *-------------------------------------------------------------------------
  */
-static hbool_t all_zero(const void *_mem, size_t size);
+static bool    all_zero(const void *_mem, size_t size);
 static int     ull2float(unsigned long long ull_value, float *f_value);
 static hsize_t character_compare(char *mem1, char *mem2, hsize_t elemtno, size_t u, diff_opt_t *opts);
 static hsize_t character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno,
                                      diff_opt_t *opts);
-static hbool_t equal_float(float value, float expected, diff_opt_t *opts);
-static hbool_t equal_double(double value, double expected, diff_opt_t *opts);
-static hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts);
+static bool    equal_float(float value, float expected, diff_opt_t *opts);
+static bool    equal_double(double value, double expected, diff_opt_t *opts);
+static bool    equal_ldouble(long double value, long double expected, diff_opt_t *opts);
 
 static int  print_data(diff_opt_t *opts);
 static void print_pos(diff_opt_t *opts, hsize_t elemtno, size_t u);
@@ -444,8 +444,8 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
     unsigned       nmembs;
     unsigned       j;
     size_t         size = 0;
-    hbool_t        iszero1;
-    hbool_t        iszero2;
+    bool           iszero1;
+    bool           iszero2;
     hsize_t        nfound    = 0; /* differences found */
     diff_err_t     ret_value = opts->err_stat;
 
@@ -519,14 +519,14 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                     /* Get pointer to first string */
                     s1 = *(char **)((void *)mem1);
                     if (s1)
-                        size1 = HDstrlen(s1);
+                        size1 = strlen(s1);
                     else
                         size1 = 0;
 
                     /* Get pointer to second string */
                     s2 = *(char **)((void *)mem2);
                     if (s2)
-                        size2 = HDstrlen(s2);
+                        size2 = strlen(s2);
                     else
                         size2 = 0;
                 }
@@ -535,7 +535,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                     /* Get pointer to first string */
                     s1 = (char *)mem1;
                     if (s1)
-                        size1 = HDstrlen(s1);
+                        size1 = strlen(s1);
                     else
                         size1 = 0;
 
@@ -545,7 +545,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                     /* Get pointer to second string */
                     s2 = (char *)mem2;
                     if (s2)
-                        size2 = HDstrlen(s2);
+                        size2 = strlen(s2);
                     else
                         size2 = 0;
 
@@ -648,11 +648,11 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                      */
                     err1 = H5Tenum_nameof(opts->m_tid, mem1, enum_name1, sizeof enum_name1);
                     if (err1 < 0)
-                        HDsnprintf(enum_name1, sizeof(enum_name1), "**INVALID VALUE**");
+                        snprintf(enum_name1, sizeof(enum_name1), "**INVALID VALUE**");
 
                     err2 = H5Tenum_nameof(opts->m_tid, mem2, enum_name2, sizeof enum_name2);
                     if (err2 < 0)
-                        HDsnprintf(enum_name2, sizeof(enum_name2), "**INVALID VALUE**");
+                        snprintf(enum_name2, sizeof(enum_name2), "**INVALID VALUE**");
 
                     /* One or more bad enum values */
                     if (err1 < 0 || err2 < 0) {
@@ -669,7 +669,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                     }
                     else {
                         /* Both enum values were valid */
-                        if (HDstrcmp(enum_name1, enum_name2) != 0) {
+                        if (strcmp(enum_name1, enum_name2) != 0) {
                             nfound                 = 1;
                             opts->print_percentage = 0;
                             print_pos(opts, elemtno, 0);
@@ -1270,20 +1270,20 @@ done:
  *
  * Purpose: Determines if memory is initialized to all zero bytes.
  *
- * Return: TRUE if all bytes are zero; FALSE otherwise
+ * Return: true if all bytes are zero; false otherwise
  *-------------------------------------------------------------------------
  */
 
-static hbool_t
+static bool
 all_zero(const void *_mem, size_t size)
 {
     const unsigned char *mem = (const unsigned char *)_mem;
 
     while (size-- > 0)
         if (mem[size])
-            return FALSE;
+            return false;
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1592,7 +1592,7 @@ character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno,
     hsize_t       nfound = 0; /* differences found */
     unsigned char temp1_uchar;
     unsigned char temp2_uchar;
-    hbool_t       both_zero = FALSE;
+    bool          both_zero = false;
     double        per;
 
     /* both_zero is set in the PER_UNSIGN macro but not used in this function */
@@ -1667,9 +1667,9 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     float   temp1_float;
     float   temp2_float;
     double  per;
-    hbool_t both_zero = FALSE;
-    hbool_t isnan1    = FALSE;
-    hbool_t isnan2    = FALSE;
+    bool    both_zero = false;
+    bool    isnan1    = false;
+    bool    isnan2    = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -1688,8 +1688,8 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_float);
-            isnan2 = HDisnan(temp2_float);
+            isnan1 = isnan(temp1_float);
+            isnan2 = isnan(temp2_float);
         }
 
         /* both not NaN, do the comparison */
@@ -1725,8 +1725,8 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_float);
-            isnan2 = HDisnan(temp2_float);
+            isnan1 = isnan(temp1_float);
+            isnan2 = isnan(temp2_float);
         }
         /* both not NaN, do the comparison */
         if ((!isnan1 && !isnan2)) {
@@ -1773,8 +1773,8 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_float);
-            isnan2 = HDisnan(temp2_float);
+            isnan1 = isnan(temp1_float);
+            isnan2 = isnan(temp2_float);
         }
 
         /* both not NaN, do the comparison */
@@ -1817,7 +1817,7 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
      *-------------------------------------------------------------------------
      */
     else {
-        if (equal_float(temp1_float, temp2_float, opts) == FALSE) {
+        if (equal_float(temp1_float, temp2_float, opts) == false) {
             opts->print_percentage = 0;
             print_pos(opts, elem_idx, 0);
             if (print_data(opts)) {
@@ -1847,9 +1847,9 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
     double  temp1_double;
     double  temp2_double;
     double  per;
-    hbool_t both_zero = FALSE;
-    hbool_t isnan1    = FALSE;
-    hbool_t isnan2    = FALSE;
+    bool    both_zero = false;
+    bool    isnan1    = false;
+    bool    isnan2    = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -1866,8 +1866,8 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
 
         /* both not NaN, do the comparison */
@@ -1902,8 +1902,8 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
         /* both not NaN, do the comparison */
         if (!isnan1 && !isnan2) {
@@ -1948,8 +1948,8 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
 
         /* both not NaN, do the comparison */
@@ -1990,7 +1990,7 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
      *-------------------------------------------------------------------------
      */
     else {
-        if (equal_double(temp1_double, temp2_double, opts) == FALSE) {
+        if (equal_double(temp1_double, temp2_double, opts) == false) {
             opts->print_percentage = 0;
             print_pos(opts, elem_idx, 0);
             if (print_data(opts)) {
@@ -2020,9 +2020,9 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
     long double temp1_double;
     long double temp2_double;
     double      per;
-    hbool_t     both_zero = FALSE;
-    hbool_t     isnan1    = FALSE;
-    hbool_t     isnan2    = FALSE;
+    bool        both_zero = false;
+    bool        isnan1    = false;
+    bool        isnan2    = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2041,8 +2041,8 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
 
         /* both not NaN, do the comparison */
@@ -2076,8 +2076,8 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
 
         /* both not NaN, do the comparison */
@@ -2123,8 +2123,8 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
          *-------------------------------------------------------------------------
          */
         if (opts->do_nans) {
-            isnan1 = HDisnan(temp1_double);
-            isnan2 = HDisnan(temp2_double);
+            isnan1 = isnan(temp1_double);
+            isnan2 = isnan(temp2_double);
         }
 
         /* both not NaN, do the comparison */
@@ -2164,7 +2164,7 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
      * no -d and -p
      *-------------------------------------------------------------------------
      */
-    else if (equal_ldouble(temp1_double, temp2_double, opts) == FALSE) {
+    else if (equal_ldouble(temp1_double, temp2_double, opts) == false) {
         opts->print_percentage = 0;
         print_pos(opts, elem_idx, 0);
         if (print_data(opts)) {
@@ -2193,7 +2193,7 @@ diff_schar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     char    temp1_char;
     char    temp2_char;
     double  per;
-    hbool_t both_zero = FALSE;
+    bool    both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
     memcpy(&temp1_char, mem1, sizeof(char));
@@ -2281,7 +2281,7 @@ diff_uchar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     unsigned char temp1_uchar;
     unsigned char temp2_uchar;
     double        per;
-    hbool_t       both_zero = FALSE;
+    bool          both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2369,7 +2369,7 @@ diff_short_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     short   temp1_short;
     short   temp2_short;
     double  per;
-    hbool_t both_zero = FALSE;
+    bool    both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2457,7 +2457,7 @@ diff_ushort_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
     unsigned short temp1_ushort;
     unsigned short temp2_ushort;
     double         per;
-    hbool_t        both_zero = FALSE;
+    bool           both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2549,7 +2549,7 @@ diff_int_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, dif
     int     temp1_int;
     int     temp2_int;
     double  per;
-    hbool_t both_zero = FALSE;
+    bool    both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2637,7 +2637,7 @@ diff_uint_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di
     unsigned int temp1_uint;
     unsigned int temp2_uint;
     double       per;
-    hbool_t      both_zero = FALSE;
+    bool         both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2725,7 +2725,7 @@ diff_long_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di
     long    temp1_long;
     long    temp2_long;
     double  per;
-    hbool_t both_zero = FALSE;
+    bool    both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2813,7 +2813,7 @@ diff_ulong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     unsigned long temp1_ulong;
     unsigned long temp2_ulong;
     double        per;
-    hbool_t       both_zero = FALSE;
+    bool          both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2903,7 +2903,7 @@ diff_llong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d
     long long temp1_llong;
     long long temp2_llong;
     double    per;
-    hbool_t   both_zero = FALSE;
+    bool      both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -2997,7 +2997,7 @@ diff_ullong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx,
     unsigned long long temp2_ullong;
     float              f1, f2;
     double             per;
-    hbool_t            both_zero = FALSE;
+    bool               both_zero = false;
 
     H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool);
 
@@ -3132,7 +3132,7 @@ done:
  * Purpose:     use a absolute error formula to deal with floating point uncertainty
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 equal_double(double value, double expected, diff_opt_t *opts)
 {
     if (opts->do_nans) {
@@ -3140,36 +3140,36 @@ equal_double(double value, double expected, diff_opt_t *opts)
          * detect NaNs
          *-------------------------------------------------------------------------
          */
-        hbool_t isnan1 = HDisnan(value);
-        hbool_t isnan2 = HDisnan(expected);
+        bool isnan1 = isnan(value);
+        bool isnan2 = isnan(expected);
 
         /*-------------------------------------------------------------------------
          * we consider NaN == NaN to be true
          *-------------------------------------------------------------------------
          */
         if (isnan1 && isnan2)
-            return TRUE;
+            return true;
 
         /*-------------------------------------------------------------------------
          * one is a NaN, do not compare but assume difference
          *-------------------------------------------------------------------------
          */
         if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
-            return FALSE;
+            return false;
     }
 
     if (opts->use_system_epsilon) {
         /* Check equality within some epsilon */
         if (H5_DBL_ABS_EQUAL(value, expected))
-            return TRUE;
+            return true;
     }
     else {
         /* Check bits */
         if (!memcmp(&value, &expected, sizeof(double)))
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 /*-------------------------------------------------------------------------
@@ -3179,7 +3179,7 @@ equal_double(double value, double expected, diff_opt_t *opts)
  *-------------------------------------------------------------------------
  */
 
-static hbool_t
+static bool
 equal_ldouble(long double value, long double expected, diff_opt_t *opts)
 {
     if (opts->do_nans) {
@@ -3187,36 +3187,36 @@ equal_ldouble(long double value, long double expected, diff_opt_t *opts)
          * detect NaNs
          *-------------------------------------------------------------------------
          */
-        hbool_t isnan1 = HDisnan(value);
-        hbool_t isnan2 = HDisnan(expected);
+        bool isnan1 = isnan(value);
+        bool isnan2 = isnan(expected);
 
         /*-------------------------------------------------------------------------
          * we consider NaN == NaN to be true
          *-------------------------------------------------------------------------
          */
         if (isnan1 && isnan2)
-            return TRUE;
+            return true;
 
         /*-------------------------------------------------------------------------
          * one is a NaN, do not compare but assume difference
          *-------------------------------------------------------------------------
          */
         if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
-            return FALSE;
+            return false;
     }
 
     if (opts->use_system_epsilon) {
         /* Check equality within some epsilon */
         if (H5_LDBL_ABS_EQUAL(value, expected))
-            return TRUE;
+            return true;
     }
     else {
         /* Check bits */
         if (!memcmp(&value, &expected, sizeof(long double)))
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 /*-------------------------------------------------------------------------
@@ -3225,7 +3225,7 @@ equal_ldouble(long double value, long double expected, diff_opt_t *opts)
  * Purpose:     use a absolute error formula to deal with floating point uncertainty
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 equal_float(float value, float expected, diff_opt_t *opts)
 {
     if (opts->do_nans) {
@@ -3233,36 +3233,36 @@ equal_float(float value, float expected, diff_opt_t *opts)
          * detect NaNs
          *-------------------------------------------------------------------------
          */
-        hbool_t isnan1 = HDisnan(value);
-        hbool_t isnan2 = HDisnan(expected);
+        bool isnan1 = isnan(value);
+        bool isnan2 = isnan(expected);
 
         /*-------------------------------------------------------------------------
          * we consider NaN == NaN to be true
          *-------------------------------------------------------------------------
          */
         if (isnan1 && isnan2)
-            return TRUE;
+            return true;
 
         /*-------------------------------------------------------------------------
          * one is a NaN, do not compare but assume difference
          *-------------------------------------------------------------------------
          */
         if ((isnan1 && !isnan2) || (!isnan1 && isnan2))
-            return FALSE;
+            return false;
     }
 
     if (opts->use_system_epsilon) {
         /* Check equality within some epsilon */
         if (H5_FLT_ABS_EQUAL(value, expected))
-            return TRUE;
+            return true;
     }
     else {
         /* Check bits */
         if (!memcmp(&value, &expected, sizeof(float)))
-            return TRUE;
+            return true;
     }
 
-    return FALSE;
+    return false;
 }
 
 /*-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 0c377af..2521177 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -112,7 +112,7 @@ table_attr_mark_exist(const unsigned *exist, char *name, table_attrs_t *table)
         table->attrs[curr_val].exist[0] = exist[0];
         table->attrs[curr_val].exist[1] = exist[1];
         if (name)
-            table->attrs[curr_val].name = (char *)HDstrdup(name);
+            table->attrs[curr_val].name = (char *)strdup(name);
         table->nattrs++;
     }
 }
@@ -186,7 +186,7 @@ build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t **table_out,
             H5TOOLS_GOTO_ERROR(FAIL, "H5Aget_name second attribute failed");
 
         /* criteria is string compare */
-        cmp = HDstrcmp(name1, name2);
+        cmp = strcmp(name1, name2);
 
         if (cmp == 0) {
             infile[0] = 1;
@@ -326,8 +326,8 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
     size_t     msize2;                      /* memory size of memory type */
     void      *buf1        = NULL;          /* data buffer */
     void      *buf2        = NULL;          /* data buffer */
-    hbool_t    buf1hasdata = FALSE;         /* buffer has data */
-    hbool_t    buf2hasdata = FALSE;         /* buffer has data */
+    bool       buf1hasdata = false;         /* buffer has data */
+    bool       buf2hasdata = false;         /* buffer has data */
     int        rank1;                       /* rank of dataset */
     int        rank2;                       /* rank of dataset */
     hsize_t    dims1[H5S_MAX_RANK];         /* dimensions of dataset */
@@ -384,19 +384,19 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
 
     H5TOOLS_DEBUG("attr_names: %s - %s", name1, name2);
     if (name1) {
-        sz = HDstrlen(name1);
+        sz = strlen(name1);
         H5TOOLS_DEBUG("attr1_name: %s - %d", name1, sz);
         if (sz > 0) {
             opts->obj_name[0] = (char *)malloc(sz + 1);
-            HDstrncpy(opts->obj_name[0], name1, sz + 1);
+            strncpy(opts->obj_name[0], name1, sz + 1);
         }
     }
     if (name2) {
-        sz = HDstrlen(name2);
+        sz = strlen(name2);
         H5TOOLS_DEBUG("attr2_name: %s - %d", name2, sz);
         if (sz > 0) {
             opts->obj_name[1] = (char *)malloc(sz + 1);
-            HDstrncpy(opts->obj_name[1], name2, sz + 1);
+            strncpy(opts->obj_name[1], name2, sz + 1);
         }
     }
     H5TOOLS_DEBUG("attr_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
@@ -443,7 +443,7 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type first attribute failed");
         }
         else
-            buf1hasdata = TRUE;
+            buf1hasdata = true;
         H5TOOLS_DEBUG("attr H5Aread 1");
 
         if (H5Aread(attr2_id, mtype2_id, buf2) < 0) {
@@ -451,7 +451,7 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
             H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "H5Aget_type second attribute failed");
         }
         else
-            buf2hasdata = TRUE;
+            buf2hasdata = true;
         H5TOOLS_DEBUG("attr H5Aread 2");
 
         /* format output string */
@@ -464,17 +464,17 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
 
         H5TOOLS_DEBUG("attr_names: %s - %s : %s - %s", name1, name2, path1, path2);
         if (name1) {
-            sz = HDstrlen(name1) + HDstrlen(path1) + 7;
+            sz = strlen(name1) + strlen(path1) + 7;
             H5TOOLS_DEBUG("attr1_name: %s - %d", name1, sz);
             opts->obj_name[0] = (char *)calloc(sz + 1, sizeof(char));
-            HDsnprintf(opts->obj_name[0], sz, "%s of <%s>", name1, path1);
+            snprintf(opts->obj_name[0], sz, "%s of <%s>", name1, path1);
             opts->obj_name[0][sz] = '\0';
         }
         if (name2) {
-            sz = HDstrlen(name2) + HDstrlen(path2) + 7;
+            sz = strlen(name2) + strlen(path2) + 7;
             H5TOOLS_DEBUG("attr2_name: %s - %d", name2, sz);
             opts->obj_name[1] = (char *)calloc(sz + 1, sizeof(char));
-            HDsnprintf(opts->obj_name[1], sz, "%s of <%s>", name2, path2);
+            snprintf(opts->obj_name[1], sz, "%s of <%s>", name2, path2);
             opts->obj_name[1][sz] = '\0';
         }
 
@@ -530,12 +530,12 @@ diff_attr_data(hid_t attr1_id, hid_t attr2_id, const char *name1, const char *na
 
     /* Free buf1 and buf2, check both VLEN-data VLEN-string to reclaim any
      * VLEN memory first */
-    if (TRUE == h5tools_detect_vlen(mtype1_id))
+    if (true == h5tools_detect_vlen(mtype1_id))
         H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
     free(buf1);
     buf1 = NULL;
 
-    if (TRUE == h5tools_detect_vlen(mtype2_id))
+    if (true == h5tools_detect_vlen(mtype2_id))
         H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
     free(buf2);
     buf2 = NULL;
@@ -559,12 +559,12 @@ done:
     H5E_BEGIN_TRY
     {
         if (buf1) {
-            if (buf1hasdata && TRUE == h5tools_detect_vlen(mtype1_id))
+            if (buf1hasdata && true == h5tools_detect_vlen(mtype1_id))
                 H5Treclaim(mtype1_id, space1_id, H5P_DEFAULT, buf1);
             free(buf1);
         } /* end if */
         if (buf2) {
-            if (buf2hasdata && TRUE == h5tools_detect_vlen(mtype2_id))
+            if (buf2hasdata && true == h5tools_detect_vlen(mtype2_id))
                 H5Treclaim(mtype2_id, space2_id, H5P_DEFAULT, buf2);
             free(buf2);
         } /* end if */
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index 78f52bc..3d4b25a 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -274,21 +274,21 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n
     H5TOOLS_DEBUG("obj_names: %s - %s", obj1_name, obj2_name);
     opts->obj_name[0] = NULL;
     if (obj1_name) {
-        j = (int)HDstrlen(obj1_name);
+        j = (int)strlen(obj1_name);
         H5TOOLS_DEBUG("obj1_name: %s - %d", obj1_name, j);
         if (j > 0) {
             opts->obj_name[0] = (char *)malloc((size_t)j + 1);
-            HDstrncpy(opts->obj_name[0], obj1_name, (size_t)j + 1);
+            strncpy(opts->obj_name[0], obj1_name, (size_t)j + 1);
         }
     }
 
     opts->obj_name[1] = NULL;
     if (obj2_name) {
-        j = (int)HDstrlen(obj2_name);
+        j = (int)strlen(obj2_name);
         H5TOOLS_DEBUG("obj2_name: %s - %d", obj2_name, j);
         if (j > 0) {
             opts->obj_name[1] = (char *)malloc((size_t)j + 1);
-            HDstrncpy(opts->obj_name[1], obj2_name, (size_t)j + 1);
+            strncpy(opts->obj_name[1], obj2_name, (size_t)j + 1);
         }
     }
 
@@ -351,10 +351,10 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n
     /* Check if type is either VLEN-data or VLEN-string to reclaim any
      * VLEN memory buffer later
      */
-    if (TRUE == h5tools_detect_vlen(m_tid1))
-        vl_data1 = TRUE;
-    if (TRUE == h5tools_detect_vlen(m_tid2))
-        vl_data2 = TRUE;
+    if (true == h5tools_detect_vlen(m_tid1))
+        vl_data1 = true;
+    if (true == h5tools_detect_vlen(m_tid2))
+        vl_data2 = true;
     H5TOOLS_DEBUG("h5tools_detect_vlen %d:%d - errstat:%d", vl_data1, vl_data2, opts->err_stat);
 
     /*------------------------------------------------------------------------
@@ -431,9 +431,9 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n
         opts->obj_name[1] = NULL;
 
         if (obj1_name)
-            opts->obj_name[0] = HDstrdup(diff_basename(obj1_name));
+            opts->obj_name[0] = strdup(diff_basename(obj1_name));
         if (obj2_name)
-            opts->obj_name[1] = HDstrdup(diff_basename(obj2_name));
+            opts->obj_name[1] = strdup(diff_basename(obj2_name));
         H5TOOLS_DEBUG("obj_names: %s - %s", opts->obj_name[0], opts->obj_name[1]);
 
         H5TOOLS_DEBUG("read/compare");
diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c
index fc74a39..4641c93 100644
--- a/tools/lib/h5diff_util.c
+++ b/tools/lib/h5diff_util.c
@@ -190,7 +190,7 @@ diff_basename(const char *name)
         return NULL;
 
     /* Find the end of the base name */
-    i = HDstrlen(name);
+    i = strlen(name);
     while (i > 0 && '/' == name[i - 1])
         --i;
 
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 0e063c7..36e304d 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -246,7 +246,7 @@ h5tools_set_data_output_file(const char *fname, int is_bin)
 
     if (rawdatastream && rawdatastream != stdout) {
         if (fclose(rawdatastream))
-            HDperror("closing rawdatastream");
+            perror("closing rawdatastream");
         else
             rawdatastream = NULL;
     }
@@ -294,7 +294,7 @@ h5tools_set_attr_output_file(const char *fname, int is_bin)
 
     if (rawattrstream && rawattrstream != stdout) {
         if (fclose(rawattrstream))
-            HDperror("closing rawattrstream");
+            perror("closing rawattrstream");
         else
             rawattrstream = NULL;
     }
@@ -343,7 +343,7 @@ h5tools_set_input_file(const char *fname, int is_bin)
 
     if (rawinstream && rawinstream != stdin) {
         if (fclose(rawinstream))
-            HDperror("closing rawinstream");
+            perror("closing rawinstream");
         else
             rawinstream = NULL;
     }
@@ -391,7 +391,7 @@ h5tools_set_output_file(const char *fname, int is_bin)
 
     if (rawoutstream && rawoutstream != stdout) {
         if (fclose(rawoutstream))
-            HDperror("closing rawoutstream");
+            perror("closing rawoutstream");
         else
             rawoutstream = NULL;
     }
@@ -438,7 +438,7 @@ h5tools_set_error_file(const char *fname, int is_bin)
 
     if (rawerrorstream && rawerrorstream != stderr) {
         if (fclose(rawerrorstream))
-            HDperror("closing rawerrorstream");
+            perror("closing rawerrorstream");
         else
             rawerrorstream = NULL;
     }
@@ -485,12 +485,12 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
     switch (vfd_info->type) {
         case VFD_BY_NAME:
             /* Determine which driver the user wants to open the file with */
-            if (!HDstrcmp(vfd_info->u.name, drivernames[SEC2_VFD_IDX])) {
+            if (!strcmp(vfd_info->u.name, drivernames[SEC2_VFD_IDX])) {
                 /* SEC2 Driver */
                 if (H5Pset_fapl_sec2(fapl_id) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_sec2 failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[DIRECT_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[DIRECT_VFD_IDX])) {
 #ifdef H5_HAVE_DIRECT
                 /* Direct Driver */
                 if (H5Pset_fapl_direct(fapl_id, 1024, 4096, 8 * 4096) < 0)
@@ -499,14 +499,14 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "Direct VFD is not enabled");
 #endif
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[LOG_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[LOG_VFD_IDX])) {
                 unsigned long long log_flags = H5FD_LOG_LOC_IO | H5FD_LOG_ALLOC;
 
                 /* Log Driver */
                 if (H5Pset_fapl_log(fapl_id, NULL, log_flags, (size_t)0) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_log failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[WINDOWS_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[WINDOWS_VFD_IDX])) {
 #ifdef H5_HAVE_WINDOWS
                 /* There is no Windows VFD - use SEC2 */
                 if (H5Pset_fapl_sec2(fapl_id) < 0)
@@ -515,17 +515,17 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "Windows VFD is not enabled");
 #endif
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[STDIO_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[STDIO_VFD_IDX])) {
                 /* Stdio Driver */
                 if (H5Pset_fapl_stdio(fapl_id) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_stdio failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[CORE_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[CORE_VFD_IDX])) {
                 /* Core Driver */
-                if (H5Pset_fapl_core(fapl_id, (size_t)H5_MB, TRUE) < 0)
+                if (H5Pset_fapl_core(fapl_id, (size_t)H5_MB, true) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_core failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[FAMILY_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[FAMILY_VFD_IDX])) {
                 /* FAMILY Driver */
                 /* Set member size to be 0 to indicate the current first member size
                  * is the member size.
@@ -533,17 +533,17 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 if (H5Pset_fapl_family(fapl_id, (hsize_t)0, H5P_DEFAULT) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_family failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[SPLIT_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[SPLIT_VFD_IDX])) {
                 /* SPLIT Driver */
                 if (H5Pset_fapl_split(fapl_id, "-m.h5", H5P_DEFAULT, "-r.h5", H5P_DEFAULT) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_split failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[MULTI_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[MULTI_VFD_IDX])) {
                 /* MULTI Driver */
-                if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, TRUE) < 0)
+                if (H5Pset_fapl_multi(fapl_id, NULL, NULL, NULL, NULL, true) < 0)
                     H5TOOLS_GOTO_ERROR(FAIL, "H5Pset_fapl_multi failed");
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[MPIO_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[MPIO_VFD_IDX])) {
 #ifdef H5_HAVE_PARALLEL
                 int mpi_initialized, mpi_finalized;
 
@@ -561,7 +561,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "MPI-I/O VFD is not enabled");
 #endif /* H5_HAVE_PARALLEL */
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[ROS3_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[ROS3_VFD_IDX])) {
 #ifdef H5_HAVE_ROS3_VFD
                 if (!vfd_info->info)
                     H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD info is invalid");
@@ -575,7 +575,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "Read-only S3 VFD is not enabled");
 #endif
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[HDFS_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[HDFS_VFD_IDX])) {
 #ifdef H5_HAVE_LIBHDFS
                 if (!vfd_info->info)
                     H5TOOLS_GOTO_ERROR(FAIL, "HDFS VFD info is invalid");
@@ -585,7 +585,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "The HDFS VFD is not enabled");
 #endif
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[SUBFILING_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[SUBFILING_VFD_IDX])) {
 #if defined(H5_HAVE_PARALLEL) && defined(H5_HAVE_SUBFILING_VFD)
                 int mpi_initialized, mpi_finalized;
 
@@ -601,7 +601,7 @@ h5tools_set_fapl_vfd(hid_t fapl_id, h5tools_vfd_info_t *vfd_info)
                 H5TOOLS_GOTO_ERROR(FAIL, "The Subfiling VFD is not enabled");
 #endif
             }
-            else if (!HDstrcmp(vfd_info->u.name, drivernames[ONION_VFD_IDX])) {
+            else if (!strcmp(vfd_info->u.name, drivernames[ONION_VFD_IDX])) {
                 /* Onion driver */
                 if (!vfd_info->info)
                     H5TOOLS_GOTO_ERROR(FAIL, "Onion VFD info is invalid");
@@ -676,10 +676,10 @@ h5tools_set_fapl_vol(hid_t fapl_id, h5tools_vol_info_t *vol_info)
                 /* Check for VOL connectors that ship with the library, then try
                  * registering by name if that fails.
                  */
-                if (!HDstrcmp(vol_info->u.name, H5VL_NATIVE_NAME)) {
+                if (!strcmp(vol_info->u.name, H5VL_NATIVE_NAME)) {
                     connector_id = H5VL_NATIVE;
                 }
-                else if (!HDstrcmp(vol_info->u.name, H5VL_PASSTHRU_NAME)) {
+                else if (!strcmp(vol_info->u.name, H5VL_PASSTHRU_NAME)) {
                     connector_id = H5VL_PASSTHRU;
                 }
                 else {
@@ -822,9 +822,9 @@ done:
 herr_t
 h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size)
 {
-    hid_t   fapl_vol_id = H5I_INVALID_HID;
-    hbool_t is_native   = FALSE;
-    herr_t  ret_value   = SUCCEED;
+    hid_t  fapl_vol_id = H5I_INVALID_HID;
+    bool   is_native   = false;
+    herr_t ret_value   = SUCCEED;
 
     if (fapl_id < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "invalid FAPL");
@@ -895,7 +895,7 @@ h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t driverna
         else
             driver_name = "unknown";
 
-        HDstrncpy(drivername, driver_name, drivername_size);
+        strncpy(drivername, driver_name, drivername_size);
         drivername[drivername_size - 1] = '\0';
     }
 
@@ -915,14 +915,14 @@ done:
  *
  *           The 'use_specific_driver' parameter is used to control the
  *           VFD/VOL connector that this routine uses to open the file
- *           with. If 'use_specific_driver' is set to TRUE, this routine
+ *           with. If 'use_specific_driver' is set to true, this routine
  *           assumes that the caller has already set a specific VFD or VOL
  *           connector on the given FAPL and will attempt to directly use
  *           the FAPL for opening the file. We assume that the caller knows
  *           what they are doing; if the file is unable to be opened using
  *           that FAPL, this routine will return H5I_INVALID_HID.
  *
- *           However, if 'use_specific_driver' is set to FALSE, this
+ *           However, if 'use_specific_driver' is set to false, this
  *           routine assumes that the caller HAS NOT set a specific VFD or
  *           VOL connector on the given FAPL and will instead loop through
  *           the various available VFL drivers and VOL connectors trying to
@@ -951,7 +951,7 @@ done:
  *-------------------------------------------------------------------------
  */
 hid_t
-h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_specific_driver, char *drivername,
+h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, bool use_specific_driver, char *drivername,
               size_t drivername_size)
 {
     hid_t    fid          = H5I_INVALID_HID;
@@ -989,7 +989,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
 
     /*
      * If we failed to open the file and the caller specified 'use_specific_driver'
-     * as TRUE, we should return failure now since the file couldn't be opened with
+     * as true, we should return failure now since the file couldn't be opened with
      * the VFL driver/VOL connector that was set on the FAPL by the caller.
      */
     if (use_specific_driver)
@@ -1037,7 +1037,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
                 /* Can we open the file with this combo? */
                 H5E_BEGIN_TRY
                 {
-                    fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size);
+                    fid = h5tools_fopen(fname, flags, tmp_fapl_id, true, drivername, drivername_size);
                 }
                 H5E_END_TRY
 
@@ -1060,7 +1060,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
                 continue;
 
             /* Can we open the file with this connector? */
-            if ((fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size)) >= 0) {
+            if ((fid = h5tools_fopen(fname, flags, tmp_fapl_id, true, drivername, drivername_size)) >= 0) {
                 used_fapl_id = tmp_fapl_id;
                 H5TOOLS_GOTO_DONE(fid);
             }
@@ -1121,24 +1121,24 @@ h5tools_count_ncols(const char *s)
  *
  * Purpose:  Recursive check for any variable length data in given type.
  *
- * Return:   TRUE : type contains any variable length data
- *           FALSE : type doesn't contain any variable length data
+ * Return:   true : type contains any variable length data
+ *           false : type doesn't contain any variable length data
  *           Negative value: failed
  *-------------------------------------------------------------------------
  */
 htri_t
 h5tools_detect_vlen(hid_t tid)
 {
-    htri_t ret = FALSE;
+    htri_t ret = false;
 
     /* recursive detect any vlen data values in type (compound, array ...) */
     ret = H5Tdetect_class(tid, H5T_VLEN);
-    if ((ret == TRUE) || (ret < 0))
+    if ((ret == true) || (ret < 0))
         goto done;
 
     /* recursive detect any vlen string in type (compound, array ...) */
     ret = h5tools_detect_vlen_str(tid);
-    if ((ret == TRUE) || (ret < 0))
+    if ((ret == true) || (ret < 0))
         goto done;
 
 done:
@@ -1150,8 +1150,8 @@ done:
  *
  * Purpose:  Recursive check for variable length string of a datatype.
  *
- * Return:   TRUE : type contains any variable length string
- *           FALSE : type doesn't contain any variable length string
+ * Return:   true : type contains any variable length string
+ *           false : type doesn't contain any variable length string
  *           Negative value: failed
  *-------------------------------------------------------------------------
  */
@@ -1159,10 +1159,10 @@ htri_t
 h5tools_detect_vlen_str(hid_t tid)
 {
     H5T_class_t tclass = -1;
-    htri_t      ret    = FALSE;
+    htri_t      ret    = false;
 
     ret = H5Tis_variable_str(tid);
-    if ((ret == TRUE) || (ret < 0))
+    if ((ret == true) || (ret < 0))
         goto done;
 
     tclass = H5Tget_class(tid);
@@ -1174,7 +1174,7 @@ h5tools_detect_vlen_str(hid_t tid)
             goto done;
         }
         ret = h5tools_detect_vlen_str(btid);
-        if ((ret == TRUE) || (ret < 0)) {
+        if ((ret == true) || (ret < 0)) {
             H5Tclose(btid);
             goto done;
         }
@@ -1194,7 +1194,7 @@ h5tools_detect_vlen_str(hid_t tid)
             hid_t mtid = H5Tget_member_type(tid, u);
 
             ret = h5tools_detect_vlen_str(mtid);
-            if ((ret == TRUE) || (ret < 0)) {
+            if ((ret == true) || (ret < 0)) {
                 H5Tclose(mtid);
                 goto done;
             }
@@ -1241,7 +1241,7 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context
                   ctx->cur_column, info->idx_fmt, info->line_suf);
     if (ctx->cur_column) {
         PUTSTREAM(OPT(info->line_suf, ""), stream);
-        HDputc('\n', stream);
+        putc('\n', stream);
         PUTSTREAM(OPT(info->line_sep, ""), stream);
     }
     H5TOOLS_DEBUG("after CR elmtno=%ld, ctx->ndims=%d", elmtno, ctx->ndims);
@@ -1334,7 +1334,7 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_
     /* Terminate previous line, if any */
     if (ctx->cur_column) {
         PUTSTREAM(OPT(info->line_suf, ""), stream);
-        HDputc('\n', stream);
+        putc('\n', stream);
         PUTSTREAM(OPT(info->line_sep, ""), stream);
     }
 
@@ -1411,16 +1411,16 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_
  *           hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
                        h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t local_elmt_counter,
                        hsize_t elmt_counter)
 {
-    hbool_t dimension_break = TRUE;
-    char   *s               = NULL;
-    char   *section         = NULL; /* a section of output */
-    int     secnum;                 /* section sequence number */
-    int     multiline;              /* datum was multiline */
+    bool  dimension_break = true;
+    char *s               = NULL;
+    char *section         = NULL; /* a section of output */
+    int   secnum;                 /* section sequence number */
+    int   multiline;              /* datum was multiline */
 
     if (stream == NULL)
         return dimension_break;
@@ -1436,23 +1436,23 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * current location...
      */
     if (info->line_multi_new == 1 &&
-        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-         HDstrlen(OPT(info->line_suf, ""))) > ncols) {
+        (ctx->cur_column + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+         strlen(OPT(info->line_suf, ""))) > ncols) {
         if (ctx->prev_multiline) {
             /*
              * ... and the previous element also occupied more than one
              * line, then start this element at the beginning of a line.
              */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
         }
-        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-                  HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
+        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+                  strlen(OPT(info->line_suf, ""))) <= ncols) {
             /*
              * ...but *could* fit on one line otherwise, then we
              * should end the current line and start this element on its
              * own line.
              */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
         }
         H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
     }
@@ -1464,11 +1464,11 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      */
     if (info->arr_linebreak && ctx->cur_elmt) {
         if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0)
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
         if (elmt_counter == ctx->size_last_dim) {
-            ctx->need_prefix = TRUE;
-            dimension_break  = FALSE;
+            ctx->need_prefix = true;
+            dimension_break  = false;
         }
         H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
     }
@@ -1481,9 +1481,9 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * beginning of the line.
      */
     if (info->line_multi_new == 1 && ctx->prev_multiline &&
-        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-         HDstrlen(OPT(info->line_suf, ""))) > ncols)
-        ctx->need_prefix = TRUE;
+        (ctx->cur_column + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+         strlen(OPT(info->line_suf, ""))) > ncols)
+        ctx->need_prefix = true;
     H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
 
     /*
@@ -1491,7 +1491,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * start a new line.
      */
     if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line)
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
     H5TOOLS_DEBUG("ctx->need_prefix=%d", ctx->need_prefix);
 
     /*
@@ -1500,7 +1500,7 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
      * one-at a time.
      */
     multiline = 0;
-    for (secnum = 0, multiline = 0; (section = HDstrtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK)); secnum++) {
+    for (secnum = 0, multiline = 0; (section = strtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK)); secnum++) {
         /*
          * If the current section plus possible suffix and end-of-line
          * information would cause the output to wrap then we need to
@@ -1510,8 +1510,8 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
         /*
          * check for displaying prefix for each section
          */
-        if ((ctx->cur_column + HDstrlen(section) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-             HDstrlen(OPT(info->line_suf, ""))) > ncols)
+        if ((ctx->cur_column + strlen(section) + strlen(OPT(info->elmt_suf2, " ")) +
+             strlen(OPT(info->line_suf, ""))) > ncols)
             ctx->need_prefix = 1;
 
         /*
@@ -1535,13 +1535,13 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
         }
         else if ((local_elmt_counter || ctx->continuation) && secnum == 0) {
             PUTSTREAM(OPT(info->elmt_suf2, " "), stream);
-            ctx->cur_column += HDstrlen(OPT(info->elmt_suf2, " "));
+            ctx->cur_column += strlen(OPT(info->elmt_suf2, " "));
         }
         H5TOOLS_DEBUG("section=%s", section);
 
         /* Print the section */
         PUTSTREAM(section, stream);
-        ctx->cur_column += HDstrlen(section);
+        ctx->cur_column += strlen(section);
     }
 
     ctx->prev_multiline = multiline;
@@ -1576,16 +1576,16 @@ h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_contex
  *           hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
                               h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols, hsize_t *ptdata,
                               hsize_t local_elmt_counter, hsize_t elmt_counter)
 {
-    hbool_t dimension_break = TRUE;
-    char   *s               = NULL;
-    char   *section         = NULL; /* a section of output */
-    int     secnum;                 /* section sequence number */
-    int     multiline;              /* datum was multiline */
+    bool  dimension_break = true;
+    char *s               = NULL;
+    char *section         = NULL; /* a section of output */
+    int   secnum;                 /* section sequence number */
+    int   multiline;              /* datum was multiline */
 
     H5TOOLS_START_DEBUG(" ");
     H5TOOLS_DEBUG("elmt_counter=%ld - local_elmt_counter=%ld", elmt_counter, local_elmt_counter);
@@ -1597,23 +1597,23 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      * current location...
      */
     if (info->line_multi_new == 1 &&
-        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-         HDstrlen(OPT(info->line_suf, ""))) > ncols) {
+        (ctx->cur_column + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+         strlen(OPT(info->line_suf, ""))) > ncols) {
         if (ctx->prev_multiline) {
             /*
              * ... and the previous element also occupied more than one
              * line, then start this element at the beginning of a line.
              */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
         }
-        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-                  HDstrlen(OPT(info->line_suf, ""))) <= ncols) {
+        else if ((ctx->prev_prefix_len + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+                  strlen(OPT(info->line_suf, ""))) <= ncols) {
             /*
              * ...but *could* fit on one line otherwise, then we
              * should end the current line and start this element on its
              * own line.
              */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
         }
     }
 
@@ -1624,11 +1624,11 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      */
     if (info->arr_linebreak && ctx->cur_elmt) {
         if (ctx->size_last_dim && (ctx->cur_elmt % ctx->size_last_dim) == 0)
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
         if (elmt_counter == ctx->size_last_dim) {
-            ctx->need_prefix = TRUE;
-            dimension_break  = FALSE;
+            ctx->need_prefix = true;
+            dimension_break  = false;
         }
     }
 
@@ -1638,16 +1638,16 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      * beginning of the line.
      */
     if (info->line_multi_new == 1 && ctx->prev_multiline &&
-        (ctx->cur_column + h5tools_count_ncols(s) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-         HDstrlen(OPT(info->line_suf, ""))) > ncols)
-        ctx->need_prefix = TRUE;
+        (ctx->cur_column + h5tools_count_ncols(s) + strlen(OPT(info->elmt_suf2, " ")) +
+         strlen(OPT(info->line_suf, ""))) > ncols)
+        ctx->need_prefix = true;
 
     /*
      * If too many elements have already been printed then we need to
      * start a new line.
      */
     if (info->line_per_line > 0 && ctx->cur_elmt >= info->line_per_line)
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
     /*
      * Each OPTIONAL_LINE_BREAK embedded in the rendered string can cause
@@ -1655,7 +1655,7 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
      * one-at a time.
      */
     multiline = 0;
-    for (secnum = 0, multiline = 0; (section = HDstrtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK)); secnum++) {
+    for (secnum = 0, multiline = 0; (section = strtok(secnum ? NULL : s, OPTIONAL_LINE_BREAK)); secnum++) {
         /*
          * If the current section plus possible suffix and end-of-line
          * information would cause the output to wrap then we need to
@@ -1667,8 +1667,8 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
          * this check to happen for the first line
          */
         if ((!info->skip_first || local_elmt_counter) &&
-            (ctx->cur_column + HDstrlen(section) + HDstrlen(OPT(info->elmt_suf2, " ")) +
-             HDstrlen(OPT(info->line_suf, ""))) > ncols)
+            (ctx->cur_column + strlen(section) + strlen(OPT(info->elmt_suf2, " ")) +
+             strlen(OPT(info->line_suf, ""))) > ncols)
             ctx->need_prefix = 1;
 
         /*
@@ -1690,12 +1690,12 @@ h5tools_render_region_element(FILE *stream, const h5tool_format_t *info, h5tools
         }
         else if ((local_elmt_counter || ctx->continuation) && secnum == 0) {
             PUTSTREAM(OPT(info->elmt_suf2, " "), stream);
-            ctx->cur_column += HDstrlen(OPT(info->elmt_suf2, " "));
+            ctx->cur_column += strlen(OPT(info->elmt_suf2, " "));
         }
 
         /* Print the section */
         PUTSTREAM(section, stream);
-        ctx->cur_column += HDstrlen(section);
+        ctx->cur_column += strlen(section);
     }
 
     ctx->prev_multiline = multiline;
@@ -1788,7 +1788,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t
     size_t         size; /* datum size */
     hsize_t        block_index;
     H5T_class_t    type_class;
-    hbool_t        past_catch = FALSE;
+    bool           past_catch = false;
     int            ret_value  = 0;
 
     H5TOOLS_START_DEBUG(" ");
@@ -1838,7 +1838,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t
                 if (H5Tis_variable_str(tid)) {
                     s = *(char **)((void *)mem);
                     if (s != NULL)
-                        size = HDstrlen(s);
+                        size = strlen(s);
                     else
                         H5TOOLS_THROW((-1), "NULL string");
                 }
@@ -2036,7 +2036,7 @@ render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t contai
     size_t   type_size;
     hid_t    mem_space  = H5I_INVALID_HID;
     void    *region_buf = NULL;
-    hbool_t  past_catch = FALSE;
+    bool     past_catch = false;
     hsize_t  blkndx;
     hid_t    sid1      = H5I_INVALID_HID;
     int      ret_value = -1;
@@ -2121,7 +2121,7 @@ done:;
  *           True otherwise
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream, hid_t container)
 {
     hssize_t snblocks;
@@ -2132,30 +2132,30 @@ render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *strea
     unsigned ndims;
     hid_t    dtype      = H5I_INVALID_HID;
     hid_t    type_id    = H5I_INVALID_HID;
-    hbool_t  past_catch = FALSE;
-    hbool_t  ret_value  = TRUE;
+    bool     past_catch = false;
+    bool     ret_value  = true;
 
     H5TOOLS_START_DEBUG(" ");
     if ((snblocks = H5Sget_select_hyper_nblocks(region_space)) <= 0)
-        H5TOOLS_THROW(FALSE, "H5Sget_select_hyper_nblocks failed");
+        H5TOOLS_THROW(false, "H5Sget_select_hyper_nblocks failed");
     nblocks = (hsize_t)snblocks;
 
     /* Print block information */
     if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
-        H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed");
+        H5TOOLS_THROW(false, "H5Sget_simple_extent_ndims failed");
     ndims = (unsigned)sndims;
 
     alloc_size = nblocks * ndims * 2 * sizeof(ptdata[0]);
     if ((ptdata = (hsize_t *)malloc((size_t)alloc_size)) == NULL)
-        H5TOOLS_GOTO_ERROR(FALSE, "Could not allocate buffer for ptdata");
+        H5TOOLS_GOTO_ERROR(false, "Could not allocate buffer for ptdata");
 
     if (H5Sget_select_hyper_blocklist(region_space, (hsize_t)0, nblocks, ptdata) < 0)
-        H5TOOLS_GOTO_ERROR(FALSE, "H5Rget_select_hyper_blocklist failed");
+        H5TOOLS_GOTO_ERROR(false, "H5Rget_select_hyper_blocklist failed");
 
     if ((dtype = H5Dget_type(region_id)) < 0)
-        H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed");
+        H5TOOLS_GOTO_ERROR(false, "H5Dget_type failed");
     if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
-        H5TOOLS_GOTO_ERROR(FALSE, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(false, "H5Tget_native_type failed");
 
     render_bin_output_region_data_blocks(region_id, stream, container, ndims, type_id, nblocks, ptdata);
 
@@ -2163,12 +2163,12 @@ done:
     free(ptdata);
 
     if (type_id > 0 && H5Tclose(type_id) < 0)
-        H5TOOLS_ERROR(FALSE, "H5Tclose failed");
+        H5TOOLS_ERROR(false, "H5Tclose failed");
 
     if (dtype > 0 && H5Tclose(dtype) < 0)
-        H5TOOLS_ERROR(FALSE, "H5Tclose failed");
+        H5TOOLS_ERROR(false, "H5Tclose failed");
 
-    H5_LEAVE(TRUE);
+    H5_LEAVE(true);
 
     CATCH
     H5TOOLS_ENDDEBUG(" ");
@@ -2246,7 +2246,7 @@ done:
  *           True otherwise
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream, hid_t container)
 {
     hssize_t snpoints;
@@ -2255,33 +2255,33 @@ render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *strea
     unsigned ndims;
     hid_t    dtype      = H5I_INVALID_HID;
     hid_t    type_id    = H5I_INVALID_HID;
-    hbool_t  past_catch = FALSE;
-    hbool_t  ret_value  = TRUE;
+    bool     past_catch = false;
+    bool     ret_value  = true;
 
     H5TOOLS_START_DEBUG(" ");
     if ((snpoints = H5Sget_select_elem_npoints(region_space)) <= 0)
-        H5TOOLS_THROW(FALSE, "H5Sget_select_elem_npoints failed");
+        H5TOOLS_THROW(false, "H5Sget_select_elem_npoints failed");
     npoints = (hsize_t)snpoints;
 
     /* Allocate space for the dimension array */
     if ((sndims = H5Sget_simple_extent_ndims(region_space)) < 0)
-        H5TOOLS_THROW(FALSE, "H5Sget_simple_extent_ndims failed");
+        H5TOOLS_THROW(false, "H5Sget_simple_extent_ndims failed");
     ndims = (unsigned)sndims;
 
     if ((dtype = H5Dget_type(region_id)) < 0)
-        H5TOOLS_GOTO_ERROR(FALSE, "H5Dget_type failed");
+        H5TOOLS_GOTO_ERROR(false, "H5Dget_type failed");
 
     if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
-        H5TOOLS_GOTO_ERROR(FALSE, "H5Tget_native_type failed");
+        H5TOOLS_GOTO_ERROR(false, "H5Tget_native_type failed");
 
     render_bin_output_region_data_points(region_space, region_id, stream, container, ndims, type_id, npoints);
 
 done:
     if (type_id > 0 && H5Tclose(type_id) < 0)
-        H5TOOLS_ERROR(FALSE, "H5Tclose failed");
+        H5TOOLS_ERROR(false, "H5Tclose failed");
 
     if (dtype > 0 && H5Tclose(dtype) < 0)
-        H5TOOLS_ERROR(FALSE, "H5Tclose failed");
+        H5TOOLS_ERROR(false, "H5Tclose failed");
 
     H5_LEAVE(ret_value);
     CATCH
@@ -2294,20 +2294,20 @@ done:
  *
  * Purpose:  Determines if memory is initialized to all zero bytes.
  *
- * Return:   TRUE if all bytes are zero
- *           FALSE otherwise
+ * Return:   true if all bytes are zero
+ *           false otherwise
  *-------------------------------------------------------------------------
  */
-H5_ATTR_PURE hbool_t
+H5_ATTR_PURE bool
 h5tools_is_zero(const void *_mem, size_t size)
 {
     const unsigned char *mem = (const unsigned char *)_mem;
 
     while (size-- > 0)
         if (mem[size])
-            return FALSE;
+            return false;
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -2323,22 +2323,22 @@ h5tools_is_zero(const void *_mem, size_t size)
  *           char *name1:   link name of the first object.
  *                          Use "." or NULL if loc_id2 is the object to be compared.
  *
- * Return:   TRUE if it is the same object
- *           FALSE otherwise.
+ * Return:   true if it is the same object
+ *           false otherwise.
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2)
 {
     H5O_info2_t oinfo1, oinfo2;
-    hbool_t     ret_val = FALSE;
+    bool        ret_val = false;
 
-    if (name1 && HDstrcmp(name1, ".") != 0)
+    if (name1 && strcmp(name1, ".") != 0)
         H5Oget_info_by_name3(loc_id1, name1, &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT);
     else
         H5Oget_info3(loc_id1, &oinfo1, H5O_INFO_BASIC);
 
-    if (name2 && HDstrcmp(name2, ".") != 0)
+    if (name2 && strcmp(name2, ".") != 0)
         H5Oget_info_by_name3(loc_id2, name2, &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     else
         H5Oget_info3(loc_id2, &oinfo2, H5O_INFO_BASIC);
@@ -2349,7 +2349,7 @@ h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char
         H5Otoken_cmp(loc_id1, &oinfo1.token, &oinfo2.token, &token_cmp_val);
 
         if (!token_cmp_val)
-            ret_val = TRUE;
+            ret_val = true;
     }
 
     return ret_val;
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 98ced40..b636806 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -40,7 +40,7 @@
 #define PUTSTREAM(X, S)                                                                                      \
     do {                                                                                                     \
         if (S != NULL)                                                                                       \
-            HDfputs(X, S);                                                                                   \
+            fputs(X, S);                                                                                     \
     } while (0)
 
 /*
@@ -291,7 +291,7 @@ typedef struct h5tool_format_t {
      *
      * Numeric data is also subject to the formats for individual elements.
      */
-    hbool_t     raw;
+    bool        raw;
     const char *fmt_raw;
     const char *fmt_int;
     const char *fmt_uint;
@@ -674,17 +674,17 @@ H5TOOLS_DLL int  h5tools_set_error_file(const char *fname, int is_bin);
 H5TOOLS_DLL hid_t   h5tools_get_fapl(hid_t prev_fapl_id, h5tools_vol_info_t *vol_info,
                                      h5tools_vfd_info_t *vfd_info);
 H5TOOLS_DLL herr_t  h5tools_get_vfd_name(hid_t fid, hid_t fapl_id, char *drivername, size_t drivername_size);
-H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, hbool_t use_specific_driver,
+H5TOOLS_DLL hid_t   h5tools_fopen(const char *fname, unsigned flags, hid_t fapl, bool use_specific_driver,
                                   char *drivername, size_t drivername_size);
 H5TOOLS_DLL hid_t   h5tools_get_little_endian_type(hid_t type);
 H5TOOLS_DLL hid_t   h5tools_get_big_endian_type(hid_t type);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen(hid_t tid);
 H5TOOLS_DLL htri_t  h5tools_detect_vlen_str(hid_t tid);
-H5TOOLS_DLL hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2);
+H5TOOLS_DLL bool    h5tools_is_obj_same(hid_t loc_id1, const char *name1, hid_t loc_id2, const char *name2);
 H5TOOLS_DLL void    init_acc_pos(unsigned ndims, const hsize_t *dims, hsize_t *acc, hsize_t *pos,
                                  hsize_t *p_min_idx);
 H5TOOLS_DLL hsize_t calc_acc_pos(unsigned ndims, hsize_t elemtno, const hsize_t *acc, hsize_t *pos);
-H5TOOLS_DLL hbool_t h5tools_is_zero(const void *_mem, size_t size);
+H5TOOLS_DLL bool    h5tools_is_zero(const void *_mem, size_t size);
 H5TOOLS_DLL int     h5tools_canreadf(const char *name, hid_t dcpl_id);
 H5TOOLS_DLL int     h5tools_can_encode(H5Z_filter_t filtn);
 
@@ -694,25 +694,25 @@ H5TOOLS_DLL void h5tools_region_simple_prefix(FILE *stream, const h5tool_format_
                                               h5tools_context_t *ctx, hsize_t elmtno, hsize_t *ptdata,
                                               int secnum);
 
-H5TOOLS_DLL int     render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts);
-H5TOOLS_DLL int     render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container,
-                                                         unsigned ndims, hid_t type_id, hsize_t nblocks,
-                                                         const hsize_t *ptdata);
-H5TOOLS_DLL hbool_t render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream,
-                                                    hid_t container);
-H5TOOLS_DLL int     render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
-                                                         hid_t container, unsigned ndims, hid_t type_id,
-                                                         hsize_t npoints);
-H5TOOLS_DLL hbool_t render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream,
-                                                    hid_t container);
-
-H5TOOLS_DLL hbool_t h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-                                           h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols,
-                                           hsize_t local_elmt_counter, hsize_t elmt_counter);
-H5TOOLS_DLL hbool_t h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
-                                                  h5tools_context_t *ctx, h5tools_str_t *buffer,
-                                                  hsize_t *curr_pos, size_t ncols, hsize_t *ptdata,
-                                                  hsize_t local_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL int  render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t nelmts);
+H5TOOLS_DLL int  render_bin_output_region_data_blocks(hid_t region_id, FILE *stream, hid_t container,
+                                                      unsigned ndims, hid_t type_id, hsize_t nblocks,
+                                                      const hsize_t *ptdata);
+H5TOOLS_DLL bool render_bin_output_region_blocks(hid_t region_space, hid_t region_id, FILE *stream,
+                                                 hid_t container);
+H5TOOLS_DLL int  render_bin_output_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
+                                                      hid_t container, unsigned ndims, hid_t type_id,
+                                                      hsize_t npoints);
+H5TOOLS_DLL bool render_bin_output_region_points(hid_t region_space, hid_t region_id, FILE *stream,
+                                                 hid_t container);
+
+H5TOOLS_DLL bool h5tools_render_element(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                                        h5tools_str_t *buffer, hsize_t *curr_pos, size_t ncols,
+                                        hsize_t local_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL bool h5tools_render_region_element(FILE *stream, const h5tool_format_t *info,
+                                               h5tools_context_t *ctx, h5tools_str_t *buffer,
+                                               hsize_t *curr_pos, size_t ncols, hsize_t *ptdata,
+                                               hsize_t local_elmt_counter, hsize_t elmt_counter);
 
 #ifdef __cplusplus
 }
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 2986de7..efaddee 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -248,7 +248,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont
     unsigned char *mem = (unsigned char *)_mem;
     hsize_t        i;    /* element counter  */
     size_t         size; /* size of each datum  */
-    hbool_t        dimension_break = TRUE;
+    bool           dimension_break = true;
     size_t         ncols           = 80; /* available output width */
     h5tools_str_t  buffer;               /* string into which to render */
     hsize_t        curr_pos     = 0;     /* total data element position   */
@@ -299,7 +299,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont
             dimension_break =
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, ncols, i, elmt_counter);
             /* Render the data element end*/
-            if (FALSE == dimension_break)
+            if (false == dimension_break)
                 elmt_counter = 0;
         } /* end for (i = 0; i < nelmts... */
         H5TOOLS_DEBUG("data render finish");
@@ -334,7 +334,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont
  *      hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info,
                               h5tools_context_t *ctx,                    /* in,out */
                               h5tools_str_t     *buffer,                 /* string into which to render */
@@ -342,13 +342,13 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format
                               size_t ncols, hsize_t region_elmt_counter, /* element counter */
                               hsize_t elmt_counter)
 {
-    hbool_t         dimension_break = TRUE;
+    bool            dimension_break = true;
     hid_t           atype           = H5I_INVALID_HID;
     hid_t           type_id         = H5I_INVALID_HID;
     hid_t           region_space    = H5I_INVALID_HID;
     h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */
-    hbool_t         past_catch = FALSE;
-    hbool_t         ret_value  = TRUE;
+    bool            past_catch = false;
+    bool            ret_value  = true;
 
     assert(info);
     assert(ctx);
@@ -379,31 +379,31 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format
         H5TOOLS_GOTO_ERROR(dimension_break, "H5Tget_native_type failed");
 
     ctx->indent_level++;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the datatype element begin */
     h5tools_str_reset(buffer);
     h5tools_str_append(buffer, "%s %s ", h5tools_dump_header_format->datatypebegin,
                        h5tools_dump_header_format->datatypeblockbegin);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
     ctx->indent_level++;
-    h5tools_print_datatype(stream, buffer, info, ctx, atype, TRUE);
+    h5tools_print_datatype(stream, buffer, info, ctx, atype, true);
     ctx->indent_level--;
 
-    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+    if (strlen(h5tools_dump_header_format->datatypeblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeblockend);
-        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        if (strlen(h5tools_dump_header_format->datatypeend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+    if (strlen(h5tools_dump_header_format->datatypeend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeend);
 
     dimension_break =
         h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
     /* Render the datatype element end */
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the dataspace element begin */
     h5tools_str_reset(buffer);
@@ -411,12 +411,12 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format
 
     h5tools_print_dataspace(buffer, region_space);
 
-    if (HDstrlen(h5tools_dump_header_format->dataspaceblockend)) {
+    if (strlen(h5tools_dump_header_format->dataspaceblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
-        if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+        if (strlen(h5tools_dump_header_format->dataspaceend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+    if (strlen(h5tools_dump_header_format->dataspaceend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
 
     dimension_break =
@@ -424,9 +424,9 @@ h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format
     /* Render the dataspace element end */
 
     if (region_output) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
-        h5tools_dump_data(stream, &outputformat, ctx, region_id, FALSE);
+        h5tools_dump_data(stream, &outputformat, ctx, region_id, false);
     }
 
 done:
@@ -440,7 +440,7 @@ done:
         H5TOOLS_ERROR(dimension_break, "H5Sclose failed");
 
     ctx->indent_level--;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the region } element begin */
     h5tools_str_reset(buffer);
@@ -482,7 +482,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
                                  size_t ncols, unsigned ndims, hid_t type_id, hsize_t nblocks,
                                  hsize_t *ptdata)
 {
-    hbool_t           dimension_break = TRUE;
+    bool              dimension_break = true;
     hsize_t          *dims1           = NULL;
     hsize_t          *start           = NULL;
     hsize_t          *count           = NULL;
@@ -495,7 +495,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
     hsize_t           numindex;
     unsigned          indx;
     unsigned          jndx;
-    hbool_t           past_catch = FALSE;
+    bool              past_catch = false;
     size_t            type_size;
     hid_t             mem_space = H5I_INVALID_HID;
     hid_t             sid1      = H5I_INVALID_HID;
@@ -551,7 +551,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
     ctx.prev_multiline = cur_ctx->prev_multiline;
     ctx.ndims          = ndims;
     for (blkndx = 0; blkndx < nblocks; blkndx++) {
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
         ctx.cur_elmt    = 0;
         for (indx = 0; indx < ndims; indx++) {
             start[indx] = ptdata[indx + blkndx * ndims * 2];
@@ -600,7 +600,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for
                                                                         ncols, ptdata, numindex, elmtno);
                         /* Render the region data element end */
 
-                        if (FALSE == dimension_break)
+                        if (false == dimension_break)
                             elmtno = 0;
                     } /* end for (numindex = 0; numindex < numelem; numindex++, elmtno++, ctx.cur_elmt++) */
                 }
@@ -658,7 +658,7 @@ done:
  *      hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream,
                                 const h5tool_format_t *info, h5tools_context_t *ctx, /* in,out */
                                 h5tools_str_t *buffer,                     /* string into which to render */
@@ -666,7 +666,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
                                 size_t ncols, hsize_t region_elmt_counter, /* element counter */
                                 hsize_t elmt_counter)
 {
-    hbool_t         dimension_break = TRUE;
+    bool            dimension_break = true;
     hssize_t        snblocks;
     hsize_t         nblocks;
     hsize_t         alloc_size;
@@ -677,8 +677,8 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
     hid_t           dtype   = H5I_INVALID_HID;
     hid_t           type_id = H5I_INVALID_HID;
     h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */
-    hbool_t         past_catch = FALSE;
-    hbool_t         ret_value  = TRUE;
+    bool            past_catch = false;
+    bool            ret_value  = true;
 
     assert(info);
     assert(ctx);
@@ -711,7 +711,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
     /* Render the region { element end */
 
     ctx->indent_level++;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the region datatype info and indices element begin */
     h5tools_str_reset(buffer);
@@ -749,7 +749,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
         h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
     /* Render the region datatype info and indices element end */
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     if ((dtype = H5Dget_type(region_id)) < 0)
         H5TOOLS_GOTO_ERROR(dimension_break, "H5Dget_type failed");
@@ -762,22 +762,22 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
                        h5tools_dump_header_format->datatypeblockbegin);
 
     ctx->indent_level++;
-    h5tools_print_datatype(stream, buffer, info, ctx, dtype, TRUE);
+    h5tools_print_datatype(stream, buffer, info, ctx, dtype, true);
     ctx->indent_level--;
 
-    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+    if (strlen(h5tools_dump_header_format->datatypeblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeblockend);
-        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        if (strlen(h5tools_dump_header_format->datatypeend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+    if (strlen(h5tools_dump_header_format->datatypeend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeend);
 
     dimension_break =
         h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
     /* Render the datatype element end */
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the dataspace element begin */
     h5tools_str_reset(buffer);
@@ -785,12 +785,12 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
 
     h5tools_print_dataspace(buffer, region_space);
 
-    if (HDstrlen(h5tools_dump_header_format->dataspaceblockend)) {
+    if (strlen(h5tools_dump_header_format->dataspaceblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
-        if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+        if (strlen(h5tools_dump_header_format->dataspaceend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+    if (strlen(h5tools_dump_header_format->dataspaceend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
 
     dimension_break =
@@ -798,7 +798,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
     /* Render the dataspace element end */
 
     if (region_output) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         /* Render the databegin element begin */
         h5tools_str_reset(buffer);
@@ -808,7 +808,7 @@ h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *strea
                                                  region_elmt_counter, elmt_counter);
         /* Render the databegin element end */
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_print_region_data_blocks(region_id, rawdatastream, info, ctx, buffer, ncols, ndims, type_id,
                                          nblocks, ptdata);
@@ -824,17 +824,17 @@ done:
         H5TOOLS_ERROR(dimension_break, "H5Tclose failed");
 
     if (region_output) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         /* Render the dataend element begin */
         h5tools_str_reset(buffer);
-        if (HDstrlen(h5tools_dump_header_format->datablockend)) {
+        if (strlen(h5tools_dump_header_format->datablockend)) {
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datablockend);
-            if (HDstrlen(h5tools_dump_header_format->dataend))
+            if (strlen(h5tools_dump_header_format->dataend))
                 h5tools_str_append(buffer, " ");
         }
 
-        if (HDstrlen(h5tools_dump_header_format->dataend))
+        if (strlen(h5tools_dump_header_format->dataend))
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataend);
         dimension_break = h5tools_render_element(stream, &outputformat, ctx, buffer, curr_pos, ncols,
                                                  region_elmt_counter, elmt_counter);
@@ -842,7 +842,7 @@ done:
     }
 
     ctx->indent_level--;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the region } element begin */
     h5tools_str_reset(buffer);
@@ -884,7 +884,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre
                                  h5tools_str_t *buffer, size_t ncols, unsigned ndims, hid_t type_id,
                                  hsize_t npoints, hsize_t *ptdata)
 {
-    hbool_t           dimension_break = TRUE;
+    bool              dimension_break = true;
     hsize_t          *dims1           = NULL;
     hsize_t           elmtno; /* element index  */
     hsize_t           curr_pos = 0;
@@ -896,7 +896,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre
     hid_t             mem_space  = H5I_INVALID_HID;
     void             *region_buf = NULL;
     h5tools_context_t ctx;
-    hbool_t           past_catch = FALSE;
+    bool              past_catch = false;
     int               ret_value  = 0;
 
     assert(info);
@@ -936,7 +936,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre
     H5TOOLS_DEBUG("data render start:%ld", npoints);
     elmtno = 0;
     for (jndx = 0; jndx < npoints; jndx++, elmtno++) {
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
         ctx.cur_elmt    = 0; /* points are always 0 */
         ctx.indent_level++;
 
@@ -974,7 +974,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre
             dimension_break = h5tools_render_region_element(stream, info, &ctx, buffer, &curr_pos, ncols,
                                                             ptdata, (hsize_t)0, elmtno);
             /* Render the point element end */
-            if (FALSE == dimension_break)
+            if (false == dimension_break)
                 elmtno = 0;
         }
         else {
@@ -1019,13 +1019,13 @@ done:
  *      hsize_t elmt_count is the data element loop counter
  *-------------------------------------------------------------------------
  */
-hbool_t
+bool
 h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
                                 const h5tool_format_t *info, h5tools_context_t *ctx, h5tools_str_t *buffer,
                                 hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter,
                                 hsize_t elmt_counter)
 {
-    hbool_t         dimension_break = TRUE;
+    bool            dimension_break = true;
     hssize_t        snpoints;
     hsize_t         npoints;
     hsize_t         alloc_size;
@@ -1036,8 +1036,8 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
     hid_t           dtype   = H5I_INVALID_HID;
     hid_t           type_id = H5I_INVALID_HID;
     h5tool_format_t outputformat; /* Use to disable prefix for DATA attribute display */
-    hbool_t         past_catch = FALSE;
-    hbool_t         ret_value  = TRUE;
+    bool            past_catch = false;
+    bool            ret_value  = true;
 
     assert(info);
     assert(ctx);
@@ -1070,7 +1070,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
     /* Render the region { element end */
 
     ctx->indent_level++;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the region datatype info and indices element begin */
     h5tools_str_reset(buffer);
@@ -1103,7 +1103,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
         h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
     /* Render the region datatype info and indices element end */
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     if ((dtype = H5Dget_type(region_id)) < 0)
         H5TOOLS_GOTO_ERROR(dimension_break, "H5Dget_type failed");
@@ -1116,22 +1116,22 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
                        h5tools_dump_header_format->datatypeblockbegin);
 
     ctx->indent_level++;
-    h5tools_print_datatype(stream, buffer, info, ctx, dtype, TRUE);
+    h5tools_print_datatype(stream, buffer, info, ctx, dtype, true);
     ctx->indent_level--;
 
-    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+    if (strlen(h5tools_dump_header_format->datatypeblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeblockend);
-        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        if (strlen(h5tools_dump_header_format->datatypeend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+    if (strlen(h5tools_dump_header_format->datatypeend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datatypeend);
 
     dimension_break =
         h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols, region_elmt_counter, elmt_counter);
     /* Render the datatype element end */
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the dataspace element begin */
     h5tools_str_reset(buffer);
@@ -1139,12 +1139,12 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
 
     h5tools_print_dataspace(buffer, region_space);
 
-    if (HDstrlen(h5tools_dump_header_format->dataspaceblockend)) {
+    if (strlen(h5tools_dump_header_format->dataspaceblockend)) {
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
-        if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+        if (strlen(h5tools_dump_header_format->dataspaceend))
             h5tools_str_append(buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+    if (strlen(h5tools_dump_header_format->dataspaceend))
         h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
 
     dimension_break =
@@ -1152,7 +1152,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
     /* Render the dataspace element end */
 
     if (region_output) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         /* Render the databegin element begin */
         h5tools_str_reset(buffer);
@@ -1163,7 +1163,7 @@ h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *strea
         dimension_break = h5tools_render_element(stream, info, ctx, buffer, curr_pos, ncols,
                                                  region_elmt_counter, elmt_counter);
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_print_region_data_points(region_space, region_id, rawdatastream, info, ctx, buffer, ncols,
                                          ndims, type_id, npoints, ptdata);
@@ -1179,17 +1179,17 @@ done:
         H5TOOLS_ERROR(dimension_break, "H5Tclose failed");
 
     if (region_output) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         /* Render the dataend element begin */
         h5tools_str_reset(buffer);
-        if (HDstrlen(h5tools_dump_header_format->datablockend)) {
+        if (strlen(h5tools_dump_header_format->datablockend)) {
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->datablockend);
-            if (HDstrlen(h5tools_dump_header_format->dataend))
+            if (strlen(h5tools_dump_header_format->dataend))
                 h5tools_str_append(buffer, " ");
         }
 
-        if (HDstrlen(h5tools_dump_header_format->dataend))
+        if (strlen(h5tools_dump_header_format->dataend))
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->dataend);
         dimension_break = h5tools_render_element(stream, &outputformat, ctx, buffer, curr_pos, ncols,
                                                  region_elmt_counter, elmt_counter);
@@ -1197,7 +1197,7 @@ done:
     }
 
     ctx->indent_level--;
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     /* Render the region } element begin */
     h5tools_str_reset(buffer);
@@ -1271,7 +1271,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
     hid_t          sm_space = H5I_INVALID_HID; /* stripmine data space */
     hsize_t        size_row_block;             /* size for blocks along rows */
     hsize_t        row_counter = 0;
-    hbool_t        past_catch  = FALSE;
+    bool           past_catch  = false;
     /* VL data special information */
     unsigned int vl_data   = 0; /* contains VL datatypes */
     herr_t       ret_value = SUCCEED;
@@ -1283,8 +1283,8 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
     size_row_block = ctx->sset->block.data[row_dim];
 
     /* Check if we have VL data in the dataset's datatype */
-    if (h5tools_detect_vlen(p_type) == TRUE)
-        vl_data = TRUE;
+    if (h5tools_detect_vlen(p_type) == true)
+        vl_data = true;
 
     /* display loop */
     for (; hyperslab_count > 0; temp_start[row_dim] += temp_stride[row_dim], hyperslab_count--) {
@@ -1364,7 +1364,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c
             }
             ctx->sm_pos += low[ctx->ndims - 1];
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             if (h5tools_dump_simple_data(stream, info, ctx, dset, flags, sm_nelmts, p_type, sm_buf) < 0)
                 H5TOOLS_THROW(FAIL, "h5tools_dump_simple_data failed");
@@ -1566,7 +1566,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co
     int     sndims;
     hid_t   f_space = H5I_INVALID_HID; /* file data space */
     hsize_t total_size[H5S_MAX_RANK];  /* total size of dataset*/
-    hbool_t past_catch = FALSE;
+    bool    past_catch = false;
     herr_t  ret_value  = SUCCEED;
 
     H5TOOLS_START_DEBUG(" ");
@@ -1624,7 +1624,7 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
     hsize_t      zero[8];                   /* vector of zeros */
     unsigned int flags;                     /* buffer extent flags */
     hsize_t      total_size[H5S_MAX_RANK];  /* total size of dataset*/
-    hbool_t      past_catch = FALSE;
+    bool         past_catch = false;
 
     /* Print info */
     size_t  p_type_nbytes; /* size of memory type */
@@ -1679,8 +1679,8 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont
     }
 
     /* Check if we have VL data in the dataset's datatype */
-    if (h5tools_detect_vlen(p_type) == TRUE)
-        vl_data = TRUE;
+    if (h5tools_detect_vlen(p_type) == true)
+        vl_data = true;
 
     /*
      * Determine the strip mine size and allocate a buffer. The strip mine is
@@ -1805,7 +1805,7 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte
     unsigned       i;                        /* counters  */
     hsize_t        total_size[H5S_MAX_RANK]; /* total size of dataset*/
     hsize_t        p_nelmts;                 /* total selected elmts */
-    hbool_t        past_catch = FALSE;
+    bool           past_catch = false;
     unsigned char *buf        = NULL; /* buffer for raw data */
     int            ret_value  = 0;
 
@@ -1844,8 +1844,8 @@ h5tools_dump_simple_mem(FILE *stream, const h5tool_format_t *info, h5tools_conte
         H5_LEAVE(SUCCEED); /* nothing to print */
 
     /* Check if we have VL data in the dataset's datatype */
-    if (h5tools_detect_vlen(p_type) == TRUE)
-        vl_data = TRUE;
+    if (h5tools_detect_vlen(p_type) == true)
+        vl_data = true;
 
     alloc_size = p_nelmts * H5Tget_size(p_type);
     assert(alloc_size == (hsize_t)((size_t)alloc_size)); /*check for overflow*/
@@ -2062,8 +2062,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
     H5T_order_t order;
     H5T_class_t type_class;
     H5T_sign_t  sign; /* sign scheme value */
-    htri_t      is_vlstr   = FALSE;
-    hbool_t     past_catch = FALSE;
+    htri_t      is_vlstr   = false;
+    bool        past_catch = false;
     const char *sign_s     = NULL; /* sign scheme string */
     const char *order_s    = NULL; /* byte order string */
     int         ret_value  = 0;
@@ -2102,57 +2102,57 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
 
     switch (type_class) {
         case H5T_INTEGER:
-            if (H5Tequal(type, H5T_STD_I8BE) == TRUE)
+            if (H5Tequal(type, H5T_STD_I8BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I8BE");
-            else if (H5Tequal(type, H5T_STD_I8LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I8LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I8LE");
-            else if (H5Tequal(type, H5T_STD_I16BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I16BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I16BE");
-            else if (H5Tequal(type, H5T_STD_I16LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I16LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I16LE");
-            else if (H5Tequal(type, H5T_STD_I32BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I32BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I32BE");
-            else if (H5Tequal(type, H5T_STD_I32LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I32LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I32LE");
-            else if (H5Tequal(type, H5T_STD_I64BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I64BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I64BE");
-            else if (H5Tequal(type, H5T_STD_I64LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_I64LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_I64LE");
-            else if (H5Tequal(type, H5T_STD_U8BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U8BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U8BE");
-            else if (H5Tequal(type, H5T_STD_U8LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U8LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U8LE");
-            else if (H5Tequal(type, H5T_STD_U16BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U16BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U16BE");
-            else if (H5Tequal(type, H5T_STD_U16LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U16LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U16LE");
-            else if (H5Tequal(type, H5T_STD_U32BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U32BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U32BE");
-            else if (H5Tequal(type, H5T_STD_U32LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U32LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U32LE");
-            else if (H5Tequal(type, H5T_STD_U64BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U64BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U64BE");
-            else if (H5Tequal(type, H5T_STD_U64LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_U64LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_U64LE");
-            else if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_SCHAR) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_SCHAR");
-            else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_UCHAR) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_UCHAR");
-            else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_SHORT) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_SHORT");
-            else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_USHORT) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_USHORT");
-            else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_INT) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_INT");
-            else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_UINT) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_UINT");
-            else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_LONG) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_LONG");
-            else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_ULONG) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_ULONG");
-            else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_LLONG) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_LLONG");
-            else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_ULLONG) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_ULLONG");
             else {
 
@@ -2190,21 +2190,21 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             break;
 
         case H5T_FLOAT:
-            if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE)
+            if (H5Tequal(type, H5T_IEEE_F32BE) == true)
                 h5tools_str_append(buffer, "H5T_IEEE_F32BE");
-            else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE)
+            else if (H5Tequal(type, H5T_IEEE_F32LE) == true)
                 h5tools_str_append(buffer, "H5T_IEEE_F32LE");
-            else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE)
+            else if (H5Tequal(type, H5T_IEEE_F64BE) == true)
                 h5tools_str_append(buffer, "H5T_IEEE_F64BE");
-            else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE)
+            else if (H5Tequal(type, H5T_IEEE_F64LE) == true)
                 h5tools_str_append(buffer, "H5T_IEEE_F64LE");
-            else if (H5Tequal(type, H5T_VAX_F32) == TRUE)
+            else if (H5Tequal(type, H5T_VAX_F32) == true)
                 h5tools_str_append(buffer, "H5T_VAX_F32");
-            else if (H5Tequal(type, H5T_VAX_F64) == TRUE)
+            else if (H5Tequal(type, H5T_VAX_F64) == true)
                 h5tools_str_append(buffer, "H5T_VAX_F64");
-            else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_FLOAT) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_FLOAT");
-            else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE)
+            else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == true)
                 h5tools_str_append(buffer, "H5T_NATIVE_DOUBLE");
             else {
                 /* print what the library knows */
@@ -2250,7 +2250,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
 
             ctx->indent_level++;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
 
@@ -2261,7 +2261,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
 
@@ -2301,7 +2301,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
 
@@ -2340,7 +2340,7 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
             h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
 
@@ -2415,7 +2415,7 @@ found_string_type:
                                    (hsize_t)0);
             ctx->indent_level--;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             if (H5Tclose(str_type) < 0)
@@ -2427,21 +2427,21 @@ found_string_type:
             break;
 
         case H5T_BITFIELD:
-            if (H5Tequal(type, H5T_STD_B8BE) == TRUE)
+            if (H5Tequal(type, H5T_STD_B8BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B8BE");
-            else if (H5Tequal(type, H5T_STD_B8LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B8LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B8LE");
-            else if (H5Tequal(type, H5T_STD_B16BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B16BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B16BE");
-            else if (H5Tequal(type, H5T_STD_B16LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B16LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B16LE");
-            else if (H5Tequal(type, H5T_STD_B32BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B32BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B32BE");
-            else if (H5Tequal(type, H5T_STD_B32LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B32LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B32LE");
-            else if (H5Tequal(type, H5T_STD_B64BE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B64BE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B64BE");
-            else if (H5Tequal(type, H5T_STD_B64LE) == TRUE)
+            else if (H5Tequal(type, H5T_STD_B64LE) == true)
                 h5tools_str_append(buffer, "H5T_STD_B64LE");
             else
                 h5tools_str_append(buffer, "undefined bitfield");
@@ -2458,7 +2458,7 @@ found_string_type:
                 if (NULL == (ttag = H5Tget_tag(type)))
                     H5TOOLS_THROW((-1), "H5Tget_tag failed");
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(buffer);
                 h5tools_str_append(buffer, "OPAQUE_TAG \"%s\";", ttag);
@@ -2468,7 +2468,7 @@ found_string_type:
                 H5free_memory(ttag);
 
                 if ((size = H5Tget_size(type)) <= 0) {
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(buffer);
                     h5tools_str_append(buffer, "OPAQUE_SIZE \"%zu\";", size);
@@ -2478,7 +2478,7 @@ found_string_type:
             }
             ctx->indent_level--;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->opaqblockend);
@@ -2497,10 +2497,10 @@ found_string_type:
             for (i = 0; i < nmembers; i++) {
                 mname = H5Tget_member_name(type, i);
                 if ((mtype = H5Tget_member_type(type, i)) >= 0) {
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(buffer);
-                    h5tools_print_datatype(stream, buffer, info, ctx, mtype, TRUE);
+                    h5tools_print_datatype(stream, buffer, info, ctx, mtype, true);
 
                     h5tools_str_append(buffer, " \"%s\";", mname);
                     h5tools_render_element(stream, info, ctx, buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
@@ -2514,7 +2514,7 @@ found_string_type:
             }
             ctx->indent_level--;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->cmpdblockend);
@@ -2522,13 +2522,13 @@ found_string_type:
 
         case H5T_REFERENCE:
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->refblockbegin);
-            if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
+            if (H5Tequal(type, H5T_STD_REF_DSETREG) == true) {
                 h5tools_str_append(buffer, "H5T_STD_REF_DSETREG");
             }
-            else if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
+            else if (H5Tequal(type, H5T_STD_REF_OBJ) == true) {
                 h5tools_str_append(buffer, "H5T_STD_REF_OBJECT");
             }
-            else if (H5Tequal(type, H5T_STD_REF) == TRUE) {
+            else if (H5Tequal(type, H5T_STD_REF) == true) {
                 h5tools_str_append(buffer, "H5T_STD_REF");
             }
             else {
@@ -2546,10 +2546,10 @@ found_string_type:
                                    (hsize_t)0);
             ctx->indent_level++;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
-            h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE);
+            h5tools_print_datatype(stream, buffer, info, ctx, super, true);
 
             if (H5Tclose(super) < 0)
                 H5TOOLS_ERROR((-1), "H5Tclose failed");
@@ -2562,7 +2562,7 @@ found_string_type:
 
             ctx->indent_level--;
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->enumblockend);
@@ -2575,7 +2575,7 @@ found_string_type:
 
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->vlenblockbegin);
 
-            h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE);
+            h5tools_print_datatype(stream, buffer, info, ctx, super, true);
 
             if (H5Tclose(super) < 0)
                 H5TOOLS_ERROR((-1), "H5Tclose failed");
@@ -2607,7 +2607,7 @@ found_string_type:
             /* Get array base type */
             if ((super = H5Tget_super(type)) >= 0) {
                 /* Print base type */
-                h5tools_print_datatype(stream, buffer, info, ctx, super, TRUE);
+                h5tools_print_datatype(stream, buffer, info, ctx, super, true);
                 /* Close array base type */
                 if (H5Tclose(super) < 0)
                     H5TOOLS_ERROR((-1), "H5Tclose failed");
@@ -2649,7 +2649,7 @@ h5tools_print_dataspace(h5tools_str_t *buffer, hid_t space)
     hsize_t     maxsize[H5TOOLS_DUMP_MAX_RANK];
     int         ndims      = -1;
     H5S_class_t space_type = -1;
-    hbool_t     past_catch = FALSE;
+    bool        past_catch = false;
     int         i;
     int         ret_value = 0;
 
@@ -2738,7 +2738,7 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i
     size_t         dst_size;                 /*destination value type size    */
     size_t         ncols      = 80;          /*available output width */
     hsize_t        curr_pos   = 0;           /* total data element position   */
-    hbool_t        past_catch = FALSE;
+    bool           past_catch = false;
     int            ret_value  = 0;
 
     H5TOOLS_START_DEBUG(" ");
@@ -2802,12 +2802,12 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i
     for (i = 0; i < nmembs; i++) {
         int nchars; /*number of output characters    */
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
         h5tools_simple_prefix(stream, info, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(buffer);
         h5tools_str_append(buffer, "\"%s\"", name[i]);
-        nchars = (int)HDstrlen(name[i]);
+        nchars = (int)strlen(name[i]);
         h5tools_str_append(buffer, "%*s ", MAX(0, 16 - nchars), "");
 
         if (native < 0) {
@@ -2885,18 +2885,18 @@ h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, h5tools_context
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->datatypebegin,
                        h5tools_dump_header_format->datatypeblockbegin);
-    h5tools_print_datatype(stream, &buffer, info, ctx, type, TRUE);
-    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+    h5tools_print_datatype(stream, &buffer, info, ctx, type, true);
+    if (strlen(h5tools_dump_header_format->datatypeblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datatypeblockend);
-        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        if (strlen(h5tools_dump_header_format->datatypeend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+    if (strlen(h5tools_dump_header_format->datatypeend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datatypeend);
 
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -2931,19 +2931,19 @@ h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, h5tools_contex
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s ", h5tools_dump_header_format->dataspacebegin);
 
     h5tools_print_dataspace(&buffer, type);
 
-    if (HDstrlen(h5tools_dump_header_format->dataspaceblockend)) {
+    if (strlen(h5tools_dump_header_format->dataspaceblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->dataspaceblockend);
-        if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+        if (strlen(h5tools_dump_header_format->dataspaceend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->dataspaceend))
+    if (strlen(h5tools_dump_header_format->dataspaceend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->dataspaceend);
 
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -2978,7 +2978,7 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, h5tools_context_t *c
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s %" PRId64 " %s", OBJID, BEGIN, oid, END);
@@ -3004,7 +3004,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_
 {
     switch (H5Sget_select_type(vspace)) {
         case H5S_SEL_NONE: /* Nothing selected         */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", VDS_NONE);
@@ -3017,7 +3017,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_
             h5tools_str_append(buffer, " %s", h5tools_dump_header_format->virtualselectionblockend);
             break;
         case H5S_SEL_HYPERSLABS: /* "New-style" hyperslab selection defined  */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             if (H5Sis_regular_hyperslab(vspace)) {
@@ -3035,7 +3035,7 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_
                 h5tools_render_element(stream, info, ctx, buffer, curr_pos, (size_t)ncols, (hsize_t)0,
                                        (hsize_t)0);
                 ctx->indent_level++;
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
                 h5tools_simple_prefix(stream, info, ctx, *curr_pos, 0);
 
                 h5tools_str_reset(buffer);
@@ -3044,13 +3044,13 @@ h5tools_print_virtual_selection(hid_t vspace, FILE *stream, const h5tool_format_
             }
             h5tools_render_element(stream, info, ctx, buffer, curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", h5tools_dump_header_format->virtualselectionblockend);
             break;
         case H5S_SEL_ALL: /* Entire extent selected   */
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(buffer);
             h5tools_str_append(buffer, "%s", VDS_ALL);
@@ -3082,7 +3082,7 @@ h5tools_print_fill_value(h5tools_str_t *buffer /*in,out*/, const h5tool_format_t
 
     n_type = H5Tget_native_type(type_id, H5T_DIR_DEFAULT);
 
-    if (h5tools_detect_vlen(type_id) == TRUE)
+    if (h5tools_detect_vlen(type_id) == true)
         vl_data = true;
 
     size = H5Tget_size(n_type);
@@ -3154,13 +3154,13 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     if (dcpl_id >= 0)
         nfilters = H5Pget_nfilters(dcpl_id);
 
-    HDstrcpy(f_name, "\0");
+    strcpy(f_name, "\0");
 
     /*-------------------------------------------------------------------------
      * STORAGE_LAYOUT
      *-------------------------------------------------------------------------
      */
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", STORAGE_LAYOUT, BEGIN);
@@ -3172,7 +3172,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     switch (stl) {
         case H5D_CHUNKED:
             ctx->indent_level++;
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "%s ", CHUNKED);
@@ -3186,7 +3186,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(&buffer);
 
@@ -3241,14 +3241,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
             break;
         case H5D_COMPACT:
             ctx->indent_level++;
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "%s", COMPACT);
             h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                    (hsize_t)0);
 
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "SIZE %" PRIuHSIZE, storage_size);
@@ -3266,14 +3266,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                 /* EXTERNAL FILE */
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "%s", CONTIGUOUS);
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                        (hsize_t)0);
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "%s %s", EXTERNAL, BEGIN);
@@ -3284,7 +3284,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                 for (j = 0; j < (unsigned)n_external; j++) {
                     H5Pget_external(dcpl_id, j, sizeof(name), name, &offset, &size);
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "FILENAME %s SIZE %" PRIuHSIZE, name, size);
@@ -3298,7 +3298,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                 }
                 ctx->indent_level--;
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "%s", END);
@@ -3311,14 +3311,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                 /* NORMAL FILE */
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "%s", CONTIGUOUS);
                 h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                        (hsize_t)0);
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "SIZE %" PRIuHSIZE, storage_size);
@@ -3332,7 +3332,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                 if (supported & H5VL_OPT_QUERY_SUPPORTED) {
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     ioffset = H5Dget_offset(dset_id);
@@ -3362,7 +3362,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                     hid_t virtual_vspace   = H5Pget_virtual_vspace(dcpl_id, curr_vmap);
                     hid_t virtual_srcspace = H5Pget_virtual_srcspace(dcpl_id, curr_vmap);
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %zu %s ", VDS_MAPPING, curr_vmap, BEGIN);
@@ -3371,7 +3371,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                     ctx->indent_level++;
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %s", VDS_VIRTUAL, BEGIN);
@@ -3385,14 +3385,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                     ctx->indent_level--;
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", END);
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                            (hsize_t)0);
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %s", VDS_SOURCE, BEGIN);
@@ -3410,7 +3410,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                     assert((size_t)ssize_out < sizeof(name));
                     H5Pget_virtual_dsetname(dcpl_id, curr_vmap, dsetname, sizeof(dsetname));
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %s", VDS_SRC_FILE,
@@ -3420,7 +3420,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                            (hsize_t)0);
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s %s", VDS_SRC_DATASET,
@@ -3435,7 +3435,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                     ctx->indent_level--;
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", END);
@@ -3444,7 +3444,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                     ctx->indent_level--;
 
-                    ctx->need_prefix = TRUE;
+                    ctx->need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "%s", END);
@@ -3464,7 +3464,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                                    (hsize_t)0);
     } /*switch*/
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3475,7 +3475,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
      *-------------------------------------------------------------------------
      */
     if (H5D_VIRTUAL != stl) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "%s %s", FILTERS, BEGIN);
@@ -3492,7 +3492,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                 if (filtn < 0)
                     continue; /* nothing to print for invalid filter */
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 switch (filtn) {
@@ -3522,14 +3522,14 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                         ctx->indent_level++;
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "PIXELS_PER_BLOCK %d", szip_pixels_per_block);
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols,
                                                (hsize_t)0, (hsize_t)0);
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         if (szip_options_mask & H5_SZIP_CHIP_OPTION_MASK)
@@ -3539,7 +3539,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols,
                                                (hsize_t)0, (hsize_t)0);
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         if (szip_options_mask & H5_SZIP_EC_OPTION_MASK)
@@ -3549,7 +3549,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                         h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols,
                                                (hsize_t)0, (hsize_t)0);
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         if (szip_options_mask & H5_SZIP_LSB_OPTION_MASK)
@@ -3560,7 +3560,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                                                (hsize_t)0, (hsize_t)0);
 
                         if (szip_options_mask & H5_SZIP_RAW_OPTION_MASK) {
-                            ctx->need_prefix = TRUE;
+                            ctx->need_prefix = true;
 
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "HEADER %s", "RAW");
@@ -3570,7 +3570,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                         ctx->indent_level--;
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s", END);
@@ -3595,7 +3595,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
                         ctx->indent_level++;
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "FILTER_ID %d", filtn);
@@ -3603,7 +3603,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                                                (hsize_t)0, (hsize_t)0);
 
                         if (f_name[0] != '\0') {
-                            ctx->need_prefix = TRUE;
+                            ctx->need_prefix = true;
 
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "COMMENT %s", f_name);
@@ -3611,7 +3611,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                                                    (hsize_t)0, (hsize_t)0);
                         }
                         if (cd_nelmts) {
-                            ctx->need_prefix = TRUE;
+                            ctx->need_prefix = true;
 
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "%s %s ", "PARAMS", BEGIN);
@@ -3623,7 +3623,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                         }
                         ctx->indent_level--;
 
-                        ctx->need_prefix = TRUE;
+                        ctx->need_prefix = true;
 
                         h5tools_str_reset(&buffer);
                         h5tools_str_append(&buffer, "%s", END);
@@ -3634,7 +3634,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
             }     /*i*/
         }         /*nfilters*/
         else {
-            ctx->need_prefix = TRUE;
+            ctx->need_prefix = true;
 
             h5tools_str_reset(&buffer);
             h5tools_str_append(&buffer, "NONE");
@@ -3643,7 +3643,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
         }
         ctx->indent_level--;
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "%s", END);
@@ -3654,7 +3654,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
      * FILLVALUE
      *-------------------------------------------------------------------------
      */
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", FILLVALUE, BEGIN);
@@ -3662,7 +3662,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
     ctx->indent_level++;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "FILL_TIME ");
@@ -3687,7 +3687,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     }
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s ", "VALUE ");
@@ -3715,7 +3715,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
     ctx->indent_level--;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s", END);
@@ -3726,7 +3726,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
      *-------------------------------------------------------------------------
      */
     if (H5D_VIRTUAL != stl) {
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "ALLOCATION_TIME %s", BEGIN);
@@ -3734,7 +3734,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
         ctx->indent_level++;
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_str_reset(&buffer);
 
@@ -3761,7 +3761,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
         ctx->indent_level--;
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
 
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, "%s", END);
@@ -3816,7 +3816,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_
             if (cmt_bufsize > 0) {
                 comment[cmt_bufsize] = '\0'; /* necessary because null char is not returned */
 
-                ctx->need_prefix = TRUE;
+                ctx->need_prefix = true;
 
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "COMMENT \"%s\"", comment);
@@ -3858,7 +3858,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s \"%s\" %s", h5tools_dump_header_format->attributebegin, attr_name,
@@ -3884,7 +3884,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex
             h5tools_dump_oid(stream, info, ctx, attr_id);
 
         if (data_output || attr_data_output)
-            h5tools_dump_data(stream, info, ctx, attr_id, FALSE);
+            h5tools_dump_data(stream, info, ctx, attr_id, false);
 
         ctx->indent_level--;
 
@@ -3893,16 +3893,16 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex
         H5Aclose(attr_id);
     }
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
 
-    if (HDstrlen(h5tools_dump_header_format->attributeblockend)) {
+    if (strlen(h5tools_dump_header_format->attributeblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->attributeblockend);
-        if (HDstrlen(h5tools_dump_header_format->attributeend))
+        if (strlen(h5tools_dump_header_format->attributeend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->attributeend))
+    if (strlen(h5tools_dump_header_format->attributeend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->attributeend);
 
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
@@ -3946,25 +3946,25 @@ h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type)
     hid_t    n_type           = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
     if (H5Tget_class(n_type) == H5T_INTEGER) {
-        if (H5Tequal(n_type, H5T_NATIVE_SCHAR) == TRUE)
+        if (H5Tequal(n_type, H5T_NATIVE_SCHAR) == true)
             packed_bits_size = 8 * sizeof(char);
-        else if (H5Tequal(n_type, H5T_NATIVE_UCHAR) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_UCHAR) == true)
             packed_bits_size = 8 * sizeof(unsigned char);
-        else if (H5Tequal(n_type, H5T_NATIVE_SHORT) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_SHORT) == true)
             packed_bits_size = 8 * sizeof(short);
-        else if (H5Tequal(n_type, H5T_NATIVE_USHORT) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_USHORT) == true)
             packed_bits_size = 8 * sizeof(unsigned short);
-        else if (H5Tequal(n_type, H5T_NATIVE_INT) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_INT) == true)
             packed_bits_size = 8 * sizeof(int);
-        else if (H5Tequal(n_type, H5T_NATIVE_UINT) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_UINT) == true)
             packed_bits_size = 8 * sizeof(unsigned int);
-        else if (H5Tequal(n_type, H5T_NATIVE_LONG) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_LONG) == true)
             packed_bits_size = 8 * sizeof(long);
-        else if (H5Tequal(n_type, H5T_NATIVE_ULONG) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_ULONG) == true)
             packed_bits_size = 8 * sizeof(unsigned long);
-        else if (H5Tequal(n_type, H5T_NATIVE_LLONG) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_LLONG) == true)
             packed_bits_size = 8 * sizeof(long long);
-        else if (H5Tequal(n_type, H5T_NATIVE_ULLONG) == TRUE)
+        else if (H5Tequal(n_type, H5T_NATIVE_ULLONG) == true)
             packed_bits_size = 8 * sizeof(unsigned long long);
         else
             error_msg("Packed Bit not valid for this datatype");
@@ -3999,7 +3999,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
     if (info->line_ncols > 0)
         ncols = info->line_ncols;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->subsettingbegin,
@@ -4008,7 +4008,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
 
     ctx->indent_level++;
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->startbegin,
@@ -4018,7 +4018,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
                        h5tools_dump_header_format->startblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->stridebegin,
@@ -4028,7 +4028,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
                        h5tools_dump_header_format->strideblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->countbegin,
@@ -4043,7 +4043,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool
                        h5tools_dump_header_format->countblockend);
     h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0, (hsize_t)0);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
 
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s ", h5tools_dump_header_format->blockbegin,
@@ -4088,7 +4088,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
 
     datactx = *ctx; /* print context  */
     /* Assume entire data space to be printed */
-    datactx.need_prefix = TRUE;
+    datactx.need_prefix = true;
 
     memset(&buffer, 0, sizeof(h5tools_str_t));
     for (i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
@@ -4097,7 +4097,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
 
         H5TOOLS_DEBUG("reference loop:%d with curr_pos=%ld", i, curr_pos);
 
-        datactx.need_prefix = TRUE;
+        datactx.need_prefix = true;
         h5tools_str_reset(&buffer);
         H5TOOLS_DEBUG("reference loop - h5tools_str_sprint with H5T_STD_REF:%d", i);
         h5tools_str_sprint(&buffer, info, container, H5T_STD_REF, &ref_buf[i], &datactx);
@@ -4113,7 +4113,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
                         case H5O_TYPE_DATASET:
                             if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                                 datactx.indent_level++;
-                                h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE);
+                                h5tools_dump_data(stream, info, &datactx, new_obj_id, true);
                                 // h5tools_dump_dset(stream, info, &datactx, new_obj_id);
                                 datactx.indent_level--;
                                 if (H5Dclose(new_obj_id) < 0)
@@ -4139,7 +4139,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
                 H5TOOLS_DEBUG("ref_type is H5R_DATASET_REGION1");
                 if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                     datactx.indent_level++;
-                    h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE);
+                    h5tools_dump_data(stream, info, &datactx, new_obj_id, true);
                     // h5tools_dump_dset(stream, info, &datactx, new_obj_id);
                     datactx.indent_level--;
                     if (H5Dclose(new_obj_id) < 0)
@@ -4158,7 +4158,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
                         case H5O_TYPE_DATASET:
                             if ((new_obj_id = H5Ropen_object(&ref_buf[i], H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                                 datactx.indent_level++;
-                                h5tools_dump_data(stream, info, &datactx, new_obj_id, TRUE);
+                                h5tools_dump_data(stream, info, &datactx, new_obj_id, true);
                                 // h5tools_dump_dset(stream, info, &datactx, new_obj_id);
                                 datactx.indent_level--;
                                 if (H5Oclose(new_obj_id) < 0)
@@ -4200,14 +4200,14 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
                             h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols,
                                                    (hsize_t)0, (hsize_t)0);
 
-                            datactx.need_prefix = TRUE;
+                            datactx.need_prefix = true;
                             datactx.indent_level++;
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "NULL");
                             h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols,
                                                    (hsize_t)0, (hsize_t)0);
                             datactx.indent_level--;
-                            datactx.need_prefix = TRUE;
+                            datactx.need_prefix = true;
 
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "}");
@@ -4260,14 +4260,14 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
                     h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols,
                                            (hsize_t)0, (hsize_t)0);
 
-                    datactx.need_prefix = TRUE;
+                    datactx.need_prefix = true;
                     datactx.indent_level++;
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "NULL");
                     h5tools_render_element(stream, info, &datactx, &buffer, &curr_pos, (size_t)ncols,
                                            (hsize_t)0, (hsize_t)0);
                     datactx.indent_level--;
-                    datactx.need_prefix = TRUE;
+                    datactx.need_prefix = true;
 
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "}");
@@ -4297,7 +4297,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex
 /*-------------------------------------------------------------------------
  * Function:    dump_data
  *
- * Purpose:     Dump attribute, obj_data is FALSE, or dataset data, obj_data is TRUE
+ * Purpose:     Dump attribute, obj_data is false, or dataset data, obj_data is true
  *
  * Return:      void
  *-------------------------------------------------------------------------
@@ -4358,7 +4358,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
         ctx->indent_level++;
     }
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "%s %s", h5tools_dump_header_format->databegin,
                        h5tools_dump_header_format->datablockbegin);
@@ -4381,7 +4381,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
         H5Sget_simple_extent_dims(space, total_size, NULL);
         init_acc_pos(datactx.ndims, total_size, datactx.acc, datactx.pos, datactx.p_min_idx);
 
-        datactx.need_prefix = TRUE;
+        datactx.need_prefix = true;
 
         if (NULL !=
             (ref_buf = (H5R_ref_t *)calloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) {
@@ -4420,18 +4420,18 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
              */
             string_dataformat.idx_fmt = "\"";
             datactx.indent_level++;
-            datactx.need_prefix = TRUE;
+            datactx.need_prefix = true;
             h5tools_simple_prefix(stream, &string_dataformat, &datactx, (hsize_t)0, 0);
 
             string_dataformat.line_multi_new = 1;
             string_dataformat.str_repeat     = 8;
-            string_dataformat.ascii          = TRUE;
+            string_dataformat.ascii          = true;
             string_dataformat.elmt_suf1      = "";
             string_dataformat.elmt_suf2      = "";
             string_dataformat.line_suf       = "\"";
         }
         else {
-            datactx.need_prefix = TRUE;
+            datactx.need_prefix = true;
         }
 
         /* Print all the values. */
@@ -4453,7 +4453,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
         if (datactx.display_char && H5Tget_size(f_type) == 1 && H5Tget_class(f_type) == H5T_INTEGER) {
             H5TOOLS_DEBUG("Print 1-byte integer data as an ASCII character string eol=%s",
                           string_dataformat.line_suf);
-            datactx.need_prefix              = FALSE;
+            datactx.need_prefix              = false;
             string_dataformat.arr_linebreak  = 0;
             string_dataformat.idx_fmt        = "";
             string_dataformat.line_multi_new = 0;
@@ -4474,17 +4474,17 @@ done:
     H5Sclose(space);
     H5Tclose(f_type);
 
-    ctx->need_prefix = TRUE;
+    ctx->need_prefix = true;
     h5tools_simple_prefix(stream, &outputformat, ctx, (hsize_t)0, 0);
 
     h5tools_str_reset(&buffer);
-    if (HDstrlen(h5tools_dump_header_format->datablockend)) {
+    if (strlen(h5tools_dump_header_format->datablockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datablockend);
-        if (HDstrlen(h5tools_dump_header_format->dataend))
+        if (strlen(h5tools_dump_header_format->dataend))
             h5tools_str_append(&buffer, " ");
     }
 
-    if (HDstrlen(h5tools_dump_header_format->dataend))
+    if (strlen(h5tools_dump_header_format->dataend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->dataend);
     h5tools_render_element(stream, &outputformat, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                            (hsize_t)0);
@@ -4492,16 +4492,16 @@ done:
     if (ctx->sset && obj_data) {
         ctx->indent_level--;
 
-        ctx->need_prefix = TRUE;
+        ctx->need_prefix = true;
         h5tools_simple_prefix(stream, &outputformat, ctx, (hsize_t)0, 0);
 
         h5tools_str_reset(&buffer);
-        if (HDstrlen(h5tools_dump_header_format->subsettingblockend)) {
+        if (strlen(h5tools_dump_header_format->subsettingblockend)) {
             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->subsettingblockend);
-            if (HDstrlen(h5tools_dump_header_format->subsettingend))
+            if (strlen(h5tools_dump_header_format->subsettingend))
                 h5tools_str_append(&buffer, " ");
         }
-        if (HDstrlen(h5tools_dump_header_format->subsettingend))
+        if (strlen(h5tools_dump_header_format->subsettingend))
             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->subsettingend);
         h5tools_render_element(stream, &outputformat, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
                                (hsize_t)0);
diff --git a/tools/lib/h5tools_dump.h b/tools/lib/h5tools_dump.h
index c8e1992..e57158a 100644
--- a/tools/lib/h5tools_dump.h
+++ b/tools/lib/h5tools_dump.h
@@ -42,40 +42,40 @@ H5TOOLS_DLL int h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5to
 H5TOOLS_DLL int h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info,
                                          h5tools_context_t *ctx /*in,out*/, hid_t container, unsigned flags,
                                          hsize_t nelmts, hid_t type, void *_mem);
-H5TOOLS_DLL void    h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info,
-                                          h5tools_context_t *ctx /*in,out*/, hid_t type);
-H5TOOLS_DLL void    h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
-                                           h5tools_context_t *ctx /*in,out*/, hid_t space);
-H5TOOLS_DLL void    h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
-                                           h5tools_context_t *ctx /*in,out*/, const char *attr_name,
-                                           hid_t attr_id);
-H5TOOLS_DLL void    h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
-                                     h5tools_context_t *ctx /*in,out*/, hid_t oid);
-H5TOOLS_DLL void    h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
-                                      h5tools_context_t *ctx /*in,out*/, hid_t dcpl, hid_t type_id,
-                                      hid_t obj_id);
-H5TOOLS_DLL void    h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
-                                         h5tools_context_t *ctx /*in,out*/, hid_t obj_id);
-H5TOOLS_DLL void    h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-                                      hid_t obj_id, int obj_data);
-H5TOOLS_DLL void    h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
-                                           hid_t container, H5R_ref_t *ref_buf, int ndims);
-H5TOOLS_DLL hbool_t h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info,
-                                                  h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
-                                                  hsize_t *curr_pos, size_t ncols,
-                                                  hsize_t region_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL void h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info,
+                                       h5tools_context_t *ctx /*in,out*/, hid_t type);
+H5TOOLS_DLL void h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info,
+                                        h5tools_context_t *ctx /*in,out*/, hid_t space);
+H5TOOLS_DLL void h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info,
+                                        h5tools_context_t *ctx /*in,out*/, const char *attr_name,
+                                        hid_t attr_id);
+H5TOOLS_DLL void h5tools_dump_oid(FILE *stream, const h5tool_format_t *info,
+                                  h5tools_context_t *ctx /*in,out*/, hid_t oid);
+H5TOOLS_DLL void h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info,
+                                   h5tools_context_t *ctx /*in,out*/, hid_t dcpl, hid_t type_id,
+                                   hid_t obj_id);
+H5TOOLS_DLL void h5tools_dump_comment(FILE *stream, const h5tool_format_t *info,
+                                      h5tools_context_t *ctx /*in,out*/, hid_t obj_id);
+H5TOOLS_DLL void h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                                   hid_t obj_id, int obj_data);
+H5TOOLS_DLL void h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx,
+                                        hid_t container, H5R_ref_t *ref_buf, int ndims);
+H5TOOLS_DLL bool h5tools_dump_region_attribute(hid_t region_id, FILE *stream, const h5tool_format_t *info,
+                                               h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
+                                               hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter,
+                                               hsize_t elmt_counter);
 
-H5TOOLS_DLL hbool_t h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
-                                                    const h5tool_format_t *info,
-                                                    h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
-                                                    hsize_t *curr_pos, size_t ncols,
-                                                    hsize_t region_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL bool h5tools_dump_region_data_points(hid_t region_space, hid_t region_id, FILE *stream,
+                                                 const h5tool_format_t *info,
+                                                 h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
+                                                 hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter,
+                                                 hsize_t elmt_counter);
 
-H5TOOLS_DLL hbool_t h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream,
-                                                    const h5tool_format_t *info,
-                                                    h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
-                                                    hsize_t *curr_pos, size_t ncols,
-                                                    hsize_t region_elmt_counter, hsize_t elmt_counter);
+H5TOOLS_DLL bool h5tools_dump_region_data_blocks(hid_t region_space, hid_t region_id, FILE *stream,
+                                                 const h5tool_format_t *info,
+                                                 h5tools_context_t *ctx /*in,out*/, h5tools_str_t *buffer,
+                                                 hsize_t *curr_pos, size_t ncols, hsize_t region_elmt_counter,
+                                                 hsize_t elmt_counter);
 
 H5TOOLS_DLL int  h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer /*in,out*/,
                                         const h5tool_format_t *info, h5tools_context_t *ctx /*in,out*/,
diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h
index 8a7414c..b564511 100644
--- a/tools/lib/h5tools_error.h
+++ b/tools/lib/h5tools_error.h
@@ -36,7 +36,7 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
         char lib_str[256];                                                                                   \
                                                                                                              \
         /* Initialize library version string for error class */                                              \
-        HDsnprintf(lib_str, sizeof(lib_str), "%d.%d.%d", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);     \
+        snprintf(lib_str, sizeof(lib_str), "%d.%d.%d", H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE);       \
                                                                                                              \
         /* Create new HDF5 error stack for the tools to use */                                               \
         if ((H5tools_ERR_STACK_g = H5Ecreate_stack()) < 0)                                                   \
@@ -213,7 +213,7 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g;
  */
 #define CATCH                                                                                                \
 catch_except:;                                                                                               \
-    past_catch = TRUE;
+    past_catch = true;
 
 /*
  * H5_LEAVE macro, used to facilitate control flow in a function. The argument
diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c
index d89c546..a1466bc 100644
--- a/tools/lib/h5tools_ref.c
+++ b/tools/lib/h5tools_ref.c
@@ -132,7 +132,7 @@ init_ref_path_table(void)
             return (-1);
 
         /* Iterate over objects in this file */
-        if (h5trav_visit(thefile, "/", TRUE, TRUE, init_ref_path_cb, NULL, NULL, H5O_INFO_BASIC) < 0) {
+        if (h5trav_visit(thefile, "/", true, true, init_ref_path_cb, NULL, NULL, H5O_INFO_BASIC) < 0) {
             error_msg("unable to construct reference path table\n");
             h5tools_setstatus(EXIT_FAILURE);
         } /* end if */
@@ -180,10 +180,10 @@ ref_path_table_lookup(const char *thepath, H5O_token_t *token)
 {
     H5O_info2_t oi;
 
-    if ((thepath == NULL) || (HDstrlen(thepath) == 0))
+    if ((thepath == NULL) || (strlen(thepath) == 0))
         return -1;
     /* Allow lookups on the root group, even though it doesn't have any link info */
-    if (HDstrcmp(thepath, "/") != 0) {
+    if (strcmp(thepath, "/") != 0) {
         H5L_info2_t li;
 
         /* Check for external link first, so we don't return the OID of an object in another file */
@@ -231,7 +231,7 @@ ref_path_table_put(const char *path, const H5O_token_t *token)
             return (-1);
 
         memcpy(&new_node->obj_token, token, sizeof(H5O_token_t));
-        new_node->path = HDstrdup(path);
+        new_node->path = strdup(path);
 
         return (H5SL_insert(ref_path_table, new_node, &(new_node->obj_token)));
     }
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index bd75879..5ef86fb 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -43,10 +43,10 @@ typedef struct H5LD_memb_t {
 /* Variable length string datatype */
 #define STR_INIT_LEN 4096 /*initial length            */
 
-static char   *h5tools_escape(char *s, size_t size);
-static hbool_t h5tools_str_is_zero(const void *_mem, size_t size);
-static void    h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch);
-void           h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, h5tools_context_t *ctx);
+static char *h5tools_escape(char *s, size_t size);
+static bool  h5tools_str_is_zero(const void *_mem, size_t size);
+static void  h5tools_print_char(h5tools_str_t *str, const h5tool_format_t *info, char ch);
+void         h5tools_str_indent(h5tools_str_t *str, const h5tool_format_t *info, h5tools_context_t *ctx);
 
 /*-------------------------------------------------------------------------
  * Function:    h5tools_str_close
@@ -106,7 +106,7 @@ h5tools_str_append(h5tools_str_t *str /*in,out*/, const char *fmt, ...)
     if (!str->s || str->nalloc <= 0)
         h5tools_str_reset(str);
 
-    if (HDstrlen(fmt) == 0)
+    if (strlen(fmt) == 0)
         /* nothing to print */
         return str->s;
 
@@ -117,17 +117,17 @@ h5tools_str_append(h5tools_str_t *str /*in,out*/, const char *fmt, ...)
         size_t avail  = str->nalloc - str->len;
 
         va_start(ap, fmt);
-        nchars = HDvsnprintf(str->s + str->len, avail, fmt, ap);
+        nchars = vsnprintf(str->s + str->len, avail, fmt, ap);
         va_end(ap);
 
-        /* Note: HDvsnprintf() behaves differently on Windows as Unix, when
+        /* Note: vsnprintf() behaves differently on Windows as Unix, when
          * buffer is smaller than source string. On Unix, this function
          * returns length of the source string and copy string up to the
          * buffer size with NULL at the end of the buffer. However on
          * Windows with the same condition, this function returns -1 and
          * doesn't add NULL at the end of the buffer.
          * Because of this different return results, the strlen of the new string
-         * is used to handle when HDvsnprintf() returns -1 on Windows due
+         * is used to handle when vsnprintf() returns -1 on Windows due
          * to lack of buffer size, so try one more time after realloc more
          * buffer size before return NULL.
          */
@@ -135,7 +135,7 @@ h5tools_str_append(h5tools_str_t *str /*in,out*/, const char *fmt, ...)
             /* failure, such as bad format */
             return NULL;
 
-        if ((size_t)nchars >= avail || (0 == nchars && (HDstrcmp(fmt, "%s") != 0))) {
+        if ((size_t)nchars >= avail || (0 == nchars && (strcmp(fmt, "%s") != 0))) {
             /* Truncation return value as documented by C99, or zero return value with either of the
              * following conditions, each of which indicates that the proper C99 return value probably
              *  should have been positive when the format string is
@@ -230,14 +230,14 @@ h5tools_str_fmt(h5tools_str_t *str /*in,out*/, size_t start, const char *fmt)
     assert(fmt);
 
     /* If the format string is simply "%s" then don't bother doing anything */
-    if (!HDstrcmp(fmt, "%s"))
+    if (!strcmp(fmt, "%s"))
         return str->s;
 
     /*
      * Save the input value if there is a `%' anywhere in FMT.  Otherwise
      * don't bother because we don't need a temporary copy.
      */
-    if (HDstrchr(fmt, '%')) {
+    if (strchr(fmt, '%')) {
         size_t n = sizeof(_temp);
         if (str->len - start + 1 > n) {
             n    = str->len - start + 1;
@@ -245,7 +245,7 @@ h5tools_str_fmt(h5tools_str_t *str /*in,out*/, size_t start, const char *fmt)
             assert(temp);
         }
 
-        HDstrncpy(temp, str->s + start, n - 1);
+        strncpy(temp, str->s + start, n - 1);
         temp[n - 1] = '\0';
     }
 
@@ -669,8 +669,8 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     H5TOOLS_START_DEBUG(" ");
     /* Build default formats for long long types */
     if (!fmt_llong[0]) {
-        HDsnprintf(fmt_llong, sizeof(fmt_llong), "%%lld");
-        HDsnprintf(fmt_ullong, sizeof(fmt_ullong), "%%llu");
+        snprintf(fmt_llong, sizeof(fmt_llong), "%%lld");
+        snprintf(fmt_ullong, sizeof(fmt_ullong), "%%llu");
     }
 
     /* Append value depending on data type */
@@ -741,10 +741,10 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
                 quote = '\0';
                 if (H5Tis_variable_str(type)) {
                     /* cp_vp is the pointer into the struct where a `char*' is stored. So we have
-                     * to dereference the pointer to get the `char*' to pass to HDstrlen(). */
+                     * to dereference the pointer to get the `char*' to pass to strlen(). */
                     s = *(char **)((void *)cp_vp);
                     if (s != NULL)
-                        size = HDstrlen(s);
+                        size = strlen(s);
                 }
                 else {
                     s    = cp_vp;
@@ -1494,7 +1494,7 @@ h5tools_escape(char *s /*in,out*/, size_t size)
     size_t      i;
     const char *escape;
     char        octal[8];
-    size_t      n = HDstrlen(s);
+    size_t      n = strlen(s);
 
     for (i = 0; i < n; i++) {
         switch (s[i]) {
@@ -1533,7 +1533,7 @@ h5tools_escape(char *s /*in,out*/, size_t size)
                 break;
             default:
                 if (!isprint(s[i])) {
-                    HDsnprintf(octal, sizeof(octal), "\\%03o", (unsigned char)s[i]);
+                    snprintf(octal, sizeof(octal), "\\%03o", (unsigned char)s[i]);
                     escape = octal;
                 }
                 else
@@ -1543,7 +1543,7 @@ h5tools_escape(char *s /*in,out*/, size_t size)
         }
 
         if (escape) {
-            size_t esc_size = HDstrlen(escape);
+            size_t esc_size = strlen(escape);
 
             if (n + esc_size + 1 > size)
                 /*would overflow*/
@@ -1564,20 +1564,20 @@ h5tools_escape(char *s /*in,out*/, size_t size)
  *
  * Purpose:     Determines if memory is initialized to all zero bytes.
  *
- * Return:      TRUE if all bytes are zero; FALSE otherwise
+ * Return:      true if all bytes are zero; false otherwise
  *
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 h5tools_str_is_zero(const void *_mem, size_t size)
 {
     const unsigned char *mem = (const unsigned char *)_mem;
 
     while (size-- > 0)
         if (mem[size])
-            return FALSE;
+            return false;
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1601,26 +1601,26 @@ h5tools_str_replace(const char *string, const char *substr, const char *replacem
     char *head   = NULL;
 
     if (substr == NULL || replacement == NULL)
-        return HDstrdup(string);
-    newstr = HDstrdup(string);
+        return strdup(string);
+    newstr = strdup(string);
     head   = newstr;
-    while ((tok = HDstrstr(head, substr))) {
+    while ((tok = strstr(head, substr))) {
         char *oldstr;
 
         oldstr = newstr;
-        newstr = (char *)malloc(HDstrlen(oldstr) - HDstrlen(substr) + HDstrlen(replacement) + 1);
+        newstr = (char *)malloc(strlen(oldstr) - strlen(substr) + strlen(replacement) + 1);
 
         if (newstr == NULL) {
             free(oldstr);
             return NULL;
         }
         memcpy(newstr, oldstr, (size_t)(tok - oldstr));
-        memcpy(newstr + (tok - oldstr), replacement, HDstrlen(replacement));
-        memcpy(newstr + (tok - oldstr) + HDstrlen(replacement), tok + HDstrlen(substr),
-               HDstrlen(oldstr) - HDstrlen(substr) - (size_t)(tok - oldstr));
-        memset(newstr + HDstrlen(oldstr) - HDstrlen(substr) + HDstrlen(replacement), 0, 1);
+        memcpy(newstr + (tok - oldstr), replacement, strlen(replacement));
+        memcpy(newstr + (tok - oldstr) + strlen(replacement), tok + strlen(substr),
+               strlen(oldstr) - strlen(substr) - (size_t)(tok - oldstr));
+        memset(newstr + strlen(oldstr) - strlen(substr) + strlen(replacement), 0, 1);
         /* move back head right after the last replacement */
-        head = newstr + (tok - oldstr) + HDstrlen(replacement);
+        head = newstr + (tok - oldstr) + strlen(replacement);
         free(oldstr);
     }
 
diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c
index fc9a646..dfffac6 100644
--- a/tools/lib/h5tools_utils.c
+++ b/tools/lib/h5tools_utils.c
@@ -51,7 +51,7 @@ static void init_table(hid_t fid, table_t **tbl);
 #ifdef H5DUMP_DEBUG
 static void dump_table(hid_t fid, char *tablename, table_t *table);
 #endif /* H5DUMP_DEBUG */
-static void add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool_t recorded);
+static void add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, bool recorded);
 
 /*-------------------------------------------------------------------------
  * Function: parallel_print
@@ -68,10 +68,10 @@ parallel_print(const char *format, ...)
     va_start(ap, format);
 
     if (!g_Parallel)
-        HDvprintf(format, ap);
+        vprintf(format, ap);
     else {
         if (overflow_file == NULL) /*no overflow has occurred yet */ {
-            bytes_written = HDvsnprintf(outBuff + outBuffOffset, OUTBUFF_SIZE - outBuffOffset, format, ap);
+            bytes_written = vsnprintf(outBuff + outBuffOffset, OUTBUFF_SIZE - outBuffOffset, format, ap);
             va_end(ap);
             va_start(ap, format);
 
@@ -84,13 +84,13 @@ parallel_print(const char *format, ...)
                     fprintf(rawerrorstream,
                             "warning: could not create overflow file.  Output may be truncated.\n");
                 else
-                    bytes_written = HDvfprintf(overflow_file, format, ap);
+                    bytes_written = vfprintf(overflow_file, format, ap);
             }
             else
                 outBuffOffset += (unsigned)bytes_written;
         }
         else
-            bytes_written = HDvfprintf(overflow_file, format, ap);
+            bytes_written = vfprintf(overflow_file, format, ap);
     }
     va_end(ap);
 }
@@ -114,7 +114,7 @@ error_msg(const char *fmt, ...)
     FLUSHSTREAM(rawdatastream);
     FLUSHSTREAM(rawoutstream);
     fprintf(rawerrorstream, "%s error: ", h5tools_getprogname());
-    HDvfprintf(rawerrorstream, fmt, ap);
+    vfprintf(rawerrorstream, fmt, ap);
 
     va_end(ap);
 }
@@ -138,7 +138,7 @@ warn_msg(const char *fmt, ...)
     FLUSHSTREAM(rawdatastream);
     FLUSHSTREAM(rawoutstream);
     fprintf(rawerrorstream, "%s warning: ", h5tools_getprogname());
-    HDvfprintf(rawerrorstream, fmt, ap);
+    vfprintf(rawerrorstream, fmt, ap);
     va_end(ap);
 }
 
@@ -241,10 +241,10 @@ parse_subset_params(const char *dset)
     H5TOOLS_START_DEBUG(" - dset:%s", dset);
     /* if dset name is quoted wait till after second quote to look for subset brackets */
     if (*dset == '"')
-        q_dset = HDstrchr(dset, '"');
+        q_dset = strchr(dset, '"');
     else
         q_dset = dset;
-    if ((brace = HDstrrchr(q_dset, '[')) != NULL) {
+    if ((brace = strrchr(q_dset, '[')) != NULL) {
         *brace++ = '\0';
 
         s = (struct subset_t *)calloc(1, sizeof(struct subset_t));
@@ -388,8 +388,8 @@ parse_tuple(const char *start, int sep, char **cpy_out, unsigned *nelems, char *
 
     /* create destination string
      */
-    start++;                                                /* advance past opening paren '(' */
-    cpy = (char *)malloc(sizeof(char) * (HDstrlen(start))); /* no +1; less '(' */
+    start++;                                              /* advance past opening paren '(' */
+    cpy = (char *)malloc(sizeof(char) * (strlen(start))); /* no +1; less '(' */
     if (cpy == NULL) {
         ret_value = FAIL;
         goto done;
@@ -660,7 +660,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see
     switch (oinfo->type) {
         case H5O_TYPE_GROUP:
             if (NULL == already_seen)
-                add_obj(info->group_table, &oinfo->token, name, TRUE);
+                add_obj(info->group_table, &oinfo->token, name, true);
             break;
 
         case H5O_TYPE_DATASET:
@@ -668,7 +668,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see
                 hid_t dset = H5I_INVALID_HID;
 
                 /* Add the dataset to the list of objects */
-                add_obj(info->dset_table, &oinfo->token, name, TRUE);
+                add_obj(info->dset_table, &oinfo->token, name, true);
 
                 /* Check for a dataset that uses a named datatype */
                 if ((dset = H5Dopen2(info->fid, name, H5P_DEFAULT)) >= 0) {
@@ -679,7 +679,7 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see
 
                         H5Oget_info3(type, &type_oinfo, H5O_INFO_BASIC);
                         if (search_obj(info->type_table, &type_oinfo.token) == NULL)
-                            add_obj(info->type_table, &type_oinfo.token, name, FALSE);
+                            add_obj(info->type_table, &type_oinfo.token, name, false);
                     } /* end if */
 
                     H5Tclose(type);
@@ -695,14 +695,14 @@ find_objs_cb(const char *name, const H5O_info2_t *oinfo, const char *already_see
                 obj_t *found_obj;
 
                 if ((found_obj = search_obj(info->type_table, &oinfo->token)) == NULL)
-                    add_obj(info->type_table, &oinfo->token, name, TRUE);
+                    add_obj(info->type_table, &oinfo->token, name, true);
                 else {
                     /* Use latest version of name */
                     free(found_obj->objname);
-                    found_obj->objname = HDstrdup(name);
+                    found_obj->objname = strdup(name);
 
                     /* Mark named datatype as having valid name */
-                    found_obj->recorded = TRUE;
+                    found_obj->recorded = true;
                 } /* end else */
             }     /* end if */
             break;
@@ -744,7 +744,7 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table, table_t **dset_ta
     info->dset_table  = *dset_table;
 
     /* Find all shared objects */
-    if ((ret_value = h5trav_visit(fid, "/", TRUE, TRUE, find_objs_cb, NULL, info, H5O_INFO_BASIC)) < 0)
+    if ((ret_value = h5trav_visit(fid, "/", true, true, find_objs_cb, NULL, info, H5O_INFO_BASIC)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "finding shared objects failed");
 
 done:
@@ -770,7 +770,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static void
-add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool_t record)
+add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, bool record)
 {
     size_t u;
 
@@ -785,7 +785,7 @@ add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool
 
     /* Set information about object */
     memcpy(&table->objs[u].obj_token, obj_token, sizeof(H5O_token_t));
-    table->objs[u].objname   = HDstrdup(objname);
+    table->objs[u].objname   = strdup(objname);
     table->objs[u].recorded  = record;
     table->objs[u].displayed = 0;
 }
@@ -831,7 +831,7 @@ tmpfile(void)
  *-------------------------------------------------------------------------*/
 int
 H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t *link_info,
-                         hbool_t get_obj_type)
+                         bool get_obj_type)
 {
     htri_t      l_ret;
     H5O_info2_t trg_oinfo;
@@ -843,7 +843,7 @@ H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t
     link_info->trg_type = H5O_TYPE_UNKNOWN;
 
     /* if path is root, return group type */
-    if (!HDstrcmp(linkpath, "/")) {
+    if (!strcmp(linkpath, "/")) {
         link_info->trg_type = H5O_TYPE_GROUP;
         H5TOOLS_GOTO_DONE(2);
     }
@@ -905,7 +905,7 @@ H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t
         l_ret = H5Oexists_by_name(file_id, linkpath, lapl);
 
         /* detect dangling link */
-        if (l_ret == FALSE) {
+        if (l_ret == false) {
             H5TOOLS_GOTO_DONE(0);
         }
         else if (l_ret < 0) { /* function failed */
@@ -994,7 +994,7 @@ h5tools_getenv_update_hyperslab_bufsize(void)
     int         ret_value = 1;
 
     /* check if environment variable is set for the hyperslab buffer size */
-    if (NULL != (env_str = HDgetenv("H5TOOLS_BUFSIZE"))) {
+    if (NULL != (env_str = getenv("H5TOOLS_BUFSIZE"))) {
         errno                = 0;
         hyperslab_bufsize_mb = strtol(env_str, (char **)NULL, 10);
         if (errno != 0 || hyperslab_bufsize_mb <= 0)
@@ -1146,7 +1146,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_ext_t *fa, const char **values)
         printf("  preset fapl with default values\n");
     }
     fa->fa.version       = H5FD_CURR_ROS3_FAPL_T_VERSION;
-    fa->fa.authenticate  = FALSE;
+    fa->fa.authenticate  = false;
     *(fa->fa.aws_region) = '\0';
     *(fa->fa.secret_id)  = '\0';
     *(fa->fa.secret_key) = '\0';
@@ -1188,55 +1188,55 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_ext_t *fa, const char **values)
          * fail if value would overflow
          */
         if (*values[0] != '\0' && *values[1] != '\0') {
-            if (HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN) {
+            if (strlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN) {
                 if (show_progress) {
                     printf("  ERROR: aws_region value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
-            memcpy(fa->fa.aws_region, values[0], (HDstrlen(values[0]) + 1));
+            memcpy(fa->fa.aws_region, values[0], (strlen(values[0]) + 1));
             if (show_progress) {
                 printf("  aws_region set\n");
             }
 
-            if (HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN) {
+            if (strlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN) {
                 if (show_progress) {
                     printf("  ERROR: secret_id value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
-            memcpy(fa->fa.secret_id, values[1], (HDstrlen(values[1]) + 1));
+            memcpy(fa->fa.secret_id, values[1], (strlen(values[1]) + 1));
             if (show_progress) {
                 printf("  secret_id set\n");
             }
 
-            if (HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN) {
+            if (strlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN) {
                 if (show_progress) {
                     printf("  ERROR: secret_key value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
-            memcpy(fa->fa.secret_key, values[2], (HDstrlen(values[2]) + 1));
+            memcpy(fa->fa.secret_key, values[2], (strlen(values[2]) + 1));
             if (show_progress) {
                 printf("  secret_key set\n");
             }
 
-            if (HDstrlen(values[3]) > H5FD_ROS3_MAX_SECRET_TOK_LEN) {
+            if (strlen(values[3]) > H5FD_ROS3_MAX_SECRET_TOK_LEN) {
                 if (show_progress) {
                     printf("  ERROR: token value too long\n");
                 }
                 ret_value = 0;
                 goto done;
             }
-            memcpy(fa->token, values[3], (HDstrlen(values[3]) + 1));
+            memcpy(fa->token, values[3], (strlen(values[3]) + 1));
             if (show_progress) {
                 printf("  token set\n");
             }
 
-            fa->fa.authenticate = TRUE;
+            fa->fa.authenticate = true;
             if (show_progress) {
                 printf("  set to authenticate\n");
             }
@@ -1288,22 +1288,22 @@ h5tools_parse_hdfs_fapl_tuple(const char *tuple_str, int delim, H5FD_hdfs_fapl_t
      * WARNING: No error-checking is done on length of input strings...
      *          Silent overflow is possible, albeit unlikely.
      */
-    if (HDstrncmp(props[0], "", 1)) {
-        HDstrncpy(fapl_config_out->namenode_name, (const char *)props[0], HDstrlen(props[0]));
+    if (strncmp(props[0], "", 1)) {
+        strncpy(fapl_config_out->namenode_name, (const char *)props[0], strlen(props[0]));
     }
-    if (HDstrncmp(props[1], "", 1)) {
+    if (strncmp(props[1], "", 1)) {
         k = strtoul((const char *)props[1], NULL, 0);
         if (errno == ERANGE)
             H5TOOLS_GOTO_ERROR(FAIL, "supposed port number wasn't");
         fapl_config_out->namenode_port = (int32_t)k;
     }
-    if (HDstrncmp(props[2], "", 1)) {
-        HDstrncpy(fapl_config_out->kerberos_ticket_cache, (const char *)props[2], HDstrlen(props[2]));
+    if (strncmp(props[2], "", 1)) {
+        strncpy(fapl_config_out->kerberos_ticket_cache, (const char *)props[2], strlen(props[2]));
     }
-    if (HDstrncmp(props[3], "", 1)) {
-        HDstrncpy(fapl_config_out->user_name, (const char *)props[3], HDstrlen(props[3]));
+    if (strncmp(props[3], "", 1)) {
+        strncpy(fapl_config_out->user_name, (const char *)props[3], strlen(props[3]));
     }
-    if (HDstrncmp(props[4], "", 1)) {
+    if (strncmp(props[4], "", 1)) {
         k = strtoul((const char *)props[4], NULL, 0);
         if (errno == ERANGE)
             H5TOOLS_GOTO_ERROR(FAIL, "supposed buffersize number wasn't");
diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 2efa53f..ce5a24a 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -41,8 +41,8 @@ H5TOOLS_DLLVAR hsize_t H5TOOLS_BUFSIZE;
 typedef struct obj_t {
     H5O_token_t obj_token;
     char       *objname;
-    hbool_t     displayed; /* Flag to indicate that the object has been displayed */
-    hbool_t     recorded;  /* Flag for named datatypes to indicate they were found in the group hierarchy */
+    bool        displayed; /* Flag to indicate that the object has been displayed */
+    bool        recorded;  /* Flag for named datatypes to indicate they were found in the group hierarchy */
 } obj_t;
 
 /*struct for the tables that the find_objs function uses*/
@@ -126,7 +126,7 @@ typedef struct {
 
 /* Definitions of routines */
 H5TOOLS_DLL int H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t *link_info,
-                                         hbool_t get_obj_type);
+                                         bool get_obj_type);
 H5TOOLS_DLL const char *h5tools_getprogname(void);
 H5TOOLS_DLL void        h5tools_setprogname(const char *progname);
 H5TOOLS_DLL int         h5tools_getstatus(void);
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 5ae379e..017e062 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -38,7 +38,7 @@ typedef struct {
 typedef struct {
     trav_addr_t          *seen;          /* List of addresses seen already */
     const trav_visitor_t *visitor;       /* Information for visiting each link/object */
-    hbool_t               is_absolute;   /* Whether the traversal has absolute paths */
+    bool                  is_absolute;   /* Whether the traversal has absolute paths */
     const char           *base_grp_name; /* Name of the group that serves as the base
                                           * for iteration */
     unsigned fields;                     /* Fields needed in H5O_info2_t struct */
@@ -126,7 +126,7 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path)
     /* Append it */
     idx = visited->nused++;
     memcpy(&visited->objs[idx].token, token, sizeof(H5O_token_t));
-    visited->objs[idx].path = HDstrdup(path);
+    visited->objs[idx].path = strdup(path);
 } /* end trav_token_add() */
 
 /*-------------------------------------------------------------------------
@@ -134,7 +134,7 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path)
  *
  * Purpose:  Check if an object token has already been seen
  *
- * Return:   TRUE/FALSE
+ * Return:   true/false
  *-------------------------------------------------------------------------
  */
 H5_ATTR_PURE static const char *
@@ -172,17 +172,17 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
 
     /* Create the full path name for the link */
     if (udata->is_absolute) {
-        size_t base_len     = HDstrlen(udata->base_grp_name);
+        size_t base_len     = strlen(udata->base_grp_name);
         size_t add_slash    = base_len ? ((udata->base_grp_name)[base_len - 1] != '/') : 1;
-        size_t new_name_len = base_len + add_slash + HDstrlen(path) + 1 +
+        size_t new_name_len = base_len + add_slash + strlen(path) + 1 +
                               3; /* Extra "+3" to quiet GCC warning - 2019/07/05, QAK */
 
         if (NULL == (new_name = (char *)malloc(new_name_len)))
             return (H5_ITER_ERROR);
         if (add_slash)
-            HDsnprintf(new_name, new_name_len, "%s/%s", udata->base_grp_name, path);
+            snprintf(new_name, new_name_len, "%s/%s", udata->base_grp_name, path);
         else
-            HDsnprintf(new_name, new_name_len, "%s%s", udata->base_grp_name, path);
+            snprintf(new_name, new_name_len, "%s%s", udata->base_grp_name, path);
         full_name = new_name;
     } /* end if */
     else
@@ -241,8 +241,8 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
  *-------------------------------------------------------------------------
  */
 static int
-traverse(hid_t file_id, const char *grp_name, hbool_t visit_start, hbool_t recurse,
-         const trav_visitor_t *visitor, unsigned fields)
+traverse(hid_t file_id, const char *grp_name, bool visit_start, bool recurse, const trav_visitor_t *visitor,
+         unsigned fields)
 {
     H5O_info2_t oinfo; /* Object info for starting group */
     int         ret_value = 0;
@@ -326,7 +326,7 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
 
         /* Append it */
         idx                     = info->nused++;
-        info->paths[idx].path   = HDstrdup(path);
+        info->paths[idx].path   = strdup(path);
         info->paths[idx].type   = obj_type;
         info->paths[idx].fileno = 0;
 
@@ -349,7 +349,7 @@ trav_fileinfo_add(trav_info_t *info, hid_t loc_id)
     H5O_info2_t oinfo;
     size_t      idx = info->nused - 1;
 
-    if (info->paths[idx].path && HDstrcmp(info->paths[idx].path, ".") != 0)
+    if (info->paths[idx].path && strcmp(info->paths[idx].path, ".") != 0)
         H5Oget_info_by_name3(loc_id, info->paths[idx].path, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
     else
         H5Oget_info3(loc_id, &oinfo, H5O_INFO_BASIC);
@@ -428,7 +428,7 @@ h5trav_getinfo(hid_t file_id, trav_info_t *info)
     info_visitor.udata     = info;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if (traverse(file_id, "/", TRUE, TRUE, &info_visitor, H5O_INFO_BASIC) < 0)
+    if (traverse(file_id, "/", true, true, &info_visitor, H5O_INFO_BASIC) < 0)
         H5TOOLS_GOTO_ERROR((-1), "traverse failed");
 
 done:
@@ -452,11 +452,11 @@ h5trav_getindex(const trav_info_t *info, const char *obj)
     /* Loop over all paths in 'info' struct, looking for object */
     for (u = 0; u < info->nused; u++) {
         /* Check for object name having full path (with leading '/') */
-        if (HDstrcmp(obj, info->paths[u].path) == 0)
+        if (strcmp(obj, info->paths[u].path) == 0)
             return ((ssize_t)u);
 
         /* Check for object name without leading '/' */
-        if (HDstrcmp(obj, (info->paths[u].path + 1)) == 0)
+        if (strcmp(obj, (info->paths[u].path + 1)) == 0)
             return ((ssize_t)u);
     } /* end for */
 
@@ -486,7 +486,7 @@ trav_info_init(const char *filename, hid_t fileid, trav_info_t **_info)
     info->symlink_visited.nused       = 0;
     info->symlink_visited.nalloc      = 0;
     info->symlink_visited.objs        = NULL;
-    info->symlink_visited.dangle_link = FALSE;
+    info->symlink_visited.dangle_link = false;
     *_info                            = info;
 } /* end trav_info_init() */
 
@@ -587,7 +587,7 @@ h5trav_gettable(hid_t fid, trav_table_t *table)
     table_visitor.udata     = table;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if (traverse(fid, "/", TRUE, TRUE, &table_visitor, H5O_INFO_BASIC) < 0)
+    if (traverse(fid, "/", true, true, &table_visitor, H5O_INFO_BASIC) < 0)
         H5TOOLS_GOTO_ERROR((-1), "traverse failed");
 
 done:
@@ -611,11 +611,11 @@ h5trav_getindext(const char *name, const trav_table_t *table)
     if (table) {
         for (i = 0; i < table->nobjs; i++) {
             /* Check for object name having full path (with leading '/') */
-            if (HDstrcmp(name, table->objs[i].name) == 0)
+            if (strcmp(name, table->objs[i].name) == 0)
                 return ((int)i);
 
             /* Check for object name without leading '/' */
-            if (HDstrcmp(name, table->objs[i].name + 1) == 0)
+            if (strcmp(name, table->objs[i].name + 1) == 0)
                 return ((int)i);
 
             /* search also in the list of links */
@@ -624,11 +624,11 @@ h5trav_getindext(const char *name, const trav_table_t *table)
 
                 for (j = 0; j < table->objs[i].nlinks; j++) {
                     /* Check for object name having full path (with leading '/') */
-                    if (HDstrcmp(name, table->objs[i].links[j].new_name) == 0)
+                    if (strcmp(name, table->objs[i].links[j].new_name) == 0)
                         return ((int)i);
 
                     /* Check for object name without leading '/' */
-                    if (HDstrcmp(name, table->objs[i].links[j].new_name + 1) == 0)
+                    if (strcmp(name, table->objs[i].links[j].new_name + 1) == 0)
                         return ((int)i);
                 } /* end for */
             }     /* end if */
@@ -664,7 +664,7 @@ trav_table_add(trav_table_t *table, const char *path, const H5O_info2_t *oinfo)
             table->objs[new_obj].obj_token = H5O_TOKEN_UNDEF;
         table->objs[new_obj].flags[0] = table->objs[new_obj].flags[1] = 0;
         table->objs[new_obj].is_same_trgobj                           = 0;
-        table->objs[new_obj].name                                     = (char *)HDstrdup(path);
+        table->objs[new_obj].name                                     = (char *)strdup(path);
         table->objs[new_obj].type      = oinfo ? (h5trav_type_t)oinfo->type : H5TRAV_TYPE_LINK;
         table->objs[new_obj].nlinks    = 0;
         table->objs[new_obj].sizelinks = 0;
@@ -694,7 +694,7 @@ trav_table_addlink(trav_table_t *table, const H5O_token_t *obj_token, const char
                 size_t n;
 
                 /* already inserted? */
-                if (HDstrcmp(table->objs[i].name, path) == 0)
+                if (strcmp(table->objs[i].name, path) == 0)
                     return;
 
                 /* allocate space if necessary */
@@ -706,7 +706,7 @@ trav_table_addlink(trav_table_t *table, const H5O_token_t *obj_token, const char
 
                 /* insert it */
                 n                                = table->objs[i].nlinks++;
-                table->objs[i].links[n].new_name = (char *)HDstrdup(path);
+                table->objs[i].links[n].new_name = (char *)strdup(path);
 
                 return;
             } /* end if */
@@ -741,7 +741,7 @@ trav_table_addflags(const unsigned *flags, char *name, h5trav_type_t type, trav_
         table->objs[new_obj].flags[0]       = flags[0];
         table->objs[new_obj].flags[1]       = flags[1];
         table->objs[new_obj].is_same_trgobj = 0;
-        table->objs[new_obj].name           = (char *)HDstrdup(name);
+        table->objs[new_obj].name           = (char *)strdup(name);
         table->objs[new_obj].type           = type;
         table->objs[new_obj].nlinks         = 0;
         table->objs[new_obj].sizelinks      = 0;
@@ -1017,7 +1017,7 @@ h5trav_print(hid_t fid)
     print_visitor.udata     = &print_udata;
 
     /* Traverse all objects in the file, visiting each object & link */
-    if (traverse(fid, "/", TRUE, TRUE, &print_visitor, H5O_INFO_BASIC) < 0)
+    if (traverse(fid, "/", true, true, &print_visitor, H5O_INFO_BASIC) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "traverse failed");
 
 done:
@@ -1034,8 +1034,8 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-h5trav_visit(hid_t fid, const char *grp_name, hbool_t visit_start, hbool_t recurse,
-             h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata, unsigned fields)
+h5trav_visit(hid_t fid, const char *grp_name, bool visit_start, bool recurse, h5trav_obj_func_t visit_obj,
+             h5trav_lnk_func_t visit_lnk, void *udata, unsigned fields)
 {
     trav_visitor_t visitor; /* Visitor structure for objects */
     int            ret_value = 0;
@@ -1086,13 +1086,13 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
     visited->objs[idx].path = NULL;
 
     if (type == H5L_TYPE_EXTERNAL) {
-        if (NULL == (visited->objs[idx].file = HDstrdup(file))) {
+        if (NULL == (visited->objs[idx].file = strdup(file))) {
             visited->nused--;
             H5TOOLS_GOTO_ERROR(FAIL, "visited data structure name allocation failed");
         } /* end if */
     }     /* end if */
 
-    if (NULL == (visited->objs[idx].path = HDstrdup(path))) {
+    if (NULL == (visited->objs[idx].path = strdup(path))) {
         visited->nused--;
         if (visited->objs[idx].file)
             free(visited->objs[idx].file);
@@ -1108,10 +1108,10 @@ done:
  *
  * Purpose:  Check if an symbolic link has already been visited
  *
- * Return:   TRUE/FALSE
+ * Return:   true/false
  *-------------------------------------------------------------------------
  */
-H5_ATTR_PURE hbool_t
+H5_ATTR_PURE bool
 symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, const char *path)
 {
     size_t u; /* Local index variable */
@@ -1120,16 +1120,16 @@ symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file, c
     for (u = 0; u < visited->nused; u++) {
         /* Check for symlink values already in array */
         /* check type and path pair to distinguish between symbolic links */
-        if ((visited->objs[u].type == type) && !HDstrcmp(visited->objs[u].path, path)) {
+        if ((visited->objs[u].type == type) && !strcmp(visited->objs[u].path, path)) {
             /* if external link, file need to be matched as well */
             if (visited->objs[u].type == H5L_TYPE_EXTERNAL)
-                if (!HDstrcmp(visited->objs[u].file, file))
-                    return (TRUE);
+                if (!strcmp(visited->objs[u].file, file))
+                    return (true);
 
-            return (TRUE);
+            return (true);
         } /* end if */
     }     /* end for */
 
     /* Didn't find symlink */
-    return (FALSE);
+    return (false);
 } /* end symlink_is_visited() */
diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h
index 8f3e175..40ceaae 100644
--- a/tools/lib/h5trav.h
+++ b/tools/lib/h5trav.h
@@ -57,7 +57,7 @@ typedef struct symlink_trav_t {
     size_t               nalloc;
     size_t               nused;
     symlink_trav_path_t *objs;
-    hbool_t              dangle_link;
+    bool                 dangle_link;
 } symlink_trav_t;
 
 typedef struct trav_path_t {
@@ -93,7 +93,7 @@ typedef struct trav_link_t {
 typedef struct trav_obj_t {
     H5O_token_t   obj_token;      /* object token */
     unsigned      flags[2];       /* h5diff.object is present or not in both files*/
-    hbool_t       is_same_trgobj; /* same target object? no need to compare */
+    bool          is_same_trgobj; /* same target object? no need to compare */
     char         *name;           /* name */
     h5trav_type_t type;           /* type of object */
     trav_link_t  *links;          /* array of possible link names */
@@ -126,14 +126,14 @@ extern "C" {
  * "h5trav general" public functions
  *-------------------------------------------------------------------------
  */
-H5TOOLS_DLL void    h5trav_set_index(H5_index_t print_index_by, H5_iter_order_t print_index_order);
-H5TOOLS_DLL int     h5trav_visit(hid_t file_id, const char *grp_name, hbool_t visit_start, hbool_t recurse,
-                                 h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata,
-                                 unsigned fields);
-H5TOOLS_DLL herr_t  symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file,
+H5TOOLS_DLL void   h5trav_set_index(H5_index_t print_index_by, H5_iter_order_t print_index_order);
+H5TOOLS_DLL int    h5trav_visit(hid_t file_id, const char *grp_name, bool visit_start, bool recurse,
+                                h5trav_obj_func_t visit_obj, h5trav_lnk_func_t visit_lnk, void *udata,
+                                unsigned fields);
+H5TOOLS_DLL herr_t symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file,
+                                     const char *path);
+H5TOOLS_DLL bool   symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file,
                                       const char *path);
-H5TOOLS_DLL hbool_t symlink_is_visited(symlink_trav_t *visited, H5L_type_t type, const char *file,
-                                       const char *path);
 
 /*-------------------------------------------------------------------------
  * "h5trav info" public functions
diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c
index 26f467c..6f3c0a6 100644
--- a/tools/libtest/h5tools_test_utils.c
+++ b/tools/libtest/h5tools_test_utils.c
@@ -241,7 +241,7 @@ H5_GCC_CLANG_DIAG_OFF("format")
  *----------------------------------------------------------------------------
  */
 #define JSVERIFY_STR(expected, actual, reason)                                                               \
-    if (HDstrcmp((actual), (expected)) != 0) {                                                               \
+    if (strcmp((actual), (expected)) != 0) {                                                                 \
         JSERR_STR((expected), (actual), (reason));                                                           \
         goto error;                                                                                          \
     } /* JSVERIFY_STR */
@@ -277,7 +277,7 @@ H5_GCC_CLANG_DIAG_OFF("format")
  *----------------------------------------------------------------------------
  */
 #define JSVERIFY_STR(actual, expected, reason)                                                               \
-    if (HDstrcmp((actual), (expected)) != 0) {                                                               \
+    if (strcmp((actual), (expected)) != 0) {                                                                 \
         JSERR_STR((expected), (actual), (reason));                                                           \
         goto error;                                                                                          \
     } /* JSVERIFY_STR */
@@ -447,13 +447,13 @@ test_parse_tuple(void)
     unsigned        elem_i        = 0;
     char          **parsed        = NULL;
     char           *cpy           = NULL;
-    herr_t          success       = TRUE;
-    hbool_t         show_progress = FALSE;
+    herr_t          success       = true;
+    bool            show_progress = false;
 
     TESTING("arbitrary-count tuple parsing");
 
 #if H5TOOLS_UTILS_TEST_DEBUG > 0
-    show_progress = TRUE;
+    show_progress = true;
 #endif /* H5TOOLS_UTILS_TEST_DEBUG */
 
     /*********
@@ -467,7 +467,7 @@ test_parse_tuple(void)
         assert(parsed == NULL);
         assert(cpy == NULL);
         tc = cases[i];
-        if (show_progress == TRUE) {
+        if (show_progress == true) {
             printf("testing %d: %s...\n", i, tc.test_msg);
         }
 
@@ -536,20 +536,20 @@ test_populate_ros3_fa(void)
      * TEST-LOCAL VARIABLES *
      ************************/
 
-    hbool_t show_progress = FALSE;
-    int     bad_version   = 0xf87a; /* arbitrarily wrong version number */
-#endif                              /* H5_HAVE_ROS3_VFD */
+    bool show_progress = false;
+    int  bad_version   = 0xf87a; /* arbitrarily wrong version number */
+#endif                           /* H5_HAVE_ROS3_VFD */
 
     TESTING("programmatic ros3 fapl population");
 
 #ifndef H5_HAVE_ROS3_VFD
-    HDputs(" -SKIP-");
-    HDputs("    Read-Only S3 VFD not enabled");
+    puts(" -SKIP-");
+    puts("    Read-Only S3 VFD not enabled");
     fflush(stdout);
     return 0;
 #else
 #if H5TOOLS_UTILS_TEST_DEBUG > 0
-    show_progress = TRUE;
+    show_progress = true;
 #endif /* H5TOOLS_UTILS_TEST_DEBUG */
 
     assert(bad_version != H5FD_CURR_ROS3_FAPL_T_VERSION);
@@ -573,7 +573,7 @@ test_populate_ros3_fa(void)
     /* NULL values pointer yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa = {{bad_version, TRUE, "u", "v", "w"}, "x"};
+        H5FD_ros3_fapl_ext_t fa = {{bad_version, true, "u", "v", "w"}, "x"};
 
         if (show_progress) {
             printf("NULL values pointer\n");
@@ -581,7 +581,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, NULL), "NULL values pointer yields \"default\" fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -592,7 +592,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, TRUE, "u", "v", "w"}, "x"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, true, "u", "v", "w"}, "x"};
         const char          *values[] = {"", "", "", ""};
 
         if (show_progress) {
@@ -601,7 +601,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "empty values yields \"default\" fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -612,7 +612,7 @@ test_populate_ros3_fa(void)
      * excess value is ignored
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "y", "z", "a", "b"};
 
         if (show_progress) {
@@ -621,7 +621,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "four values")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(TRUE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(true, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("x", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("y", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("z", fa.fa.secret_key, (char *)NULL)
@@ -632,7 +632,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {NULL, "y", "z", ""};
 
         if (show_progress) {
@@ -641,7 +641,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -652,7 +652,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"", "y", "z", ""};
 
         if (show_progress) {
@@ -661,7 +661,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -672,7 +672,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"somewhere over the rainbow not too high "
                                          "there is another rainbow bounding some darkened sky",
                                 "y", "z", ""};
@@ -681,11 +681,11 @@ test_populate_ros3_fa(void)
             printf("region overflow\n");
         }
 
-        assert(HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN);
+        assert(strlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN);
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -696,7 +696,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", NULL, "z", ""};
 
         if (show_progress) {
@@ -705,7 +705,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -716,7 +716,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "", "z", ""};
 
         if (show_progress) {
@@ -725,7 +725,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -736,7 +736,7 @@ test_populate_ros3_fa(void)
      * partial set: region
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x",
                                 "Why is it necessary to solve the problem? "
                                          "What benefits will you receive by solving the problem? "
@@ -754,11 +754,11 @@ test_populate_ros3_fa(void)
             printf("id overflow\n");
         }
 
-        assert(HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN);
+        assert(strlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN);
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("x", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -769,7 +769,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "y", NULL, ""};
 
         if (show_progress) {
@@ -778,7 +778,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -789,7 +789,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "y", "z", NULL};
 
         if (show_progress) {
@@ -798,7 +798,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill token")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -809,7 +809,7 @@ test_populate_ros3_fa(void)
      * yields authenticating fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "y", "", ""};
 
         if (show_progress) {
@@ -818,7 +818,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(TRUE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(true, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("x", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("y", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -829,7 +829,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"", "y", "", ""};
 
         if (show_progress) {
@@ -838,7 +838,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -849,7 +849,7 @@ test_populate_ros3_fa(void)
      * yields default fapl
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "", "", ""};
 
         if (show_progress) {
@@ -858,7 +858,7 @@ test_populate_ros3_fa(void)
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -869,7 +869,7 @@ test_populate_ros3_fa(void)
      * partial set: region, id
      */
     {
-        H5FD_ros3_fapl_ext_t fa       = {{bad_version, FALSE, "a", "b", "c"}, "d"};
+        H5FD_ros3_fapl_ext_t fa       = {{bad_version, false, "a", "b", "c"}, "d"};
         const char          *values[] = {"x", "y",
                                 "Why is it necessary to solve the problem? "
                                          "What benefits will you receive by solving the problem? "
@@ -887,11 +887,11 @@ test_populate_ros3_fa(void)
             printf("key overflow\n");
         }
 
-        assert(HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN);
+        assert(strlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN);
 
         JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl")
         JSVERIFY(H5FD_CURR_ROS3_FAPL_T_VERSION, fa.fa.version, (char *)NULL)
-        JSVERIFY(FALSE, fa.fa.authenticate, (char *)NULL)
+        JSVERIFY(false, fa.fa.authenticate, (char *)NULL)
         JSVERIFY_STR("x", fa.fa.aws_region, (char *)NULL)
         JSVERIFY_STR("y", fa.fa.secret_id, (char *)NULL)
         JSVERIFY_STR("", fa.fa.secret_key, (char *)NULL)
@@ -965,7 +965,7 @@ test_set_configured_fapl(void)
     hid_t      fapl_id  = H5I_INVALID_HID;
     other_fa_t wrong_fa = {0x432, 0xf82, 0x9093};
 #ifdef H5_HAVE_ROS3_VFD
-    H5FD_ros3_fapl_ext_t ros3_anon_fa = {{1, FALSE, "", "", ""}, ""};
+    H5FD_ros3_fapl_ext_t ros3_anon_fa = {{1, false, "", "", ""}, ""};
 #endif /* H5_HAVE_ROS3_VFD */
 #ifdef H5_HAVE_LIBHDFS
     H5FD_hdfs_fapl_t hdfs_fa = {
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 2b28df3..ef7e36f 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -156,25 +156,25 @@ parse_flag(const char *s_flag, unsigned *flag)
 {
     unsigned fla = 0;
 
-    if (HDstrcmp(s_flag, "shallow") == 0) {
+    if (strcmp(s_flag, "shallow") == 0) {
         fla = H5O_COPY_SHALLOW_HIERARCHY_FLAG;
     }
-    else if (HDstrcmp(s_flag, "soft") == 0) {
+    else if (strcmp(s_flag, "soft") == 0) {
         fla = H5O_COPY_EXPAND_SOFT_LINK_FLAG;
     }
-    else if (HDstrcmp(s_flag, "ext") == 0) {
+    else if (strcmp(s_flag, "ext") == 0) {
         fla = H5O_COPY_EXPAND_EXT_LINK_FLAG;
     }
-    else if (HDstrcmp(s_flag, "ref") == 0) {
+    else if (strcmp(s_flag, "ref") == 0) {
         fla = H5O_COPY_EXPAND_REFERENCE_FLAG;
     }
-    else if (HDstrcmp(s_flag, "noattr") == 0) {
+    else if (strcmp(s_flag, "noattr") == 0) {
         fla = H5O_COPY_WITHOUT_ATTR_FLAG;
     }
-    else if (HDstrcmp(s_flag, "allflags") == 0) {
+    else if (strcmp(s_flag, "allflags") == 0) {
         fla = H5O_COPY_ALL;
     }
-    else if (HDstrcmp(s_flag, "nullmsg") == 0) {
+    else if (strcmp(s_flag, "nullmsg") == 0) {
         fla = H5O_COPY_PRESERVE_NULL_FLAG;
     }
     else {
@@ -229,7 +229,7 @@ main(int argc, char *argv[])
     while ((opt = H5_get_option(argc, (const char *const *)argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'd':
-                oname_dst = HDstrdup(H5_optarg);
+                oname_dst = strdup(H5_optarg);
                 break;
 
             case 'f':
@@ -238,7 +238,7 @@ main(int argc, char *argv[])
                     usage();
                     leave(EXIT_FAILURE);
                 }
-                str_flag = HDstrdup(H5_optarg);
+                str_flag = strdup(H5_optarg);
                 break;
 
             case 'h':
@@ -247,11 +247,11 @@ main(int argc, char *argv[])
                 break;
 
             case 'i':
-                fname_src = HDstrdup(H5_optarg);
+                fname_src = strdup(H5_optarg);
                 break;
 
             case 'o':
-                fname_dst = HDstrdup(H5_optarg);
+                fname_dst = strdup(H5_optarg);
                 break;
 
             case 'p':
@@ -259,7 +259,7 @@ main(int argc, char *argv[])
                 break;
 
             case 's':
-                oname_src = HDstrdup(H5_optarg);
+                oname_src = strdup(H5_optarg);
                 break;
 
             case 'V':
@@ -322,13 +322,13 @@ main(int argc, char *argv[])
     /* Attempt to open an existing HDF5 file first. Need to open the dst file
        before the src file just in case that the dst and src are the same file
      */
-    fid_dst = h5tools_fopen(fname_dst, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0);
+    fid_dst = h5tools_fopen(fname_dst, H5F_ACC_RDWR, H5P_DEFAULT, false, NULL, 0);
 
     /*-------------------------------------------------------------------------
      * open input file
      *-------------------------------------------------------------------------*/
 
-    fid_src = h5tools_fopen(fname_src, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, 0);
+    fid_src = h5tools_fopen(fname_src, H5F_ACC_RDONLY, H5P_DEFAULT, false, NULL, 0);
 
     /*-------------------------------------------------------------------------
      * test for error in opening input file
@@ -403,7 +403,7 @@ main(int argc, char *argv[])
         /* error, if parent groups doesn't already exist in destination file */
         size_t i, len;
 
-        len = HDstrlen(oname_dst);
+        len = strlen(oname_dst);
 
         /* check if all the parents groups exist. skip root group */
         for (i = 1; i < len; i++) {
@@ -411,7 +411,7 @@ main(int argc, char *argv[])
                 char *str_ptr;
 
                 str_ptr = (char *)calloc(i + 1, sizeof(char));
-                HDstrncpy(str_ptr, oname_dst, i);
+                strncpy(str_ptr, oname_dst, i);
                 str_ptr[i] = '\0';
                 if (H5Lexists(fid_dst, str_ptr, H5P_DEFAULT) <= 0) {
                     error_msg("group <%s> doesn't exist. Use -p to create parent groups.\n", str_ptr);
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index 4854534..c66311f 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -198,7 +198,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 break;
 
             case 'l':
-                opts->follow_links = TRUE;
+                opts->follow_links = true;
                 break;
 
             case 'x':
@@ -241,7 +241,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
                 break;
 
             case 'C':
-                opts->disable_compact_subset = TRUE;
+                opts->disable_compact_subset = true;
                 break;
 
             case 'A':
@@ -323,13 +323,13 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case '1':
                 opts->vol_info[0].type    = VOL_BY_VALUE;
                 opts->vol_info[0].u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                opts->custom_vol[0]       = TRUE;
+                opts->custom_vol[0]       = true;
                 break;
 
             case '2':
                 opts->vol_info[0].type   = VOL_BY_NAME;
                 opts->vol_info[0].u.name = H5_optarg;
-                opts->custom_vol[0]      = TRUE;
+                opts->custom_vol[0]      = true;
                 break;
 
             case '3':
@@ -339,13 +339,13 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case '4':
                 opts->vol_info[1].type    = VOL_BY_VALUE;
                 opts->vol_info[1].u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                opts->custom_vol[1]       = TRUE;
+                opts->custom_vol[1]       = true;
                 break;
 
             case '5':
                 opts->vol_info[1].type   = VOL_BY_NAME;
                 opts->vol_info[1].u.name = H5_optarg;
-                opts->custom_vol[1]      = TRUE;
+                opts->custom_vol[1]      = true;
                 break;
 
             case '6':
@@ -355,13 +355,13 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case '7':
                 opts->vfd_info[0].type    = VFD_BY_VALUE;
                 opts->vfd_info[0].u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                opts->custom_vfd[0]       = TRUE;
+                opts->custom_vfd[0]       = true;
                 break;
 
             case '8':
                 opts->vfd_info[0].type   = VFD_BY_NAME;
                 opts->vfd_info[0].u.name = H5_optarg;
-                opts->custom_vfd[0]      = TRUE;
+                opts->custom_vfd[0]      = true;
                 break;
 
             case '9':
@@ -371,13 +371,13 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
             case '0':
                 opts->vfd_info[1].type    = VFD_BY_VALUE;
                 opts->vfd_info[1].u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                opts->custom_vfd[1]       = TRUE;
+                opts->custom_vfd[1]       = true;
                 break;
 
             case 'Y':
                 opts->vfd_info[1].type   = VFD_BY_NAME;
                 opts->vfd_info[1].u.name = H5_optarg;
-                opts->custom_vfd[1]      = TRUE;
+                opts->custom_vfd[1]      = true;
                 break;
 
             case 'Z':
@@ -387,7 +387,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
     }
 
     /* If file 1 uses the onion VFD, get the revision number */
-    if (opts->vfd_info[0].u.name && !HDstrcmp(opts->vfd_info[0].u.name, "onion")) {
+    if (opts->vfd_info[0].u.name && !strcmp(opts->vfd_info[0].u.name, "onion")) {
         if (opts->vfd_info[0].info) {
             errno                     = 0;
             onion_fa_g_1.revision_num = strtoull(opts->vfd_info[0].info, NULL, 10);
@@ -404,7 +404,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const
     }
 
     /* If file 2 uses the onion VFD, get the revision number */
-    if (opts->vfd_info[1].u.name && !HDstrcmp(opts->vfd_info[1].u.name, "onion")) {
+    if (opts->vfd_info[1].u.name && !strcmp(opts->vfd_info[1].u.name, "onion")) {
         if (opts->vfd_info[1].info) {
             errno                     = 0;
             onion_fa_g_2.revision_num = strtoull(opts->vfd_info[1].info, NULL, 10);
@@ -512,7 +512,7 @@ check_n_input(const char *str)
     unsigned i;
     char     c;
 
-    for (i = 0; i < HDstrlen(str); i++) {
+    for (i = 0; i < strlen(str); i++) {
         c = str[i];
         if (i == 0) {
             if (c < 49 || c > 57) /* ascii values between 1 and 9 */
@@ -541,7 +541,7 @@ check_p_input(const char *str)
      * the atof return value on a hexadecimal input is different
      * on some systems; we do a character check for this
      */
-    if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
+    if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
     x = atof(str);
@@ -568,7 +568,7 @@ check_d_input(const char *str)
      * the atof return value on a hexadecimal input is different
      * on some systems; we do a character check for this
      */
-    if (HDstrlen(str) > 2 && str[0] == '0' && str[1] == 'x')
+    if (strlen(str) > 2 && str[0] == '0' && str[1] == 'x')
         return -1;
 
     x = atof(str);
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index c5f97df..0f43261 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -246,8 +246,8 @@ print_manager_output(void)
         if (overflow_file) {
             int tmp;
             rewind(overflow_file);
-            while ((tmp = HDgetc(overflow_file)) >= 0)
-                HDputchar(tmp);
+            while ((tmp = getc(overflow_file)) >= 0)
+                putchar(tmp);
             fclose(overflow_file);
             overflow_file = NULL;
         }
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 1458354..a1a6de0 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -18,24 +18,24 @@
 #define PROGRAMNAME "h5dump"
 
 const char        *outfname_g    = NULL;
-static hbool_t     doxml_g       = FALSE;
-static hbool_t     useschema_g   = TRUE;
+static bool        doxml_g       = false;
+static bool        useschema_g   = true;
 static const char *xml_dtd_uri_g = NULL;
 
-static hbool_t use_custom_vol_g = FALSE;
-static hbool_t use_custom_vfd_g = FALSE;
+static bool use_custom_vol_g = false;
+static bool use_custom_vfd_g = false;
 
 static h5tools_vol_info_t vol_info_g = {0};
 static h5tools_vfd_info_t vfd_info_g = {0};
 
-static hbool_t get_onion_revision_count = FALSE;
+static bool get_onion_revision_count = false;
 
 #ifdef H5_HAVE_ROS3_VFD
 /* Default "anonymous" S3 configuration */
 static H5FD_ros3_fapl_ext_t ros3_fa_g = {
     {
         1,     /* Structure Version */
-        FALSE, /* Authenticate?     */
+        false, /* Authenticate?     */
         "",    /* AWS Region        */
         "",    /* Access Key ID     */
         "",    /* Secret Access Key */
@@ -515,15 +515,15 @@ set_binary_form(const char *form)
 {
     int bform = -1;
 
-    if (HDstrcmp(form, "NATIVE") == 0 || HDstrcmp(form, "MEMORY") == 0) {
+    if (strcmp(form, "NATIVE") == 0 || strcmp(form, "MEMORY") == 0) {
         /* native form */
         bform = 0;
     }
-    else if (HDstrcmp(form, "FILE") == 0) /* file type form */
+    else if (strcmp(form, "FILE") == 0) /* file type form */
         bform = 1;
-    else if (HDstrcmp(form, "LE") == 0) /* convert to little endian */
+    else if (strcmp(form, "LE") == 0) /* convert to little endian */
         bform = 2;
-    else if (HDstrcmp(form, "BE") == 0) /* convert to big endian */
+    else if (strcmp(form, "BE") == 0) /* convert to big endian */
         bform = 3;
 
     return bform;
@@ -544,9 +544,9 @@ set_sort_by(const char *form)
 {
     H5_index_t idx_type = H5_INDEX_UNKNOWN;
 
-    if (HDstrcmp(form, "name") == 0) /* H5_INDEX_NAME */
+    if (strcmp(form, "name") == 0) /* H5_INDEX_NAME */
         idx_type = H5_INDEX_NAME;
-    else if (HDstrcmp(form, "creation_order") == 0) /* H5_INDEX_CRT_ORDER */
+    else if (strcmp(form, "creation_order") == 0) /* H5_INDEX_CRT_ORDER */
         idx_type = H5_INDEX_CRT_ORDER;
 
     return idx_type;
@@ -567,9 +567,9 @@ set_sort_order(const char *form)
 {
     H5_iter_order_t iter_order = H5_ITER_UNKNOWN;
 
-    if (HDstrcmp(form, "ascending") == 0) /* H5_ITER_INC */
+    if (strcmp(form, "ascending") == 0) /* H5_ITER_INC */
         iter_order = H5_ITER_INC;
-    else if (HDstrcmp(form, "descending") == 0) /* H5_ITER_DEC */
+    else if (strcmp(form, "descending") == 0) /* H5_ITER_DEC */
         iter_order = H5_ITER_DEC;
 
     return iter_order;
@@ -752,7 +752,7 @@ parse_command_line(int argc, const char *const *argv)
     struct handler_t *last_dset = NULL;
     int               i;
     int               opt;
-    int               last_was_dset = FALSE;
+    int               last_was_dset = false;
 
     /* no arguments */
     if (argc == 1) {
@@ -770,50 +770,50 @@ parse_command_line(int argc, const char *const *argv)
 parse_start:
         switch ((char)opt) {
             case 'R':
-                dump_opts.display_region = TRUE;
-                region_output            = TRUE;
+                dump_opts.display_region = true;
+                region_output            = true;
                 break;
             case 'B':
-                dump_opts.display_bb = TRUE;
-                last_was_dset        = FALSE;
+                dump_opts.display_bb = true;
+                last_was_dset        = false;
                 break;
             case 'n':
-                dump_opts.display_fi = TRUE;
-                last_was_dset        = FALSE;
+                dump_opts.display_fi = true;
+                last_was_dset        = false;
                 if (H5_optarg != NULL)
                     h5trav_set_verbose(atoi(H5_optarg));
                 break;
             case 'p':
-                dump_opts.display_dcpl = TRUE;
+                dump_opts.display_dcpl = true;
                 break;
             case 'y':
-                dump_opts.display_ai = FALSE;
+                dump_opts.display_ai = false;
                 break;
             case 'e':
-                dump_opts.display_escape = TRUE;
+                dump_opts.display_escape = true;
                 break;
             case 'H':
-                dump_opts.display_data      = FALSE;
-                dump_opts.display_attr_data = FALSE;
-                last_was_dset               = FALSE;
+                dump_opts.display_data      = false;
+                dump_opts.display_attr_data = false;
+                last_was_dset               = false;
                 break;
             case 'A':
                 if (H5_optarg != NULL) {
                     if (0 == atoi(H5_optarg))
-                        dump_opts.include_attrs = FALSE;
+                        dump_opts.include_attrs = false;
                 }
                 else {
-                    dump_opts.display_data      = FALSE;
-                    dump_opts.display_attr_data = TRUE;
-                    last_was_dset               = FALSE;
+                    dump_opts.display_data      = false;
+                    dump_opts.display_attr_data = true;
+                    last_was_dset               = false;
                 }
                 break;
             case 'i':
-                dump_opts.display_oid = TRUE;
-                last_was_dset         = FALSE;
+                dump_opts.display_oid = true;
+                last_was_dset         = false;
                 break;
             case 'r':
-                dump_opts.display_char = TRUE;
+                dump_opts.display_char = true;
                 break;
             case 'V':
                 print_version(h5tools_getprogname());
@@ -829,7 +829,7 @@ parse_start:
                     h5tools_nCols = 65535;
                 else
                     h5tools_nCols = (unsigned)sh5tools_nCols;
-                last_was_dset = FALSE;
+                last_was_dset = false;
             } break;
             case 'N':
                 dump_opts.display_all = 0;
@@ -837,11 +837,11 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_paths;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         break;
                     }
 
-                last_was_dset = FALSE;
+                last_was_dset = false;
                 break;
             case 'a':
                 dump_opts.display_all = 0;
@@ -849,11 +849,11 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_attributes;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         break;
                     }
 
-                last_was_dset = FALSE;
+                last_was_dset = false;
                 break;
             case 'd':
                 dump_opts.display_all = 0;
@@ -861,27 +861,27 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_datasets;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         if (!dump_opts.disable_compact_subset)
                             hand[i].subset_info = parse_subset_params(hand[i].obj);
                         last_dset = &hand[i];
                         break;
                     }
 
-                last_was_dset = TRUE;
+                last_was_dset = true;
                 break;
             case 'f':
                 vfd_info_g.type   = VFD_BY_NAME;
                 vfd_info_g.u.name = H5_optarg;
-                use_custom_vfd_g  = TRUE;
+                use_custom_vfd_g  = true;
 
 #ifdef H5_HAVE_ROS3_VFD
-                if (0 == HDstrcmp(vfd_info_g.u.name, drivernames[ROS3_VFD_IDX]))
+                if (0 == strcmp(vfd_info_g.u.name, drivernames[ROS3_VFD_IDX]))
                     if (!vfd_info_g.info)
                         vfd_info_g.info = &ros3_fa_g;
 #endif
 #ifdef H5_HAVE_LIBHDFS
-                if (0 == HDstrcmp(vfd_info_g.u.name, drivernames[HDFS_VFD_IDX]))
+                if (0 == strcmp(vfd_info_g.u.name, drivernames[HDFS_VFD_IDX]))
                     if (!vfd_info_g.info)
                         vfd_info_g.info = &hdfs_fa_g;
 #endif
@@ -893,11 +893,11 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_groups;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         break;
                     }
 
-                last_was_dset = FALSE;
+                last_was_dset = false;
                 break;
             case 'l':
                 dump_opts.display_all = 0;
@@ -905,11 +905,11 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_links;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         break;
                     }
 
-                last_was_dset = FALSE;
+                last_was_dset = false;
                 break;
             case 't':
                 dump_opts.display_all = 0;
@@ -917,11 +917,11 @@ parse_start:
                 for (i = 0; i < argc; i++)
                     if (!hand[i].func) {
                         hand[i].func = handle_datatypes;
-                        hand[i].obj  = HDstrdup(H5_optarg);
+                        hand[i].obj  = strdup(H5_optarg);
                         break;
                     }
 
-                last_was_dset = FALSE;
+                last_was_dset = false;
                 break;
 
             case 'O':
@@ -953,8 +953,8 @@ parse_start:
                     }
                 }
 
-                dump_opts.usingdasho = TRUE;
-                last_was_dset        = FALSE;
+                dump_opts.usingdasho = true;
+                last_was_dset        = false;
                 outfname_g           = H5_optarg;
                 break;
 
@@ -966,7 +966,7 @@ parse_start:
                         goto error;
                     }
                 }
-                bin_output = TRUE;
+                bin_output = true;
                 if (outfname_g != NULL) {
                     if (h5tools_set_data_output_file(outfname_g, 1) < 0) {
                         /* failed to set output file */
@@ -974,7 +974,7 @@ parse_start:
                         goto error;
                     }
 
-                    last_was_dset = FALSE;
+                    last_was_dset = false;
                 }
                 break;
 
@@ -1003,10 +1003,10 @@ parse_start:
                     usage(h5tools_getprogname());
                     goto error;
                 }
-                dump_opts.display_packed_bits = TRUE;
+                dump_opts.display_packed_bits = true;
                 break;
             case 'v':
-                dump_opts.display_vds_first = TRUE;
+                dump_opts.display_vds_first = true;
                 break;
             case 'G':
                 dump_opts.vds_gap_size = atoi(H5_optarg);
@@ -1019,15 +1019,15 @@ parse_start:
             /** begin XML parameters **/
             case 'x':
                 /* select XML output */
-                doxml_g                    = TRUE;
-                useschema_g                = TRUE;
+                doxml_g                    = true;
+                useschema_g                = true;
                 h5tools_dump_header_format = NULL;
                 dump_function_table        = &xml_function_table;
                 h5tools_nCols              = 0;
                 break;
             case 'u':
-                doxml_g                    = TRUE;
-                useschema_g                = FALSE;
+                doxml_g                    = true;
+                useschema_g                = false;
                 xmlnsprefix                = "";
                 h5tools_dump_header_format = NULL;
                 dump_function_table        = &xml_function_table;
@@ -1053,7 +1053,7 @@ parse_start:
                     usage(h5tools_getprogname());
                     goto error;
                 }
-                if (HDstrcmp(H5_optarg, ":") == 0)
+                if (strcmp(H5_optarg, ":") == 0)
                     xmlnsprefix = "";
                 else
                     xmlnsprefix = H5_optarg;
@@ -1131,7 +1131,7 @@ parse_start:
                 } while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF);
 
 end_collect:
-                last_was_dset = FALSE;
+                last_was_dset = false;
 
                 if (opt != EOF)
                     goto parse_start;
@@ -1147,7 +1147,7 @@ end_collect:
                     enable_error_stack = 1;
                 break;
             case 'C':
-                dump_opts.disable_compact_subset = TRUE;
+                dump_opts.disable_compact_subset = true;
                 break;
             case 'h':
                 usage(h5tools_getprogname());
@@ -1197,13 +1197,13 @@ end_collect:
             case '1':
                 vol_info_g.type    = VOL_BY_VALUE;
                 vol_info_g.u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                use_custom_vol_g   = TRUE;
+                use_custom_vol_g   = true;
                 break;
 
             case '2':
                 vol_info_g.type   = VOL_BY_NAME;
                 vol_info_g.u.name = H5_optarg;
-                use_custom_vol_g  = TRUE;
+                use_custom_vol_g  = true;
                 break;
 
             case '3':
@@ -1213,13 +1213,13 @@ end_collect:
             case '4':
                 vfd_info_g.type    = VFD_BY_VALUE;
                 vfd_info_g.u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                use_custom_vfd_g   = TRUE;
+                use_custom_vfd_g   = true;
                 break;
 
             case '5':
                 vfd_info_g.type   = VFD_BY_NAME;
                 vfd_info_g.u.name = H5_optarg;
-                use_custom_vfd_g  = TRUE;
+                use_custom_vfd_g  = true;
                 break;
 
             case '6':
@@ -1234,11 +1234,11 @@ end_collect:
     }
 
     /* If the file uses the onion VFD, get the revision number */
-    if (vfd_info_g.u.name && !HDstrcmp(vfd_info_g.u.name, "onion")) {
+    if (vfd_info_g.u.name && !strcmp(vfd_info_g.u.name, "onion")) {
 
         if (vfd_info_g.info) {
-            if (!HDstrcmp(vfd_info_g.info, "revision_count"))
-                get_onion_revision_count = TRUE;
+            if (!strcmp(vfd_info_g.info, "revision_count"))
+                get_onion_revision_count = true;
             else {
                 errno                   = 0;
                 onion_fa_g.revision_num = strtoull(vfd_info_g.info, NULL, 10);
@@ -1333,7 +1333,7 @@ main(int argc, char *argv[])
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
         }
-        else if (dump_opts.display_char == TRUE) {
+        else if (dump_opts.display_char == true) {
             error_msg("option \"%s\" not available for XML\n", "--string");
             h5tools_setstatus(EXIT_FAILURE);
             goto done;
@@ -1373,7 +1373,7 @@ main(int argc, char *argv[])
     }
 
     while (H5_optind < argc) {
-        fname = HDstrdup(argv[H5_optind++]);
+        fname = strdup(argv[H5_optind++]);
 
         /* A short cut to get the revision count of an onion file without opening the file */
         if (get_onion_revision_count && H5FD_ONION == H5Pget_driver(fapl_id)) {
@@ -1406,7 +1406,7 @@ main(int argc, char *argv[])
         if (doxml_g) {
             /* initialize XML */
             /* reset prefix! */
-            HDstrcpy(prefix, "");
+            strcpy(prefix, "");
 
             /* make sure the URI is initialized to something */
             if (xml_dtd_uri_g == NULL) {
@@ -1419,7 +1419,7 @@ main(int argc, char *argv[])
                 }
             }
             else {
-                if (useschema_g && HDstrcmp(xmlnsprefix, "") != 0) {
+                if (useschema_g && strcmp(xmlnsprefix, "") != 0) {
                     error_msg(
                         "Cannot set Schema URL for a qualified namespace--use -X or -U option with -D \n");
                     h5tools_setstatus(EXIT_FAILURE);
@@ -1462,7 +1462,7 @@ main(int argc, char *argv[])
 
             /* alternative first element, depending on schema or DTD. */
             if (useschema_g) {
-                if (HDstrcmp(xmlnsprefix, "") == 0) {
+                if (strcmp(xmlnsprefix, "") == 0) {
                     PRINTSTREAM(rawoutstream,
                                 "<HDF5-File xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
                                 "xsi:noNamespaceSchemaLocation=\"%s\">\n",
@@ -1473,8 +1473,8 @@ main(int argc, char *argv[])
                     char *ns;
                     char *indx;
 
-                    ns   = HDstrdup(xmlnsprefix);
-                    indx = HDstrrchr(ns, (int)':');
+                    ns   = strdup(xmlnsprefix);
+                    indx = strrchr(ns, (int)':');
                     if (indx)
                         *indx = '\0';
 
@@ -1633,7 +1633,7 @@ init_prefix(char **prfx, size_t prfx_len)
 void
 add_prefix(char **prfx, size_t *prfx_len, const char *name)
 {
-    size_t new_len = HDstrlen(*prfx) + HDstrlen(name) + 2;
+    size_t new_len = strlen(*prfx) + strlen(name) + 2;
 
     /* Check if we need more space */
     if (*prfx_len <= new_len) {
@@ -1642,5 +1642,5 @@ add_prefix(char **prfx, size_t *prfx_len, const char *name)
     }
 
     /* Append object name to prefix */
-    HDstrcat(HDstrcat(*prfx, "/"), name);
+    strcat(strcat(*prfx, "/"), name);
 } /* end add_prefix */
diff --git a/tools/src/h5dump/h5dump.h b/tools/src/h5dump/h5dump.h
index 7877655..5deb951 100644
--- a/tools/src/h5dump/h5dump.h
+++ b/tools/src/h5dump/h5dump.h
@@ -54,7 +54,7 @@ table_t            *group_table = NULL, *dset_table = NULL, *type_table = NULL;
 
 unsigned    dump_indent = 0;     /* how far in to indent the line */
 int         unamedtype  = 0;     /* shared datatype with no name */
-hbool_t     hit_elink   = FALSE; /* whether we have traversed an external link */
+bool        hit_elink   = false; /* whether we have traversed an external link */
 size_t      prefix_len  = 1024;
 char       *prefix      = NULL;
 const char *fp_format   = NULL;
@@ -79,8 +79,8 @@ typedef struct {
     int display_vds_first;      /* vds display to all by default */
     int vds_gap_size;           /* vds skip missing files default is none */
 } dump_opt_t;
-dump_opt_t dump_opts = {TRUE, FALSE, TRUE,  TRUE,  FALSE, FALSE, FALSE, FALSE, FALSE,
-                        TRUE, FALSE, FALSE, FALSE, FALSE, TRUE,  FALSE, 0};
+dump_opt_t dump_opts = {true, false, true,  true,  false, false, false, false, false,
+                        true, false, false, false, false, true,  false, 0};
 
 #define PACKED_BITS_MAX      8                       /* Maximum number of packed-bits to display */
 #define PACKED_BITS_SIZE_MAX (8 * sizeof(long long)) /* Maximum bits size of integer types of packed-bits */
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index adc8585..3b72faa 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -187,15 +187,15 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
     outputformat                = &string_dataformat;
 
     /* Build the object's path name */
-    obj_path = (char *)malloc(HDstrlen(prefix) + HDstrlen(name) + 2);
+    obj_path = (char *)malloc(strlen(prefix) + strlen(name) + 2);
     if (!obj_path) {
         ret = FAIL;
         goto done;
     }
 
-    HDstrcpy(obj_path, prefix);
-    HDstrcat(obj_path, "/");
-    HDstrcat(obj_path, name);
+    strcpy(obj_path, prefix);
+    strcat(obj_path, "/");
+    strcat(obj_path, name);
 
     if (linfo->type == H5L_TYPE_HARD) {
         H5O_info2_t oinfo;
@@ -219,7 +219,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                     char *old_prefix; /* Pointer to previous prefix */
 
                     /* Keep copy of prefix before iterating into group */
-                    old_prefix = HDstrdup(prefix);
+                    old_prefix = strdup(prefix);
                     if (old_prefix) {
                         /* Append group name to prefix */
                         add_prefix(&prefix, &prefix_len, name);
@@ -228,7 +228,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                         dump_function_table->dump_group_function(obj, name);
 
                         /* Restore old prefix name */
-                        HDstrcpy(prefix, old_prefix);
+                        strcpy(prefix, old_prefix);
                         free(old_prefix);
                     }
                     else
@@ -262,7 +262,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                         if (found_obj == NULL) {
                             ctx.indent_level++;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -274,17 +274,17 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                             error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
-                            if (HDstrlen(h5tools_dump_header_format->datasetblockend)) {
+                            if (strlen(h5tools_dump_header_format->datasetblockend)) {
                                 h5tools_str_append(&buffer, "%s",
                                                    h5tools_dump_header_format->datasetblockend);
-                                if (HDstrlen(h5tools_dump_header_format->datasetend))
+                                if (strlen(h5tools_dump_header_format->datasetend))
                                     h5tools_str_append(&buffer, " ");
                             }
-                            if (HDstrlen(h5tools_dump_header_format->datasetend))
+                            if (strlen(h5tools_dump_header_format->datasetend))
                                 h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetend);
                             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                                    (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -299,7 +299,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                             goto done;
                         }
                         else if (found_obj->displayed) {
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -311,7 +311,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                             ctx.indent_level++;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -321,17 +321,17 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                             ctx.indent_level--;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
-                            if (HDstrlen(h5tools_dump_header_format->datasetblockend)) {
+                            if (strlen(h5tools_dump_header_format->datasetblockend)) {
                                 h5tools_str_append(&buffer, "%s",
                                                    h5tools_dump_header_format->datasetblockend);
-                                if (HDstrlen(h5tools_dump_header_format->datasetend))
+                                if (strlen(h5tools_dump_header_format->datasetend))
                                     h5tools_str_append(&buffer, " ");
                             }
-                            if (HDstrlen(h5tools_dump_header_format->datasetend))
+                            if (strlen(h5tools_dump_header_format->datasetend))
                                 h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetend);
                             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                                    (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -342,7 +342,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                             goto done;
                         }
                         else {
-                            found_obj->displayed = TRUE;
+                            found_obj->displayed = true;
                         }
                     } /* end if */
 
@@ -392,7 +392,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                     ret = FAIL;
                 }
                 else {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -411,7 +411,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                     else {
                         /* print the value of a soft link */
                         /* Standard DDL: no modification */
-                        ctx.need_prefix = TRUE;
+                        ctx.need_prefix = true;
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -422,16 +422,16 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                     ctx.indent_level--;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
-                    if (HDstrlen(h5tools_dump_header_format->softlinkblockend)) {
+                    if (strlen(h5tools_dump_header_format->softlinkblockend)) {
                         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkblockend);
-                        if (HDstrlen(h5tools_dump_header_format->softlinkend))
+                        if (strlen(h5tools_dump_header_format->softlinkend))
                             h5tools_str_append(&buffer, " ");
                     }
-                    if (HDstrlen(h5tools_dump_header_format->softlinkend))
+                    if (strlen(h5tools_dump_header_format->softlinkend))
                         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->softlinkend);
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -447,7 +447,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                     ret = FAIL;
                 }
                 else {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -475,7 +475,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                         else {
                             ctx.indent_level++;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -483,7 +483,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                                    (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -496,16 +496,16 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
                             ctx.indent_level--;
                         } /* end else */
                     }     /* end else */
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
-                    if (HDstrlen(h5tools_dump_header_format->extlinkblockend)) {
+                    if (strlen(h5tools_dump_header_format->extlinkblockend)) {
                         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkblockend);
-                        if (HDstrlen(h5tools_dump_header_format->extlinkend))
+                        if (strlen(h5tools_dump_header_format->extlinkend))
                             h5tools_str_append(&buffer, " ");
                     }
-                    if (HDstrlen(h5tools_dump_header_format->extlinkend))
+                    if (strlen(h5tools_dump_header_format->extlinkend))
                         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->extlinkend);
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -518,7 +518,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
             case H5L_TYPE_MAX:
             case H5L_TYPE_HARD:
             default:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -529,7 +529,7 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 /* Render the element */
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, "LINKCLASS %d", linfo->type);
@@ -538,15 +538,15 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT
 
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 /* Render the element */
                 h5tools_str_reset(&buffer);
-                if (HDstrlen(h5tools_dump_header_format->udlinkblockend)) {
+                if (strlen(h5tools_dump_header_format->udlinkblockend)) {
                     h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->udlinkblockend);
-                    if (HDstrlen(h5tools_dump_header_format->udlinkend))
+                    if (strlen(h5tools_dump_header_format->udlinkend))
                         h5tools_str_append(&buffer, " ");
                 }
-                if (HDstrlen(h5tools_dump_header_format->udlinkend))
+                if (strlen(h5tools_dump_header_format->udlinkend))
                     h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->udlinkend);
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -673,7 +673,7 @@ dump_named_datatype(hid_t tid, const char *name)
         h5tools_setstatus(EXIT_FAILURE);
     }
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -706,12 +706,12 @@ dump_named_datatype(hid_t tid, const char *name)
             goto done;
         }
         else
-            found_obj->displayed = TRUE;
+            found_obj->displayed = true;
     } /* end if */
 
     /* Render the element */
     h5tools_str_reset(&buffer);
-    h5tools_print_datatype(rawoutstream, &buffer, outputformat, &ctx, tid, FALSE);
+    h5tools_print_datatype(rawoutstream, &buffer, outputformat, &ctx, tid, false);
 
     if (H5Tget_class(tid) != H5T_COMPOUND) {
         h5tools_str_append(&buffer, ";");
@@ -730,12 +730,12 @@ dump_named_datatype(hid_t tid, const char *name)
 done:
     /* Render the element */
     h5tools_str_reset(&buffer);
-    if (HDstrlen(h5tools_dump_header_format->datatypeblockend)) {
+    if (strlen(h5tools_dump_header_format->datatypeblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datatypeblockend);
-        if (HDstrlen(h5tools_dump_header_format->datatypeend))
+        if (strlen(h5tools_dump_header_format->datatypeend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datatypeend))
+    if (strlen(h5tools_dump_header_format->datatypeend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datatypeend);
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -813,7 +813,7 @@ dump_group(hid_t gid, const char *name)
     string_dataformat.do_escape = dump_opts.display_escape;
     outputformat                = &string_dataformat;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -825,7 +825,7 @@ dump_group(hid_t gid, const char *name)
     ctx.indent_level++;
     dump_indent += COL;
 
-    if (!HDstrcmp(name, "/") && unamedtype) {
+    if (!strcmp(name, "/") && unamedtype) {
         unsigned u; /* Local index variable */
 
         /* dump unnamed type in root group */
@@ -837,7 +837,7 @@ dump_group(hid_t gid, const char *name)
                 type = H5Dget_type(dset);
 
                 H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
-                HDsnprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
+                snprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
                 H5free_memory(obj_tok_str);
 
                 dump_function_table->dump_named_datatype_function(type, type_name);
@@ -863,7 +863,7 @@ dump_group(hid_t gid, const char *name)
             h5tools_setstatus(EXIT_FAILURE);
         }
         else if (found_obj->displayed) {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -872,7 +872,7 @@ dump_group(hid_t gid, const char *name)
                                    (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         }
         else {
-            found_obj->displayed = TRUE;
+            found_obj->displayed = true;
             attr_iteration(gid, attr_crt_order_flags);
             link_iteration(gid, crt_order_flags);
         }
@@ -881,16 +881,16 @@ dump_group(hid_t gid, const char *name)
     dump_indent -= COL;
     ctx.indent_level--;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
-    if (HDstrlen(h5tools_dump_header_format->groupblockend)) {
+    if (strlen(h5tools_dump_header_format->groupblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->groupblockend);
-        if (HDstrlen(h5tools_dump_header_format->groupend))
+        if (strlen(h5tools_dump_header_format->groupend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->groupend))
+    if (strlen(h5tools_dump_header_format->groupend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->groupend);
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -955,7 +955,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     /* setup */
     memset(&buffer, 0, sizeof(h5tools_str_t));
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
@@ -1003,7 +1003,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
             data_loop = packed_bits_num;
         for (u = 0; u < data_loop; u++) {
             if (dump_opts.display_packed_bits) {
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1018,7 +1018,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
                 case H5T_TIME:
                     ctx.indent_level++;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
                     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1039,7 +1039,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
                 case H5T_ENUM:
                 case H5T_VLEN:
                 case H5T_ARRAY: {
-                    h5tools_dump_data(rawoutstream, outputformat, &ctx, did, TRUE);
+                    h5tools_dump_data(rawoutstream, outputformat, &ctx, did, true);
                 } break;
 
                 case H5T_NO_CLASS:
@@ -1058,17 +1058,17 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset)
     ctx.indent_level--;
     dump_indent -= COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
     h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
     /* Render the element */
     h5tools_str_reset(&buffer);
-    if (HDstrlen(h5tools_dump_header_format->datasetblockend)) {
+    if (strlen(h5tools_dump_header_format->datasetblockend)) {
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetblockend);
-        if (HDstrlen(h5tools_dump_header_format->datasetend))
+        if (strlen(h5tools_dump_header_format->datasetend))
             h5tools_str_append(&buffer, " ");
     }
-    if (HDstrlen(h5tools_dump_header_format->datasetend))
+    if (strlen(h5tools_dump_header_format->datasetend))
         h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetend);
     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -1090,7 +1090,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     h5tools_context_t ctx; /* print context  */
     h5tool_format_t  *outputformat = &h5tools_dataformat;
     h5tool_format_t   string_dataformat;
-    int               print_dataset = FALSE;
+    int               print_dataset = false;
 
     string_dataformat = *outputformat;
 
@@ -1117,7 +1117,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index)
     ctx.display_char  = dump_opts.display_char;
 
     if (obj_data == DATASET_DATA)
-        print_dataset = TRUE;
+        print_dataset = true;
     h5tools_dump_data(rawoutstream, outputformat, &ctx, obj_id, print_dataset);
 }
 
@@ -1137,7 +1137,7 @@ dump_fcpl(hid_t fid)
     size_t                off_size;     /* size of offsets in the file */
     size_t                len_size;     /* size of lengths in the file */
     H5F_fspace_strategy_t fs_strategy;  /* file space strategy */
-    hbool_t               fs_persist;   /* Persisting free-space or not */
+    bool                  fs_persist;   /* Persisting free-space or not */
     hsize_t               fs_threshold; /* free-space section threshold */
     hsize_t               fsp_size;     /* file space page size */
     H5F_info2_t           finfo;        /* file information */
@@ -1202,25 +1202,25 @@ dump_fcpl(hid_t fid)
 
 #ifdef SHOW_FILE_DRIVER
     if (H5FD_CORE == fdriver)
-        HDstrcpy(dname, "H5FD_CORE");
+        strcpy(dname, "H5FD_CORE");
 #ifdef H5_HAVE_DIRECT
     else if (H5FD_DIRECT == fdriver)
-        HDstrcpy(dname, "H5FD_DIRECT");
+        strcpy(dname, "H5FD_DIRECT");
 #endif
     else if (H5FD_FAMILY == fdriver)
-        HDstrcpy(dname, "H5FD_FAMILY");
+        strcpy(dname, "H5FD_FAMILY");
     else if (H5FD_LOG == fdriver)
-        HDstrcpy(dname, "H5FD_LOG");
+        strcpy(dname, "H5FD_LOG");
     else if (H5FD_MPIO == fdriver)
-        HDstrcpy(dname, "H5FD_MPIO");
+        strcpy(dname, "H5FD_MPIO");
     else if (H5FD_MULTI == fdriver)
-        HDstrcpy(dname, "H5FD_MULTI");
+        strcpy(dname, "H5FD_MULTI");
     else if (H5FD_SEC2 == fdriver)
-        HDstrcpy(dname, "H5FD_SEC2");
+        strcpy(dname, "H5FD_SEC2");
     else if (H5FD_STDIO == fdriver)
-        HDstrcpy(dname, "H5FD_STDIO");
+        strcpy(dname, "H5FD_STDIO");
     else
-        HDstrcpy(dname, "Unknown driver");
+        strcpy(dname, "Unknown driver");
 
         /* Take out this because the driver used can be different from the
          * standard output. */
@@ -1311,7 +1311,7 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
     const char        *buf       = attr_data->path;
     const char        *op_name   = attr_data->op_name;
 
-    j = (int)HDstrlen(op_name) - 1;
+    j = (int)strlen(op_name) - 1;
     /* find the last / */
     while (j >= 0) {
         if (op_name[j] == '/' && (j == 0 || (op_name[j - 1] != '\\')))
@@ -1326,12 +1326,12 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
         ret = FAIL;
     }
     else {
-        if (HDstrcmp(attr_name, obj_op_name) == 0) {
+        if (strcmp(attr_name, obj_op_name) == 0) {
             size_t u, v, w;
 
             /* object name */
-            u        = HDstrlen(buf);
-            v        = HDstrlen(op_name);
+            u        = strlen(buf);
+            v        = strlen(op_name);
             w        = u + 1 + v + 1 + 2;
             obj_name = (char *)malloc(w);
             if (obj_name == NULL) {
@@ -1343,16 +1343,16 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a
 
                 memset(obj_name, '\0', w);
                 if (op_name[0] != '/') {
-                    HDstrncat(obj_name, buf, buffer_space);
+                    strncat(obj_name, buf, buffer_space);
                     buffer_space -= MIN(buffer_space, u);
 
                     if (buf[u - 1] != '/') {
-                        HDstrncat(obj_name, "/", buffer_space);
+                        strncat(obj_name, "/", buffer_space);
                         buffer_space -= MIN(buffer_space, 2);
                     }
                 }
 
-                HDstrncat(obj_name, op_name, buffer_space);
+                strncat(obj_name, op_name, buffer_space);
                 buffer_space -= MIN(buffer_space, v);
 
                 handle_attributes(oid, obj_name, NULL, 0, NULL);
@@ -1377,7 +1377,7 @@ obj_search(const char *path, const H5O_info2_t *oi, const char H5_ATTR_UNUSED *a
     H5Aiterate_by_name(handle_data->fid, path, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_search,
                        (void *)&attr_data, H5P_DEFAULT);
 
-    if (HDstrcmp(path, op_name) == 0) {
+    if (strcmp(path, op_name) == 0) {
         switch (oi->type) {
             case H5O_TYPE_GROUP:
                 handle_groups(handle_data->fid, path, NULL, 0, NULL);
@@ -1412,7 +1412,7 @@ lnk_search(const char *path, const H5L_info2_t *li, void *_op_data)
     trav_handle_udata_t *handle_data = (trav_handle_udata_t *)_op_data;
     const char          *op_name     = handle_data->op_name;
 
-    search_len = HDstrlen(op_name);
+    search_len = strlen(op_name);
     if (search_len > 0 && op_name[0] != '/')
         k = 2;
     else
@@ -1424,14 +1424,14 @@ lnk_search(const char *path, const H5L_info2_t *li, void *_op_data)
     }
     else {
         if (k == 2) {
-            HDstrcpy(search_name, "/");
-            HDstrcat(search_name, op_name);
+            strcpy(search_name, "/");
+            strcat(search_name, op_name);
         }
         else
-            HDstrcpy(search_name, op_name);
+            strcpy(search_name, op_name);
         search_name[search_len + k - 1] = '\0';
 
-        if (HDstrcmp(path, search_name) == 0) {
+        if (strcmp(path, search_name) == 0) {
             switch (li->type) {
                 case H5L_TYPE_SOFT:
                 case H5L_TYPE_EXTERNAL:
@@ -1500,7 +1500,7 @@ handle_paths(hid_t fid, const char *path_name, void H5_ATTR_UNUSED *data, int H5
 
         handle_udata.fid     = fid;
         handle_udata.op_name = path_name;
-        if (h5trav_visit(fid, "/", TRUE, TRUE, obj_search, lnk_search, &handle_udata, H5O_INFO_BASIC) < 0) {
+        if (h5trav_visit(fid, "/", true, true, obj_search, lnk_search, &handle_udata, H5O_INFO_BASIC) < 0) {
             error_msg("error traversing information\n");
             h5tools_setstatus(EXIT_FAILURE);
         }
@@ -1530,7 +1530,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
     h5tool_format_t   string_dataformat;
     hsize_t           curr_pos = 0; /* total data element position   */
 
-    j        = (int)HDstrlen(attr) - 1;
+    j        = (int)strlen(attr) - 1;
     obj_name = (char *)malloc((size_t)j + 2);
     if (obj_name == NULL)
         goto error;
@@ -1544,9 +1544,9 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
 
     /* object name */
     if (j == -1)
-        HDstrcpy(obj_name, "/");
+        strcpy(obj_name, "/");
     else {
-        HDstrncpy(obj_name, attr, (size_t)j + 1);
+        strncpy(obj_name, attr, (size_t)j + 1);
         obj_name[j + 1] = '\0';
     } /* end else */
 
@@ -1581,7 +1581,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
         /* setup */
         memset(&buffer, 0, sizeof(h5tools_str_t));
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1592,15 +1592,15 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5
 
         error_msg("unable to open object \"%s\"\n", obj_name);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
         /* Render the element */
         h5tools_str_reset(&buffer);
-        if (HDstrlen(h5tools_dump_header_format->attributeblockend)) {
+        if (strlen(h5tools_dump_header_format->attributeblockend)) {
             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->attributeblockend);
-            if (HDstrlen(h5tools_dump_header_format->attributeend))
+            if (strlen(h5tools_dump_header_format->attributeend))
                 h5tools_str_append(&buffer, " ");
         }
-        if (HDstrlen(h5tools_dump_header_format->attributeend))
+        if (strlen(h5tools_dump_header_format->attributeend))
             h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->attributeend);
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -1802,7 +1802,7 @@ handle_datasets(hid_t fid, const char *dset, void *data, int pe, const char *dis
                 end_obj(h5tools_dump_header_format->datasetend, h5tools_dump_header_format->datasetblockend);
             }
             else {
-                found_obj->displayed = TRUE;
+                found_obj->displayed = true;
                 dump_indent += COL;
                 dump_dataset(dsetid, real_name, sset);
                 dump_indent -= COL;
@@ -1849,14 +1849,14 @@ handle_groups(hid_t fid, const char *group, void H5_ATTR_UNUSED *data, int pe, c
         }
     }
     else {
-        size_t new_len = HDstrlen(group) + 1;
+        size_t new_len = strlen(group) + 1;
 
         if (prefix_len <= new_len) {
             prefix_len = new_len;
             prefix     = (char *)realloc(prefix, prefix_len);
         } /* end if */
 
-        HDstrcpy(prefix, group);
+        strcpy(prefix, group);
 
         dump_indent += COL;
         dump_group(gid, real_name);
@@ -1978,10 +1978,10 @@ handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED *data, int pe,
 
                 /* unnamed datatype */
                 H5Otoken_to_str(fid, &type_table->objs[idx].obj_token, &obj_tok_str);
-                HDsnprintf(name, sizeof(name), "/#%s", obj_tok_str);
+                snprintf(name, sizeof(name), "/#%s", obj_tok_str);
                 H5free_memory(obj_tok_str);
 
-                if (!HDstrcmp(name, real_name))
+                if (!strcmp(name, real_name))
                     break;
             } /* end if */
 
@@ -2042,7 +2042,7 @@ dump_extlink(hid_t group, const char *linkname, const char *objname)
     table_t    *old_group_table = group_table;
     table_t    *old_dset_table  = dset_table;
     table_t    *old_type_table  = type_table;
-    hbool_t     old_hit_elink;
+    bool        old_hit_elink;
     ssize_t     idx;
 
     /* Open target object */
@@ -2073,7 +2073,7 @@ dump_extlink(hid_t group, const char *linkname, const char *objname)
 
         /* We will now traverse the external link, set this global to indicate this */
         old_hit_elink = hit_elink;
-        hit_elink     = TRUE;
+        hit_elink     = true;
 
         /* add some indentation to distinguish that these objects are external */
         dump_indent += COL;
diff --git a/tools/src/h5dump/h5dump_defines.h b/tools/src/h5dump/h5dump_defines.h
index 5f89178..f82dee5 100644
--- a/tools/src/h5dump/h5dump_defines.h
+++ b/tools/src/h5dump/h5dump_defines.h
@@ -32,12 +32,12 @@
 
 #define end_obj(obj, end)                                                                                    \
     do {                                                                                                     \
-        if (HDstrlen(end)) {                                                                                 \
+        if (strlen(end)) {                                                                                   \
             PRINTSTREAM(rawoutstream, "%s", end);                                                            \
-            if (HDstrlen(obj))                                                                               \
+            if (strlen(obj))                                                                                 \
                 PRINTVALSTREAM(rawoutstream, " ");                                                           \
         }                                                                                                    \
-        if (HDstrlen(obj))                                                                                   \
+        if (strlen(obj))                                                                                     \
             PRINTSTREAM(rawoutstream, "%s", obj);                                                            \
     } while (0)
 
diff --git a/tools/src/h5dump/h5dump_extern.h b/tools/src/h5dump/h5dump_extern.h
index 3c4c772..723a39e 100644
--- a/tools/src/h5dump/h5dump_extern.h
+++ b/tools/src/h5dump/h5dump_extern.h
@@ -52,7 +52,7 @@ extern table_t            *group_table, *dset_table, *type_table;
 
 extern unsigned    dump_indent; /* how far in to indent the line */
 extern int         unamedtype;  /* shared datatype with no name */
-extern hbool_t     hit_elink;   /* whether we have traversed an external link */
+extern bool        hit_elink;   /* whether we have traversed an external link */
 extern size_t      prefix_len;
 extern char       *prefix;
 extern const char *fp_format;
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index cb279e3..93fc3b0 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -164,15 +164,15 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
     outputformat                = &string_dataformat;
 
     /* Build the object's path name */
-    obj_path = (char *)malloc(HDstrlen(prefix) + HDstrlen(name) + 2);
+    obj_path = (char *)malloc(strlen(prefix) + strlen(name) + 2);
     if (!obj_path) {
         ret = FAIL;
         goto done;
     }
 
-    HDstrcpy(obj_path, prefix);
-    HDstrcat(obj_path, "/");
-    HDstrcat(obj_path, name);
+    strcpy(obj_path, prefix);
+    strcat(obj_path, "/");
+    strcat(obj_path, name);
 
     if (linfo->type == H5L_TYPE_HARD) {
         H5O_info2_t oinfo;
@@ -196,7 +196,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                     char *old_prefix; /* Pointer to previous prefix */
 
                     /* Keep copy of prefix before iterating into group */
-                    if ((old_prefix = HDstrdup(prefix)) == NULL) {
+                    if ((old_prefix = strdup(prefix)) == NULL) {
                         error_msg("unable to allocate buffer\n");
                         h5tools_setstatus(EXIT_FAILURE);
                         ret = FAIL;
@@ -209,7 +209,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         dump_function_table->dump_group_function(obj, name);
 
                         /* Restore old prefix name */
-                        HDstrcpy(prefix, old_prefix);
+                        strcpy(prefix, old_prefix);
                         free(old_prefix);
                     }
 
@@ -228,7 +228,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         if (found_obj == NULL) {
                             ctx.indent_level++;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -240,17 +240,17 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
 
                             error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
-                            if (HDstrlen(h5tools_dump_header_format->datasetblockend)) {
+                            if (strlen(h5tools_dump_header_format->datasetblockend)) {
                                 h5tools_str_append(&buffer, "%s",
                                                    h5tools_dump_header_format->datasetblockend);
-                                if (HDstrlen(h5tools_dump_header_format->datasetend))
+                                if (strlen(h5tools_dump_header_format->datasetend))
                                     h5tools_str_append(&buffer, " ");
                             }
-                            if (HDstrlen(h5tools_dump_header_format->datasetend))
+                            if (strlen(h5tools_dump_header_format->datasetend))
                                 h5tools_str_append(&buffer, "%s", h5tools_dump_header_format->datasetend);
                             h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                                    (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -265,7 +265,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         else if (found_obj->displayed) {
                             /* the XML version */
                             char *t_obj_path = xml_escape_the_name(obj_path);
-                            char *t_prefix   = xml_escape_the_name(HDstrcmp(prefix, "") ? prefix : "/");
+                            char *t_prefix   = xml_escape_the_name(strcmp(prefix, "") ? prefix : "/");
                             char *t_name     = xml_escape_the_name(name);
                             char *t_objname  = xml_escape_the_name(found_obj->objname);
                             char  dsetxid[100];
@@ -276,7 +276,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                             xml_name_to_XID(obj, obj_path, dsetxid, (int)sizeof(dsetxid), 1);
                             xml_name_to_XID(obj, prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -296,7 +296,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
 
                             ctx.indent_level++;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -307,7 +307,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
 
                             ctx.indent_level--;
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -324,7 +324,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                             goto done;
                         }
                         else
-                            found_obj->displayed = TRUE;
+                            found_obj->displayed = true;
                     } /* end if */
 
                     dump_function_table->dump_dataset_function(obj, name, NULL);
@@ -380,19 +380,19 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         char  linkxid[100];
                         char  parentxid[100];
                         char  targetxid[100];
-                        char *t_prefix   = xml_escape_the_name(HDstrcmp(prefix, "") ? prefix : "/");
+                        char *t_prefix   = xml_escape_the_name(strcmp(prefix, "") ? prefix : "/");
                         char *t_name     = xml_escape_the_name(name);
                         char *t_targbuf  = xml_escape_the_name(targbuf);
                         char *t_obj_path = xml_escape_the_name(obj_path);
                         char *t_link_path;
                         int   res;
 
-                        t_link_path = (char *)malloc(HDstrlen(prefix) + linfo->u.val_size + 1);
+                        t_link_path = (char *)malloc(strlen(prefix) + linfo->u.val_size + 1);
                         if (targbuf[0] == '/')
-                            HDstrcpy(t_link_path, targbuf);
+                            strcpy(t_link_path, targbuf);
                         else {
-                            HDstrcpy(t_link_path, prefix);
-                            HDstrcat(HDstrcat(t_link_path, "/"), targbuf);
+                            strcpy(t_link_path, prefix);
+                            strcat(strcat(t_link_path, "/"), targbuf);
                         } /* end else */
 
                         /* Create OBJ-XIDs for the parent and object */
@@ -403,7 +403,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         res = xml_name_to_XID(group, t_link_path, targetxid, (int)sizeof(targetxid), 0);
                         if (res == 0) {
                             /* target obj found */
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -425,7 +425,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                         }
                         else {
                             /* dangling link -- omit from xml attributes */
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -481,7 +481,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                             char  linkxid[100];
                             char  parentxid[100];
                             char *t_name     = xml_escape_the_name(name);
-                            char *t_prefix   = xml_escape_the_name(HDstrcmp(prefix, "") ? prefix : "/");
+                            char *t_prefix   = xml_escape_the_name(strcmp(prefix, "") ? prefix : "/");
                             char *t_obj_path = xml_escape_the_name(obj_path);
                             char *t_filename = xml_escape_the_name(filename);
                             char *t_targname = xml_escape_the_name(targname);
@@ -490,7 +490,7 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                             xml_name_to_XID(group, t_obj_path, linkxid, (int)sizeof(linkxid), 1);
                             xml_name_to_XID(group, prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                            ctx.need_prefix = TRUE;
+                            ctx.need_prefix = true;
 
                             /* Render the element */
                             h5tools_str_reset(&buffer);
@@ -529,14 +529,14 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5
                 char  linkxid[100];
                 char  parentxid[100];
                 char *t_name     = xml_escape_the_name(name);
-                char *t_prefix   = xml_escape_the_name(HDstrcmp(prefix, "") ? prefix : "/");
+                char *t_prefix   = xml_escape_the_name(strcmp(prefix, "") ? prefix : "/");
                 char *t_obj_path = xml_escape_the_name(obj_path);
 
                 /* Create OBJ-XIDs for the parent and object */
                 xml_name_to_XID(group, t_obj_path, linkxid, (int)sizeof(linkxid), 1);
                 xml_name_to_XID(group, prefix, parentxid, (int)sizeof(parentxid), 1);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -593,14 +593,14 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
 
     lookup_ret = ref_path_table_lookup(str, &obj_token);
     if (lookup_ret < 0) {
-        if (HDstrlen(str) == 0) {
+        if (strlen(str) == 0) {
             lookup_ret = ref_path_table_lookup("/", &obj_token);
             if (lookup_ret < 0) {
                 if (gen) {
                     ref_path_table_gen_fake(str, &obj_token);
 
                     H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
-                    HDsnprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
+                    snprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
                     H5free_memory(obj_tok_str);
 
                     return 0;
@@ -615,7 +615,7 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
                 ref_path_table_gen_fake(str, &obj_token);
 
                 H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
-                HDsnprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
+                snprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
                 H5free_memory(obj_tok_str);
 
                 return 0;
@@ -627,7 +627,7 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
     }
 
     H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
-    HDsnprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
+    snprintf(outstr, (size_t)outlen, "xid_%s", obj_tok_str);
     H5free_memory(obj_tok_str);
 
     return 0;
@@ -664,26 +664,26 @@ xml_escape_the_name(const char *str)
         return NULL;
 
     cp    = str;
-    len   = HDstrlen(str);
+    len   = strlen(str);
     extra = 0;
 
     for (i = 0; i < len; i++) {
         if (*cp == '\"')
-            extra += (HDstrlen(quote) - 1);
+            extra += (strlen(quote) - 1);
         else if (*cp == '\'')
-            extra += (HDstrlen(apos) - 1);
+            extra += (strlen(apos) - 1);
         else if (*cp == '<')
-            extra += (HDstrlen(lt) - 1);
+            extra += (strlen(lt) - 1);
         else if (*cp == '>')
-            extra += (HDstrlen(gt) - 1);
+            extra += (strlen(gt) - 1);
         else if (*cp == '&')
-            extra += (HDstrlen(amp) - 1);
+            extra += (strlen(amp) - 1);
 
         cp++;
     }
 
     if (extra == 0)
-        return HDstrdup(str);
+        return strdup(str);
 
     cp      = str;
     ncp_len = len + extra + 1;
@@ -696,24 +696,24 @@ xml_escape_the_name(const char *str)
         size_t esc_len;
 
         if (*cp == '\'') {
-            HDstrncpy(ncp, apos, ncp_len);
-            esc_len = HDstrlen(apos);
+            strncpy(ncp, apos, ncp_len);
+            esc_len = strlen(apos);
         }
         else if (*cp == '<') {
-            HDstrncpy(ncp, lt, ncp_len);
-            esc_len = HDstrlen(lt);
+            strncpy(ncp, lt, ncp_len);
+            esc_len = strlen(lt);
         }
         else if (*cp == '>') {
-            HDstrncpy(ncp, gt, ncp_len);
-            esc_len = HDstrlen(gt);
+            strncpy(ncp, gt, ncp_len);
+            esc_len = strlen(gt);
         }
         else if (*cp == '\"') {
-            HDstrncpy(ncp, quote, ncp_len);
-            esc_len = HDstrlen(quote);
+            strncpy(ncp, quote, ncp_len);
+            esc_len = strlen(quote);
         }
         else if (*cp == '&') {
-            HDstrncpy(ncp, amp, ncp_len);
-            esc_len = HDstrlen(amp);
+            strncpy(ncp, amp, ncp_len);
+            esc_len = strlen(amp);
         }
         else {
             *ncp    = *cp;
@@ -755,7 +755,7 @@ xml_escape_the_string(const char *str, int slen)
     cp = str;
 
     if (slen < 0)
-        len = HDstrlen(str);
+        len = strlen(str);
     else
         len = (size_t)slen;
 
@@ -767,13 +767,13 @@ xml_escape_the_string(const char *str, int slen)
         else if (*cp == '\"')
             extra++;
         else if (*cp == '\'')
-            extra += (HDstrlen(apos) - 1);
+            extra += (strlen(apos) - 1);
         else if (*cp == '<')
-            extra += (HDstrlen(lt) - 1);
+            extra += (strlen(lt) - 1);
         else if (*cp == '>')
-            extra += (HDstrlen(gt) - 1);
+            extra += (strlen(gt) - 1);
         else if (*cp == '&')
-            extra += (HDstrlen(amp) - 1);
+            extra += (strlen(amp) - 1);
         cp++;
     }
 
@@ -800,20 +800,20 @@ xml_escape_the_string(const char *str, int slen)
             esc_len = 1;
         }
         else if (*cp == '\'') {
-            HDstrncpy(ncp, apos, ncp_len);
-            esc_len = HDstrlen(apos);
+            strncpy(ncp, apos, ncp_len);
+            esc_len = strlen(apos);
         }
         else if (*cp == '<') {
-            HDstrncpy(ncp, lt, ncp_len);
-            esc_len = HDstrlen(lt);
+            strncpy(ncp, lt, ncp_len);
+            esc_len = strlen(lt);
         }
         else if (*cp == '>') {
-            HDstrncpy(ncp, gt, ncp_len);
-            esc_len = HDstrlen(gt);
+            strncpy(ncp, gt, ncp_len);
+            esc_len = strlen(gt);
         }
         else if (*cp == '&') {
-            HDstrncpy(ncp, amp, ncp_len);
-            esc_len = HDstrlen(amp);
+            strncpy(ncp, amp, ncp_len);
+            esc_len = strlen(amp);
         }
         else {
             *ncp    = *cp;
@@ -865,7 +865,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
     size_t            mpos;
     size_t            msize;
     int               nmembs;
-    htri_t            is_vlstr = FALSE;
+    htri_t            is_vlstr = false;
     h5tools_str_t     buffer; /* string into which to render   */
     h5tools_context_t ctx;    /* print context  */
     h5tool_format_t  *outputformat = &xml_dataformat;
@@ -915,7 +915,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* 'anonymous' NDT.  Use it's object num.
                    as it's name.  */
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -927,7 +927,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* point to the NDT by name */
                 char *t_objname = xml_escape_the_name(found_obj->objname);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -940,7 +940,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
             free(dtxid);
         }
         else {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -953,7 +953,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
     else {
         switch (H5Tget_class(type)) {
             case H5T_INTEGER:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -966,7 +966,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ord = H5Tget_order(type);
                 sgn = H5Tget_sign(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1011,7 +1011,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1027,7 +1027,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                    MantissaBits="mb" MantissaLocation="ml" /> */
                 ord = H5Tget_order(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1036,7 +1036,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1072,7 +1072,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1082,7 +1082,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 break;
 
             case H5T_TIME:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1091,7 +1091,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1101,7 +1101,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 h5tools_str_append(&buffer, "<!-- H5T_TIME: not yet implemented -->");
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1117,7 +1117,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 cset     = H5Tget_cset(type);
                 is_vlstr = H5Tis_variable_str(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1127,7 +1127,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
 
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1155,7 +1155,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1168,7 +1168,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* <hdf5:BitfieldType ByteOrder="bo" Size="bytes"/> */
                 ord = H5Tget_order(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1177,7 +1177,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1204,7 +1204,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1216,7 +1216,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
             case H5T_OPAQUE:
                 /* <hdf5:OpaqueType Tag="tag" Size="bytes" /> */
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1226,7 +1226,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
                 mname = H5Tget_tag(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1238,7 +1238,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1253,7 +1253,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* type of a dataset */
                 nmembers = (unsigned)H5Tget_nmembers(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1273,7 +1273,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     mtype   = H5Tget_member_type(type, i);
                     t_fname = xml_escape_the_name(mname);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1286,7 +1286,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     dump_indent += COL;
                     ctx.indent_level++;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1299,7 +1299,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     dump_indent -= COL;
                     ctx.indent_level--;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1309,7 +1309,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                     dump_indent -= COL;
                     ctx.indent_level--;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1320,7 +1320,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1330,7 +1330,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 break;
 
             case H5T_REFERENCE:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1340,7 +1340,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 ctx.indent_level++;
                 /*  Only Object references supported at this time */
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1349,7 +1349,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1358,7 +1358,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1367,7 +1367,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1380,7 +1380,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /*  <hdf5:EnumType Nelems="ne" > list Name, values of enum */
                 nmembs = H5Tget_nmembers(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1390,7 +1390,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent += COL;
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1399,7 +1399,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 xml_print_enum(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1409,7 +1409,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1419,7 +1419,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 break;
 
             case H5T_VLEN:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1430,7 +1430,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent += COL;
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1443,7 +1443,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1453,7 +1453,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1469,7 +1469,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 super = H5Tget_super(type);
 
                 /* Print lead-in */
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1485,7 +1485,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 /* list of dimensions */
                 ctx.indent_level++;
                 for (i = 0; i < ndims; i++) {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1499,7 +1499,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent += COL;
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1512,7 +1512,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1522,7 +1522,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
                 dump_indent -= COL;
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1536,7 +1536,7 @@ xml_print_datatype(hid_t type, unsigned in_group)
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
             default:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1617,7 +1617,7 @@ xml_dump_datatype(hid_t type)
                    use it's object ref as its name
                  */
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1629,7 +1629,7 @@ xml_dump_datatype(hid_t type)
                 /* pointer to a named datatype already in XML */
                 char *t_objname = xml_escape_the_name(found_obj->objname);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -1642,7 +1642,7 @@ xml_dump_datatype(hid_t type)
             free(dtxid);
         }
         else {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1652,7 +1652,7 @@ xml_dump_datatype(hid_t type)
         }
     }
     else {
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1665,7 +1665,7 @@ xml_dump_datatype(hid_t type)
         ctx.indent_level--;
         dump_indent -= COL;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1729,7 +1729,7 @@ xml_dump_dataspace(hid_t space)
 
     ctx.indent_level++;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1742,7 +1742,7 @@ xml_dump_dataspace(hid_t space)
         case H5S_SCALAR:
             /* scalar dataspace (just a tag, no XML attrs. defined */
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1755,7 +1755,7 @@ xml_dump_dataspace(hid_t space)
             /* simple dataspace */
             /* <hdf5:SimpleDataspace Ndims="nd"> */
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1767,7 +1767,7 @@ xml_dump_dataspace(hid_t space)
             ctx.indent_level++;
             for (i = 0; i < ndims; i++) {
                 if (maxsize[i] == H5S_UNLIMITED) {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1778,7 +1778,7 @@ xml_dump_dataspace(hid_t space)
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 }
                 else if (maxsize[i] == (hsize_t)0) {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1789,7 +1789,7 @@ xml_dump_dataspace(hid_t space)
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 }
                 else {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -1802,7 +1802,7 @@ xml_dump_dataspace(hid_t space)
             }
             ctx.indent_level--;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1816,7 +1816,7 @@ xml_dump_dataspace(hid_t space)
         case H5S_NULL:
             /* null dataspace (just a tag, no XML attrs. defined */
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
             h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1829,7 +1829,7 @@ xml_dump_dataspace(hid_t space)
         case H5S_NULL:
         case H5S_NO_CLASS:
         default:
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -1840,7 +1840,7 @@ xml_dump_dataspace(hid_t space)
 
     ctx.indent_level--;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1904,7 +1904,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
     string_dataformat.arr_pre       = "";
     outputformat                    = &string_dataformat;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1914,7 +1914,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
 
     ctx.indent_level++;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -1936,7 +1936,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
         else {
             h5tools_context_t datactx;
             memset(&datactx, 0, sizeof(datactx));
-            datactx.need_prefix  = TRUE;
+            datactx.need_prefix  = true;
             datactx.indent_level = ctx.indent_level;
             datactx.cur_column   = ctx.cur_column;
             status               = h5tools_dump_dset(rawoutstream, outputformat, &datactx, obj_id);
@@ -1966,7 +1966,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
             else {
                 h5tools_context_t datactx;
                 memset(&datactx, 0, sizeof(datactx));
-                datactx.need_prefix  = TRUE;
+                datactx.need_prefix  = true;
                 datactx.indent_level = ctx.indent_level;
                 datactx.cur_column   = ctx.cur_column;
                 status               = h5tools_dump_mem(rawoutstream, outputformat, &datactx, obj_id);
@@ -1980,7 +1980,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
     if (status == FAIL) {
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -1997,7 +1997,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
 
     ctx.indent_level++;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2007,7 +2007,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset,
 
     ctx.indent_level--;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2067,7 +2067,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
     string_dataformat.do_escape = dump_opts.display_escape;
     outputformat                = &string_dataformat;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2103,7 +2103,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     ctx.indent_level++;
                     dump_indent += COL;
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2111,7 +2111,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2119,7 +2119,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2127,7 +2127,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2135,7 +2135,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2148,7 +2148,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     break;
 
                 case H5T_COMPOUND:
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2159,7 +2159,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     break;
 
                 case H5T_REFERENCE:
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2167,7 +2167,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                     if (!H5Tequal(type, H5T_STD_REF_OBJ)) {
-                        ctx.need_prefix = TRUE;
+                        ctx.need_prefix = true;
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -2175,7 +2175,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                        ctx.need_prefix = TRUE;
+                        ctx.need_prefix = true;
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -2184,7 +2184,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                     }
                     else {
-                        ctx.need_prefix = TRUE;
+                        ctx.need_prefix = true;
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -2194,7 +2194,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
                         xml_print_refs(attr_id, ATTRIBUTE_DATA);
 
-                        ctx.need_prefix = TRUE;
+                        ctx.need_prefix = true;
 
                         /* Render the element */
                         h5tools_str_reset(&buffer);
@@ -2203,7 +2203,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                     }
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2213,7 +2213,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     break;
 
                 case H5T_VLEN:
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2226,7 +2226,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                 case H5T_NO_CLASS:
                 case H5T_NCLASSES:
                 default:
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2234,7 +2234,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2242,7 +2242,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2250,7 +2250,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2263,7 +2263,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         else {
             /* The case of an attribute never yet written ??
              * Or dataspace is H5S_NULL. */
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2273,7 +2273,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             ctx.indent_level++;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2283,7 +2283,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
             ctx.indent_level--;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -2298,7 +2298,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         H5Sclose(space);
         H5Aclose(attr_id);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2313,7 +2313,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
         /* ?? failed */
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2323,7 +2323,7 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED
 
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2362,7 +2362,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
     char             *t_prefix  = NULL;
     char             *t_name    = NULL;
 
-    tmp = (char *)malloc(HDstrlen(prefix) + HDstrlen(name) + 2);
+    tmp = (char *)malloc(strlen(prefix) + strlen(name) + 2);
     if (tmp == NULL) {
         indentation(dump_indent);
         error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
@@ -2370,9 +2370,9 @@ xml_dump_named_datatype(hid_t type, const char *name)
         goto done;
     }
 
-    HDstrcpy(tmp, prefix);
-    HDstrcat(tmp, "/");
-    HDstrcat(tmp, name);
+    strcpy(tmp, prefix);
+    strcat(tmp, "/");
+    strcat(tmp, name);
 
     /* setup */
     memset(&buffer, 0, sizeof(h5tools_str_t));
@@ -2406,7 +2406,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
     xml_name_to_XID(type, tmp, dtxid, 100, 1);
     xml_name_to_XID(type, prefix, parentxid, 100, 1);
-    if (HDstrncmp(name, "#", (size_t)1) == 0) {
+    if (strncmp(name, "#", (size_t)1) == 0) {
         /*  Special:  this is an 'anonymous' NDT, deleted but
            still in use.
            We follow the dumper's undocumented practice, and
@@ -2416,21 +2416,21 @@ xml_dump_named_datatype(hid_t type, const char *name)
            the future.
          */
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer,
                            "<%sNamedDataType Name=\"%s\" OBJ-XID=\"%s\" "
                            "Parents=\"%s\" H5ParentPaths=\"%s\">",
-                           xmlnsprefix, name, dtxid, parentxid, HDstrcmp(prefix, "") ? t_prefix : "/");
+                           xmlnsprefix, name, dtxid, parentxid, strcmp(prefix, "") ? t_prefix : "/");
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
     }
     else {
         H5O_info2_t oinfo; /* Object info */
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2438,7 +2438,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
                            "<%sNamedDataType Name=\"%s\" OBJ-XID=\"%s\" "
                            "H5Path=\"%s\" Parents=\"%s\" H5ParentPaths=\"%s\">",
                            xmlnsprefix, t_name, dtxid, t_tmp, parentxid,
-                           (HDstrcmp(prefix, "") ? t_prefix : "/"));
+                           (strcmp(prefix, "") ? t_prefix : "/"));
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
@@ -2467,7 +2467,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
                 xml_name_to_XID(type, found_obj->objname, pointerxid, (int)sizeof(pointerxid), 1);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2478,7 +2478,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
 
                 ctx.indent_level--;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -2489,14 +2489,14 @@ xml_dump_named_datatype(hid_t type, const char *name)
                 goto done;
             }
             else
-                found_obj->displayed = TRUE;
+                found_obj->displayed = true;
         }
     }
 
     ctx.indent_level++;
     dump_indent += COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2510,7 +2510,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
     ctx.indent_level--;
     dump_indent -= COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2521,7 +2521,7 @@ xml_dump_named_datatype(hid_t type, const char *name)
     ctx.indent_level--;
     dump_indent -= COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -2617,12 +2617,12 @@ xml_dump_group(hid_t gid, const char *name)
     string_dataformat.do_escape = dump_opts.display_escape;
     outputformat                = &string_dataformat;
 
-    if (HDstrcmp(name, "/") == 0) {
+    if (strcmp(name, "/") == 0) {
         isRoot = 1;
-        tmp    = HDstrdup("/");
+        tmp    = strdup("/");
     }
     else {
-        tmp = (char *)malloc(HDstrlen(prefix) + HDstrlen(name) + 2);
+        tmp = (char *)malloc(strlen(prefix) + strlen(name) + 2);
         if (tmp == NULL) {
             indentation(dump_indent);
             error_msg("internal error (file %s:line %d)\n", __FILE__, __LINE__);
@@ -2630,11 +2630,11 @@ xml_dump_group(hid_t gid, const char *name)
             return;
         }
 
-        HDstrcpy(tmp, prefix);
-        par = HDstrdup(tmp);
-        cp  = HDstrrchr(par, '/');
+        strcpy(tmp, prefix);
+        par = strdup(tmp);
+        cp  = strrchr(par, '/');
         if (cp) {
-            if ((cp == par) && HDstrlen(par) > 1)
+            if ((cp == par) && strlen(par) > 1)
                 *(cp + 1) = '\0';
             else
                 *cp = '\0';
@@ -2667,7 +2667,7 @@ xml_dump_group(hid_t gid, const char *name)
                     /* probably can't happen! */
                     xml_name_to_XID(gid, "/", grpxid, 100, 1);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2682,7 +2682,7 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(gid, tmp, grpxid, 100, 1);
                     xml_name_to_XID(gid, par, parentxid, 100, 1);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2703,7 +2703,7 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(gid, found_obj->objname, ptrstr, 100, 1);
                     xml_name_to_XID(gid, par, parentxid, 100, 1);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2727,7 +2727,7 @@ xml_dump_group(hid_t gid, const char *name)
                 if (isRoot) {
                     xml_name_to_XID(gid, "/", grpxid, 100, 1);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2743,7 +2743,7 @@ xml_dump_group(hid_t gid, const char *name)
                     xml_name_to_XID(gid, tmp, grpxid, 100, 1);
                     xml_name_to_XID(gid, par, parentxid, 100, 1);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -2757,7 +2757,7 @@ xml_dump_group(hid_t gid, const char *name)
                     free(t_tmp);
                     free(par_name);
                 }
-                found_obj->displayed = TRUE;
+                found_obj->displayed = true;
 
                 /* 1.  do all the attributes of the group */
 
@@ -2791,7 +2791,7 @@ xml_dump_group(hid_t gid, const char *name)
                             type = H5Dget_type(dset);
 
                             H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
-                            HDsnprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
+                            snprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
                             H5free_memory(obj_tok_str);
 
                             dump_function_table->dump_named_datatype_function(type, type_name);
@@ -2822,7 +2822,7 @@ xml_dump_group(hid_t gid, const char *name)
         char *grpxid    = (char *)malloc((size_t)100);
         char *parentxid = (char *)malloc((size_t)100);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -2884,7 +2884,7 @@ xml_dump_group(hid_t gid, const char *name)
                     type = H5Dget_type(dset);
 
                     H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
-                    HDsnprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
+                    snprintf(type_name, sizeof(type_name), "#%s", obj_tok_str);
                     H5free_memory(obj_tok_str);
 
                     dump_function_table->dump_named_datatype_function(type, type_name);
@@ -2905,7 +2905,7 @@ xml_dump_group(hid_t gid, const char *name)
         ctx.indent_level--;
     }
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3026,7 +3026,7 @@ xml_print_refs(hid_t did, int source)
         ctx.indent_level++;
 
         if (!path) {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3037,7 +3037,7 @@ xml_print_refs(hid_t did, int source)
         else {
             char *t_path = xml_escape_the_string(path, -1);
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3089,7 +3089,7 @@ xml_print_strs(hid_t did, int source)
     hid_t             type     = H5I_INVALID_HID;
     hid_t             space    = H5I_INVALID_HID;
     hssize_t          ssiz     = -1;
-    htri_t            is_vlstr = FALSE;
+    htri_t            is_vlstr = false;
     size_t            tsiz     = 0;
     hsize_t           i;
     size_t            str_size  = 0;
@@ -3181,15 +3181,15 @@ xml_print_strs(hid_t did, int source)
         if (is_vlstr) {
             onestring = *(char **)((void *)bp);
             if (onestring)
-                str_size = HDstrlen(onestring);
+                str_size = strlen(onestring);
         }
         else {
-            HDstrncpy(onestring, bp, tsiz);
+            strncpy(onestring, bp, tsiz);
             str_size = tsiz;
         }
 
         if (!onestring) {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3200,7 +3200,7 @@ xml_print_strs(hid_t did, int source)
         else {
             char *t_onestring = xml_escape_the_string(onestring, (int)str_size);
             if (t_onestring) {
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
@@ -3300,7 +3300,7 @@ check_filters(hid_t dcpl)
                                 namebuf, NULL);
         if (filter == H5Z_FILTER_DEFLATE) {
             ctx.indent_level++;
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3319,7 +3319,7 @@ check_filters(hid_t dcpl)
         }
         else if (filter == H5Z_FILTER_FLETCHER32) {
             ctx.indent_level++;
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3330,7 +3330,7 @@ check_filters(hid_t dcpl)
         }
         else if (filter == H5Z_FILTER_SHUFFLE) {
             ctx.indent_level++;
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3342,7 +3342,7 @@ check_filters(hid_t dcpl)
         else if (filter == H5Z_FILTER_SZIP) {
             ctx.indent_level++;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3436,7 +3436,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     ctx.indent_level++;
     dump_indent += COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3454,7 +3454,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     if (H5Tget_class(type) == H5T_REFERENCE) {
         const char *path = lookup_ref_path(*(H5R_ref_t *)buf);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3462,7 +3462,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         if (!path) {
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3473,7 +3473,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         else {
             char *t_path = xml_escape_the_string(path, -1);
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3483,7 +3483,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             free(t_path);
         }
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3495,7 +3495,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     }
     else if (H5Tget_class(type) == H5T_STRING) {
         /* ????? */
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3503,7 +3503,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3515,7 +3515,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
         /* all other data */
         switch (H5Tget_class(type)) {
             case H5T_INTEGER:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3523,7 +3523,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
@@ -3532,7 +3532,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3541,7 +3541,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_FLOAT:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3549,7 +3549,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
@@ -3558,7 +3558,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3568,7 +3568,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 break;
             case H5T_BITFIELD:
             case H5T_OPAQUE:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3577,7 +3577,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 sz = H5Tget_size(type);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
@@ -3593,7 +3593,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3602,7 +3602,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_ENUM:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3611,7 +3611,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 name = H5Tget_member_name(type, *(unsigned *)buf);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
                 h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
                 /* Render the element */
@@ -3621,7 +3621,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 if (name)
                     H5free_memory(name);
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3630,7 +3630,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_ARRAY:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3638,7 +3638,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3647,7 +3647,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_TIME:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3655,7 +3655,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3664,7 +3664,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_COMPOUND:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3672,7 +3672,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3681,7 +3681,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 break;
             case H5T_VLEN:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3689,7 +3689,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3702,7 +3702,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
             case H5T_STRING:
             case H5T_REFERENCE:
             default:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3710,7 +3710,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3724,7 +3724,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type)
     ctx.indent_level--;
     dump_indent -= COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3773,7 +3773,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     char *rstr = (char *)malloc((size_t)100);
     char *pstr = (char *)malloc((size_t)100);
 
-    tmp = (char *)malloc(HDstrlen(prefix) + HDstrlen(name) + 2);
+    tmp = (char *)malloc(strlen(prefix) + strlen(name) + 2);
     if (tmp == NULL) {
         error_msg("buffer allocation failed\n");
         h5tools_setstatus(EXIT_FAILURE);
@@ -3782,9 +3782,9 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
         return;
     }
 
-    HDstrcpy(tmp, prefix);
-    HDstrcat(tmp, "/");
-    HDstrcat(tmp, name);
+    strcpy(tmp, prefix);
+    strcat(tmp, "/");
+    strcat(tmp, name);
 
     /* setup */
     memset(&buffer, 0, sizeof(h5tools_str_t));
@@ -3817,7 +3817,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     xml_name_to_XID(did, tmp, rstr, 100, 1);
     xml_name_to_XID(did, prefix, pstr, 100, 1);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -3852,7 +3852,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             ctx.indent_level++;
             dump_indent += COL;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3862,7 +3862,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             ctx.indent_level++;
             dump_indent += COL;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3877,7 +3877,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
 
             for (i = 0; i < ndims; i++) {
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -3887,7 +3887,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
             }
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3901,7 +3901,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             ctx.indent_level--;
             dump_indent -= COL;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3912,7 +3912,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             ctx.indent_level--;
             dump_indent -= COL;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3922,7 +3922,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             ctx.indent_level--;
             dump_indent -= COL;
 
-            ctx.need_prefix = TRUE;
+            ctx.need_prefix = true;
 
             /* Render the element */
             h5tools_str_reset(&buffer);
@@ -3937,7 +3937,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     else if (H5D_CONTIGUOUS == H5Pget_layout(dcpl)) {
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3946,7 +3946,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3955,7 +3955,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3967,7 +3967,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     else if (H5D_COMPACT == H5Pget_layout(dcpl)) {
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3976,7 +3976,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -3985,7 +3985,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4001,7 +4001,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     ctx.indent_level++;
     dump_indent += COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4050,7 +4050,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     ctx.indent_level++;
     dump_indent += COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4063,7 +4063,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
         (fvstatus == H5D_FILL_VALUE_DEFAULT && ft == H5D_FILL_TIME_IFSET)) {
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4076,7 +4076,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
         xml_dump_fill_value(dcpl, type);
     }
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4087,7 +4087,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     ctx.indent_level--;
     dump_indent -= COL;
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4142,7 +4142,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             case H5T_TIME:
                 ctx.indent_level++;
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4150,7 +4150,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4158,7 +4158,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4166,7 +4166,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4178,7 +4178,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 break;
 
             case H5T_COMPOUND:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4194,7 +4194,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 break;
 
             case H5T_REFERENCE:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4202,7 +4202,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 if (!H5Tequal(type, H5T_STD_REF_OBJ)) {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -4210,7 +4210,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                     h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -4219,7 +4219,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 }
                 else {
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -4229,7 +4229,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
 
                     xml_print_refs(did, DATASET_DATA);
 
-                    ctx.need_prefix = TRUE;
+                    ctx.need_prefix = true;
 
                     /* Render the element */
                     h5tools_str_reset(&buffer);
@@ -4238,7 +4238,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                            (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
                 }
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4250,7 +4250,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             case H5T_VLEN:
                 ctx.indent_level--;
                 dump_indent -= COL;
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4269,7 +4269,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
             case H5T_NO_CLASS:
             case H5T_NCLASSES:
             default:
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4277,7 +4277,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4285,7 +4285,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4293,7 +4293,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                 h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                        (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-                ctx.need_prefix = TRUE;
+                ctx.need_prefix = true;
 
                 /* Render the element */
                 h5tools_str_reset(&buffer);
@@ -4307,7 +4307,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
         /* no data written */
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4316,7 +4316,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level++;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4325,7 +4325,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4339,7 +4339,7 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss
     H5Sclose(space);
     H5Pclose(dcpl);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4404,7 +4404,7 @@ xml_print_enum(hid_t type)
     nmembs = (unsigned)H5Tget_nmembers(type);
     super  = H5Tget_super(type);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4414,7 +4414,7 @@ xml_print_enum(hid_t type)
 
     xml_print_datatype(super, 0);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
 
     /* Render the element */
     h5tools_str_reset(&buffer);
@@ -4465,7 +4465,7 @@ xml_print_enum(hid_t type)
     for (i = 0; i < nmembs; i++) {
         char *t_name = xml_escape_the_name(name[i]);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4473,7 +4473,7 @@ xml_print_enum(hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level++;
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
@@ -4484,7 +4484,7 @@ xml_print_enum(hid_t type)
         free(t_name);
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4492,7 +4492,7 @@ xml_print_enum(hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
@@ -4500,7 +4500,7 @@ xml_print_enum(hid_t type)
         h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos,
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level++;
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
         h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0);
 
         /* Render the element */
@@ -4527,7 +4527,7 @@ xml_print_enum(hid_t type)
                                (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0);
         ctx.indent_level--;
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         /* Render the element */
         h5tools_str_reset(&buffer);
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 96aab9b..0ac4f3a 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -25,8 +25,8 @@
 
 static char *fname_g   = NULL;
 static char *dname_g   = NULL;
-static int   dset_g    = FALSE;
-static int   noop_g    = FALSE;
+static int   dset_g    = false;
+static int   noop_g    = false;
 static int   verbose_g = 0;
 
 /*
@@ -114,23 +114,23 @@ parse_command_line(int argc, const char *const *argv)
                 goto error;
 
             case 'v':
-                verbose_g = TRUE;
+                verbose_g = true;
                 break;
 
             case 'd': /* -d dname */
                 if (H5_optarg != NULL && *H5_optarg)
-                    dname_g = HDstrdup(H5_optarg);
+                    dname_g = strdup(H5_optarg);
                 if (dname_g == NULL) {
                     h5tools_setstatus(EXIT_FAILURE);
                     error_msg("No dataset name `%s`\n", H5_optarg);
                     usage(h5tools_getprogname());
                     goto error;
                 }
-                dset_g = TRUE;
+                dset_g = true;
                 break;
 
             case 'n': /* -n */
-                noop_g = TRUE;
+                noop_g = true;
                 break;
 
             case 'E':
@@ -152,7 +152,7 @@ parse_command_line(int argc, const char *const *argv)
         goto error;
     }
 
-    fname_g = HDstrdup(argv[H5_optind]);
+    fname_g = strdup(argv[H5_optind]);
 
     return 0;
 
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
     h5tools_error_report();
 
     /* Open the HDF5 file */
-    if ((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0)) < 0) {
+    if ((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, false, NULL, 0)) < 0) {
         error_msg("unable to open file \"%s\"\n", fname_g);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -416,7 +416,7 @@ main(int argc, char *argv[])
     else { /* Convert all datasets in the file */
         if (verbose_g)
             fprintf(stdout, "Processing all datasets in the file...\n");
-        if (h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
+        if (h5trav_visit(fid, "/", true, true, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
             goto done;
     } /* end else */
 
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 2a89bcc..2d3574a 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -73,7 +73,7 @@ int
 main(int argc, char *argv[])
 {
     struct Options *opt;
-    int             outfile_named = FALSE;
+    int             outfile_named = false;
     int             token;
     int             i;
     int             state = 0;
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
     if ((opt = (struct Options *)calloc(1, sizeof(struct Options))) == NULL)
         goto err;
 
-    if (argv[1] && (HDstrcmp("-V", argv[1]) == 0)) {
+    if (argv[1] && (strcmp("-V", argv[1]) == 0)) {
         print_version(PROGRAMNAME);
         exit(EXIT_SUCCESS);
     }
@@ -133,7 +133,7 @@ main(int argc, char *argv[])
 
             case 1: /* counting input files */
                 if (opt->fcount < 29) {
-                    (void)HDstrcpy(opt->infiles[opt->fcount].datafile, argv[i]);
+                    (void)strcpy(opt->infiles[opt->fcount].datafile, argv[i]);
                     in                               = &(opt->infiles[opt->fcount].in);
                     opt->infiles[opt->fcount].config = 0;
                     setDefaultValues(in, opt->fcount);
@@ -150,7 +150,7 @@ main(int argc, char *argv[])
                 break;
 
             case 3: /* get configfile name */
-                (void)HDstrcpy(opt->infiles[opt->fcount - 1].configfile, argv[i]);
+                (void)strcpy(opt->infiles[opt->fcount - 1].configfile, argv[i]);
                 opt->infiles[opt->fcount - 1].config = 1;
                 break;
 
@@ -158,12 +158,12 @@ main(int argc, char *argv[])
                 break;
 
             case 5: /* get outfile found */
-                if (HDstrlen(argv[i]) > MAX_PATH_NAME_LENGTH) {
+                if (strlen(argv[i]) > MAX_PATH_NAME_LENGTH) {
                     (void)fprintf(stderr, err10, argv[i]);
                     goto err;
                 }
-                (void)HDstrcpy(opt->outfile, argv[i]);
-                outfile_named = TRUE;
+                (void)strcpy(opt->outfile, argv[i]);
+                outfile_named = true;
                 break;
 
             case 6: /* -h found; help, then exit */
@@ -228,7 +228,7 @@ main(int argc, char *argv[])
         }
     }
 
-    if (FALSE == outfile_named) {
+    if (false == outfile_named) {
         (void)fprintf(stderr, "%s", err3);
         usage(argv[0]);
         goto err;
@@ -287,40 +287,40 @@ gtoken(char *s)
      * identify the token type
      */
     if (s[0] == '-') { /* option name (or negative number) */
-        len = HDstrlen(&s[1]);
+        len = strlen(&s[1]);
         switch (s[1]) {
             case 'o':
-                if (!HDstrncmp("outfile", &s[1], len))
+                if (!strncmp("outfile", &s[1], len))
                     token = OPT_o;
                 break;
 
             case 'c':
-                if (!HDstrncmp("config", &s[1], len))
+                if (!strncmp("config", &s[1], len))
                     token = OPT_c;
                 break;
 
             case 'h':
-                if (!HDstrncmp("help", &s[1], len))
+                if (!strncmp("help", &s[1], len))
                     token = OPT_h;
                 break;
 
             case 'd':
-                if (!HDstrncmp("dims", &s[1], len))
+                if (!strncmp("dims", &s[1], len))
                     token = OPT_d;
                 break;
 
             case 'p':
-                if (!HDstrncmp("path", &s[1], len))
+                if (!strncmp("path", &s[1], len))
                     token = OPT_p;
                 break;
 
             case 't':
-                if (!HDstrncmp("type", &s[1], len))
+                if (!strncmp("type", &s[1], len))
                     token = OPT_t;
                 break;
 
             case 's':
-                if (!HDstrncmp("size", &s[1], len))
+                if (!strncmp("size", &s[1], len))
                     token = OPT_s;
                 break;
             default:
@@ -489,7 +489,7 @@ readIntegerData(FILE *strm, struct Input *in)
                 case 0: /* TEXTIN */
                     in08 = (H5DT_INT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
-                        if (HDfscanf(strm, "%hd", &temp16) != 1) {
+                        if (fscanf(strm, "%hd", &temp16) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -521,7 +521,7 @@ readIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in16++) {
-                        if (HDfscanf(strm, "%hd", in16) != 1) {
+                        if (fscanf(strm, "%hd", in16) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -558,7 +558,7 @@ readIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in32++) {
-                        if (HDfscanf(strm, "%d", in32) != 1) {
+                        if (fscanf(strm, "%d", in32) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -594,7 +594,7 @@ readIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 0: /* TEXTIN */
                     for (i = 0; i < len; i++, in64++) {
-                        if (HDfscanf(strm, "%s", buffer) < 1) {
+                        if (fscanf(strm, "%s", buffer) < 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -660,7 +660,7 @@ readUIntegerData(FILE *strm, struct Input *in)
                 case 6: /* TEXTUIN */
                     in08 = (H5DT_UINT8 *)in->data;
                     for (i = 0; i < len; i++, in08++) {
-                        if (HDfscanf(strm, "%hu", &temp16) != 1) {
+                        if (fscanf(strm, "%hu", &temp16) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -689,7 +689,7 @@ readUIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in16++) {
-                        if (HDfscanf(strm, "%hu", in16) != 1) {
+                        if (fscanf(strm, "%hu", in16) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -725,7 +725,7 @@ readUIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in32++) {
-                        if (HDfscanf(strm, "%u", in32) != 1) {
+                        if (fscanf(strm, "%u", in32) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -761,7 +761,7 @@ readUIntegerData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 6: /* TEXTUIN */
                     for (i = 0; i < len; i++, in64++) {
-                        if (HDfscanf(strm, "%s", buffer) < 1) {
+                        if (fscanf(strm, "%s", buffer) < 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -826,7 +826,7 @@ readFloatData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 1: /* TEXTFP */
                     for (i = 0; i < len; i++, fp32++) {
-                        if (HDfscanf(strm, "%f", fp32) != 1) {
+                        if (fscanf(strm, "%f", fp32) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -839,7 +839,7 @@ readFloatData(FILE *strm, struct Input *in)
                 case 2: /*TEXTFPE */
 
                     for (i = 0; i < len; i++, fp32++) {
-                        if (HDfscanf(strm, "%f", fp32) != 1) {
+                        if (fscanf(strm, "%f", fp32) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -878,7 +878,7 @@ readFloatData(FILE *strm, struct Input *in)
             switch (in->inputClass) {
                 case 1: /* TEXTFP */
                     for (i = 0; i < len; i++, fp64++) {
-                        if (HDfscanf(strm, "%lf", fp64) != 1) {
+                        if (fscanf(strm, "%lf", fp64) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -891,7 +891,7 @@ readFloatData(FILE *strm, struct Input *in)
                 case 2: /*TEXTFPE */
 
                     for (i = 0; i < len; i++, fp64++) {
-                        if (HDfscanf(strm, "%lf", fp64) != 1) {
+                        if (fscanf(strm, "%lf", fp64) != 1) {
                             (void)fprintf(stderr, "%s", err1);
                             return (-1);
                         }
@@ -964,7 +964,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id)
      *-------------------------------------------------------------------------
      */
 
-    while (EOF != (c = HDfgetc(strm)))
+    while (EOF != (c = fgetc(strm)))
         if (c == 10) /* eol */
             nlines++;
 
@@ -1029,7 +1029,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id)
 
     line = 0;
 
-    while (EOF != (c = HDfgetc(strm))) {
+    while (EOF != (c = fgetc(strm))) {
         str[i] = (char)c;
 
         i++;
@@ -1162,7 +1162,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
     line = 0;
     j    = 0;
 
-    while (HDfgets(str, sizeof(str), strm)) {
+    while (fgets(str, sizeof(str), strm)) {
         str1 = str;
         str2 = NULL;
         str3 = NULL;
@@ -1173,24 +1173,24 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
         str2 = strchr(str1, '"');
         if (str2 != NULL) {
 #ifdef H5DEBUGIMPORT
-            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", strlen(str2), str2);
 #endif
             str2++;
 #ifdef H5DEBUGIMPORT
-            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+            printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", strlen(str2), str2);
 #endif
             str3 = strrchr(str2, '"');
             if (str3 != NULL) {
 #ifdef H5DEBUGIMPORT
-                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str3), str3);
+                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", strlen(str3), str3);
 #endif
                 *str3 = '\0';
 
 #ifdef H5DEBUGIMPORT
-                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2);
+                printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", strlen(str2), str2);
 #endif
 
-                if (HDstrlen(str2) > 0) {
+                if (strlen(str2) > 0) {
                     hid_t   fspace_id;
                     hsize_t start[1];
                     hsize_t count[1] = {1};
@@ -1461,18 +1461,18 @@ processConfigurationFile(char *infile, struct Input *in)
         goto error;
     }
 
-    scanret = HDfscanf(strm, "%254s", key);
-    if ((scanret == 1) && !HDstrcmp("HDF5", key)) {
+    scanret = fscanf(strm, "%254s", key);
+    if ((scanret == 1) && !strcmp("HDF5", key)) {
 #ifdef H5DEBUGIMPORT
         int pndx;
         printf("\nh5dump file\n");
 #endif
         in->h5dumpInput = 1;
-        scanret         = HDfscanf(strm, "%254s", temp); /* filename */
-        scanret         = HDfscanf(strm, "%254s", temp); /* start bracket */
-        scanret         = HDfscanf(strm, "%254s", key);  /* DATASET */
+        scanret         = fscanf(strm, "%254s", temp); /* filename */
+        scanret         = fscanf(strm, "%254s", temp); /* start bracket */
+        scanret         = fscanf(strm, "%254s", key);  /* DATASET */
         while (scanret == 1) {
-            if (!HDstrcmp("DATASET", key)) { /* PATH */
+            if (!strcmp("DATASET", key)) { /* PATH */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATASET key\n");
 #endif
@@ -1480,7 +1480,7 @@ processConfigurationFile(char *infile, struct Input *in)
                     (void)fprintf(stderr, err3a, infile);
                     goto error;
                 }
-                if (HDfscanf(strm, "%254s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1492,12 +1492,12 @@ processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
                 in->configOptionVector[PATH] = 1;
-                scanret                      = HDfscanf(strm, "%254s", temp); /* start bracket */
+                scanret                      = fscanf(strm, "%254s", temp); /* start bracket */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATASET %s found\n", temp);
 #endif
-            }                                      /* if(!HDstrcmp("DATASET", key))  PATH */
-            else if (!HDstrcmp("DATATYPE", key)) { /* INPUT-CLASS */
+            }                                    /* if(!strcmp("DATASET", key))  PATH */
+            else if (!strcmp("DATATYPE", key)) { /* INPUT-CLASS */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATATYPE key\n");
 #endif
@@ -1506,7 +1506,7 @@ processConfigurationFile(char *infile, struct Input *in)
                     goto error;
                 }
 
-                if (HDfscanf(strm, "%254s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1542,27 +1542,27 @@ processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATATYPE STRING found\n");
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* string properties */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* string properties */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
                     while (get_next_prop) {
-                        if (!HDstrcmp("STRSIZE", temp)) { /* STRSIZE */
-                            if (HDfscanf(strm, "%254s", temp) != 1) {
+                        if (!strcmp("STRSIZE", temp)) { /* STRSIZE */
+                            if (fscanf(strm, "%254s", temp) != 1) {
                                 (void)fprintf(stderr, "%s", err19);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
                             printf("h5dump DATATYPE STRING STRSIZE %s found\n", temp);
 #endif
-                            if (HDstrcmp("H5T_VARIABLE;", temp) != 0) {
+                            if (strcmp("H5T_VARIABLE;", temp) != 0) {
                                 char *more = temp;
                                 ival       = (int)strtol(more, &more, 10);
                                 if (getInputSize(in, ival) == -1) {
@@ -1574,8 +1574,8 @@ processConfigurationFile(char *infile, struct Input *in)
 #endif
                             }
                         }
-                        else if (!HDstrcmp("STRPAD", temp)) {         /* STRPAD */
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* STRPAD type */
+                        else if (!strcmp("STRPAD", temp)) {         /* STRPAD */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* STRPAD type */
                                 (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1583,8 +1583,8 @@ processConfigurationFile(char *infile, struct Input *in)
                             printf("h5dump DATATYPE STRING STRPAD %s found\n", temp);
 #endif
                         }
-                        else if (!HDstrcmp("CSET", key)) {            /* CSET */
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* CSET type */
+                        else if (!strcmp("CSET", key)) {            /* CSET */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CSET type */
                                 (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
@@ -1592,69 +1592,69 @@ processConfigurationFile(char *infile, struct Input *in)
                             printf("h5dump DATATYPE STRING CSET %s found\n", temp);
 #endif
                         }
-                        else if (!HDstrcmp("CTYPE", temp)) {          /* CTYPE */
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* CTYPE type */
+                        else if (!strcmp("CTYPE", temp)) {          /* CTYPE */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* CTYPE type */
                                 (void)fprintf(stderr, "%s", err18);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
                             printf("h5dump DATATYPE STRING  CTYPE %s found\n", temp);
 #endif
-                        } /* if(!HDstrcmp("CSET", key)) */
-                        if (HDfscanf(strm, "%254s", temp) != 1) {
+                        } /* if(!strcmp("CSET", key)) */
+                        if (fscanf(strm, "%254s", temp) != 1) {
                             (void)fprintf(stderr, "%s", err18);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
                         printf("h5dump DATATYPE STRING %s found\n", temp);
 #endif
-                        if (!HDstrcmp("}", temp)) { /* end bracket */
+                        if (!strcmp("}", temp)) { /* end bracket */
                             get_next_prop = 0;
                         }
-                    }                               /* while (get_next_prop) */
-                }                                   /* if(kindex == 5)  STRING */
-            }                                       /* else if(!HDstrcmp("DATATYPE", key))  INPUT-CLASS */
-            else if (!HDstrcmp("DATASPACE", key)) { /* RANK and DIMENSIONS */
+                    }                             /* while (get_next_prop) */
+                }                                 /* if(kindex == 5)  STRING */
+            }                                     /* else if(!strcmp("DATATYPE", key))  INPUT-CLASS */
+            else if (!strcmp("DATASPACE", key)) { /* RANK and DIMENSIONS */
                 hsize_t temp_dims[MAX_NUM_DIMENSION];
 
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATASPACE key\n");
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
-                if (!HDstrcmp("SCALAR", temp)) { /* SCALAR */
+                if (!strcmp("SCALAR", temp)) { /* SCALAR */
                     in->rank = 0;
-                }                                   /* if(!HDstrcmp("SCALAR", key)) */
-                else if (!HDstrcmp("NULL", temp)) { /* NULL */
+                }                                 /* if(!strcmp("SCALAR", key)) */
+                else if (!strcmp("NULL", temp)) { /* NULL */
                     (void)fprintf(stderr, err6b, infile);
                     goto error;
-                }                                     /* else if(!HDstrcmp("NULL", key)) */
-                else if (!HDstrcmp("SIMPLE", temp)) { /* SIMPLE */
+                }                                   /* else if(!strcmp("NULL", key)) */
+                else if (!strcmp("SIMPLE", temp)) { /* SIMPLE */
                     int icount = 0;
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATASPACE SIMPLE found\n");
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                         (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    if (!HDstrcmp("(", temp)) { /* start paren */
+                    if (!strcmp("(", temp)) { /* start paren */
                         int get_next_dim = 1;
                         int i            = 0;
 
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1664,14 +1664,14 @@ processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more        = temp;
                             temp_dims[icount] = strtoull(more, &more, 10);
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void)fprintf(stderr, err6b, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
                             printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                            if (!HDstrcmp(")", temp)) { /* end paren */
+                            if (!strcmp(")", temp)) { /* end paren */
                                 in->rank                     = ++icount;
                                 in->configOptionVector[RANK] = 1;
                                 get_next_dim                 = 0;
@@ -1703,38 +1703,38 @@ processConfigurationFile(char *infile, struct Input *in)
                         printf("\n");
 #endif
                         in->configOptionVector[DIM] = 1;
-                    } /* if(!HDstrcmp("(", key))  start paren */
+                    } /* if(!strcmp("(", key))  start paren */
                     else {
                         (void)fprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (HDfscanf(strm, "%254s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    if (!HDstrcmp("/", temp)) { /* / max dims */
+                    if (!strcmp("/", temp)) { /* / max dims */
                         if ((in->maxsizeOfDimension =
                                  (hsize_t *)malloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
                             goto error;
                         }
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
                         printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                        if (!HDstrcmp("(", temp)) { /* start paren */
+                        if (!strcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
 #ifdef H5DEBUGIMPORT
                             printf("h5dump DATASPACE SIMPLE process max dim values\n");
 #endif
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */
                                 (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -1745,8 +1745,8 @@ processConfigurationFile(char *infile, struct Input *in)
 #ifdef H5DEBUGIMPORT
                                 printf("h5dump DATASPACE SIMPLE get max dim value\n");
 #endif
-                                if (!HDstrcmp("H5S_UNLIMITED", temp) ||
-                                    !HDstrcmp("H5S_UNLIMITED,", temp)) { /* unlimited */
+                                if (!strcmp("H5S_UNLIMITED", temp) ||
+                                    !strcmp("H5S_UNLIMITED,", temp)) { /* unlimited */
                                     in->maxsizeOfDimension[i]      = H5S_UNLIMITED;
                                     in->configOptionVector[EXTEND] = 1;
                                 }
@@ -1754,14 +1754,14 @@ processConfigurationFile(char *infile, struct Input *in)
                                     char *more                = temp;
                                     in->maxsizeOfDimension[i] = strtoull(more, &more, 10);
                                 }
-                                if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */
                                     (void)fprintf(stderr, err16c, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
                                 printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                                if (!HDstrcmp(")", temp)) { /* end paren */
+                                if (!strcmp(")", temp)) { /* end paren */
                                     get_next_dim = 0;
                                 }
                                 else { /* comma */
@@ -1780,57 +1780,57 @@ processConfigurationFile(char *infile, struct Input *in)
                             printf("\n");
                             printf("h5dump DATASPACE SIMPLE get max dim finished\n");
 #endif
-                        } /* if(!HDstrcmp("(", key))  start paren */
+                        } /* if(!strcmp("(", key))  start paren */
                         else {
                             (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
-                        scanret = HDfscanf(strm, "%254s", temp); /* end bracket */
+                        scanret = fscanf(strm, "%254s", temp); /* end bracket */
 #ifdef H5DEBUGIMPORT
                         printf("h5dump DATASPACE SIMPLE %s found\n", temp);
 #endif
-                    } /* if(!HDstrcmp("/", key)) max dims separator */
-                }     /* else if(!HDstrcmp("SIMPLE", key)) */
+                    } /* if(!strcmp("/", key)) max dims separator */
+                }     /* else if(!strcmp("SIMPLE", key)) */
                 else {
                     (void)fprintf(stderr, err5b, infile);
                     goto error;
                 }
-            } /* else if(!HDstrcmp("DATASPACE", key))  RANK and DIMENSIONS */
-            else if (!HDstrcmp("STORAGE_LAYOUT", key)) { /* CHUNKED-DIMENSION-SIZES */
+            } /* else if(!strcmp("DATASPACE", key))  RANK and DIMENSIONS */
+            else if (!strcmp("STORAGE_LAYOUT", key)) { /* CHUNKED-DIMENSION-SIZES */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump STORAGE_LAYOUT key\n");
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 printf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* CHUNKED */
+                if (fscanf(strm, "%254s", temp) != 1) { /* CHUNKED */
                     (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 printf("h5dump STORAGE_LAYOUT %s found\n", temp);
 #endif
-                if (!HDstrcmp("CHUNKED", temp)) { /* CHUNKED */
+                if (!strcmp("CHUNKED", temp)) { /* CHUNKED */
                     if ((in->sizeOfChunk = (hsize_t *)malloc((size_t)in->rank * sizeof(hsize_t))) == NULL) {
                         (void)fprintf(stderr, "Unable to allocate dynamic memory.\n");
                         goto error;
                     }
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                         (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
-                    if (!HDstrcmp("(", temp)) { /* start paren */
+                    if (!strcmp("(", temp)) { /* start paren */
                         int get_next_dim = 1;
                         int icount       = 0;
 
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                             (void)fprintf(stderr, err16c, infile);
                             goto error;
                         }
@@ -1840,14 +1840,14 @@ processConfigurationFile(char *infile, struct Input *in)
                         while (get_next_dim) {
                             char *more              = temp;
                             in->sizeOfChunk[icount] = strtoull(more, &more, 10);
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                 (void)fprintf(stderr, err6b, infile);
                                 goto error;
                             }
 #ifdef H5DEBUGIMPORT
                             printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
-                            if (!HDstrcmp(")", temp)) { /* end paren */
+                            if (!strcmp(")", temp)) { /* end paren */
                                 in->configOptionVector[RANK] = 1;
                                 get_next_dim                 = 0;
                             }
@@ -1867,20 +1867,20 @@ processConfigurationFile(char *infile, struct Input *in)
                         printf("\n");
 #endif
                         in->configOptionVector[DIM] = 1;
-                    } /* if(!HDstrcmp("(", key))  start paren */
+                    } /* if(!strcmp("(", key))  start paren */
                     else {
                         (void)fprintf(stderr, err5b, infile);
                         goto error;
                     }
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* SIZE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* SIZE */
                         (void)fprintf(stderr, err6b, infile);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp);
 #endif
-                    if (!HDstrcmp("SIZE", temp)) { /* SIZE */
-                        if (HDfscanf(strm, "%d", (&ival)) != 1) {
+                    if (!strcmp("SIZE", temp)) { /* SIZE */
+                        if (fscanf(strm, "%d", (&ival)) != 1) {
                             (void)fprintf(stderr, "%s", err19);
                             goto error;
                         }
@@ -1888,8 +1888,8 @@ processConfigurationFile(char *infile, struct Input *in)
                         printf("h5dump STORAGE_LAYOUT CHUNKED SIZE %d found\n", ival);
 #endif
                     }
-                    while (HDstrcmp("}", temp) != 0) {
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
+                    while (strcmp("}", temp) != 0) {
+                        if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                             (void)fprintf(stderr, "%s", err18);
                             goto error;
                         }
@@ -1898,52 +1898,52 @@ processConfigurationFile(char *infile, struct Input *in)
 #endif
                     }
                     in->configOptionVector[CHUNK] = 1;
-                } /* if(!HDstrcmp("CHUNKED", key))  CHUNKED */
-            }     /* else if(!HDstrcmp("STORAGE_LAYOUT", key))  CHUNKED-DIMENSION-SIZES */
-            else if (!HDstrcmp("FILTERS", key)) { /* FILTERS */
+                } /* if(!strcmp("CHUNKED", key))  CHUNKED */
+            }     /* else if(!strcmp("STORAGE_LAYOUT", key))  CHUNKED-DIMENSION-SIZES */
+            else if (!strcmp("FILTERS", key)) { /* FILTERS */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump FILTERS key\n");
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 printf("h5dump FILTERS %s found\n", temp);
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) {
+                if (fscanf(strm, "%254s", temp) != 1) {
                     (void)fprintf(stderr, err6b, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 printf("h5dump FILTERS %s found\n", temp);
 #endif
-                if (!HDstrcmp("COMPRESSION", temp)) { /* COMPRESSION */
+                if (!strcmp("COMPRESSION", temp)) { /* COMPRESSION */
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS COMPRESSION found\n");
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* DEFLATE */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* DEFLATE */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* bgin bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* bgin bracket */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* LEVEL */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* LEVEL */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS COMPRESSION %s found\n", temp);
 #endif
-                    if (HDfscanf(strm, "%d", (&ival)) != 1) {
+                    if (fscanf(strm, "%d", (&ival)) != 1) {
                         (void)fprintf(stderr, "%s", err19);
                         goto error;
                     }
@@ -1951,7 +1951,7 @@ processConfigurationFile(char *infile, struct Input *in)
                     printf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival);
 #endif
                     in->compressionParam = ival;
-                    if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
+                    if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -1961,19 +1961,19 @@ processConfigurationFile(char *infile, struct Input *in)
                     in->compressionType              = 0; /* ONLY GZIP supported */
                     in->configOptionVector[COMPRESS] = 1;
                 }
-                else if (!HDstrcmp("CONTIGUOUS", temp)) { /* CONTIGUOUS */
+                else if (!strcmp("CONTIGUOUS", temp)) { /* CONTIGUOUS */
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS CONTIGUOUS found\n");
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
-                else if (!HDstrcmp("NONE", temp)) { /* NONE */
+                else if (!strcmp("NONE", temp)) { /* NONE */
 #ifdef H5DEBUGIMPORT
                     printf("h5dump FILTERS NONE found\n");
 #endif
                     in->configOptionVector[COMPRESS] = 0;
                 }
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* end bracket */
                     (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -1981,20 +1981,20 @@ processConfigurationFile(char *infile, struct Input *in)
                 printf("h5dump FILTERS %s found\n", temp);
 #endif
             }
-            else if (!HDstrcmp("SUBSET", key)) { /* reduce dimensions */
+            else if (!strcmp("SUBSET", key)) { /* reduce dimensions */
                 hsize_t temp_dims[MAX_NUM_DIMENSION];
                 int     get_next_prop = 1;
 #ifdef H5DEBUGIMPORT
                 printf("h5dump SUBSET key\n");
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */
+                if (fscanf(strm, "%254s", temp) != 1) { /* start bracket */
                     (void)fprintf(stderr, err20, infile);
                     goto error;
                 }
 #ifdef H5DEBUGIMPORT
                 printf("h5dump SUBSET %s found\n", temp);
 #endif
-                if (HDfscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */
+                if (fscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */
                     (void)fprintf(stderr, "%s", err18);
                     goto error;
                 }
@@ -2002,20 +2002,20 @@ processConfigurationFile(char *infile, struct Input *in)
                 printf("h5dump SUBSET %s found\n", temp);
 #endif
                 while (get_next_prop) {
-                    if (!HDstrcmp("COUNT", temp)) { /* COUNT */
+                    if (!strcmp("COUNT", temp)) { /* COUNT */
                         int icount = 0;
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
                         printf("h5dump SUBSET %s found\n", temp);
 #endif
-                        if (!HDstrcmp("(", temp)) { /* start paren */
+                        if (!strcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2025,14 +2025,14 @@ processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more        = temp;
                                 temp_dims[icount] = strtoull(more, &more, 10);
-                                if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void)fprintf(stderr, err6b, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
                                 printf("h5dump SUBSET COUNT %s found\n", temp);
 #endif
-                                if (!HDstrcmp(");", temp)) { /* end paren */
+                                if (!strcmp(");", temp)) { /* end paren */
                                     in->rank                     = ++icount;
                                     in->configOptionVector[RANK] = 1;
                                     get_next_dim                 = 0;
@@ -2056,22 +2056,22 @@ processConfigurationFile(char *infile, struct Input *in)
                             printf("\n");
 #endif
                             in->configOptionVector[DIM] = 1;
-                        }                           /* if(!HDstrcmp("(", key))  start paren */
-                    }                               /* if(!HDstrcmp("COUNT", temp))  COUNT */
-                    if (!HDstrcmp("BLOCK", temp)) { /* BLOCK */
+                        }                         /* if(!strcmp("(", key))  start paren */
+                    }                             /* if(!strcmp("COUNT", temp))  COUNT */
+                    if (!strcmp("BLOCK", temp)) { /* BLOCK */
                         int icount = 0;
-                        if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */
+                        if (fscanf(strm, "%254s", temp) != 1) { /* start paren */
                             (void)fprintf(stderr, err6b, infile);
                             goto error;
                         }
 #ifdef H5DEBUGIMPORT
                         printf("h5dump SUBSET %s found\n", temp);
 #endif
-                        if (!HDstrcmp("(", temp)) { /* start paren */
+                        if (!strcmp("(", temp)) { /* start paren */
                             int get_next_dim = 1;
                             int i            = 0;
 
-                            if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
+                            if (fscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */
                                 (void)fprintf(stderr, err16c, infile);
                                 goto error;
                             }
@@ -2081,14 +2081,14 @@ processConfigurationFile(char *infile, struct Input *in)
                             while (get_next_dim) {
                                 char *more        = temp;
                                 temp_dims[icount] = strtoull(more, &more, 10);
-                                if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
+                                if (fscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */
                                     (void)fprintf(stderr, err6b, infile);
                                     goto error;
                                 }
 #ifdef H5DEBUGIMPORT
                                 printf("h5dump SUBSET BLOCK %s found\n", temp);
 #endif
-                                if (!HDstrcmp(");", temp)) { /* end paren */
+                                if (!strcmp(");", temp)) { /* end paren */
                                     in->rank                     = ++icount;
                                     in->configOptionVector[RANK] = 1;
                                     get_next_dim                 = 0;
@@ -2112,28 +2112,28 @@ processConfigurationFile(char *infile, struct Input *in)
                             printf("\n");
 #endif
                             in->configOptionVector[DIM] = 1;
-                        } /* if(!HDstrcmp("(", key))  start paren */
-                    }     /* if(!HDstrcmp("BLOCK", temp))  BLOCK */
-                    if (HDfscanf(strm, "%254s", temp) != 1) {
+                        } /* if(!strcmp("(", key))  start paren */
+                    }     /* if(!strcmp("BLOCK", temp))  BLOCK */
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
 #ifdef H5DEBUGIMPORT
                     printf("h5dump SUBSET %s found\n", temp);
 #endif
-                    if (!HDstrcmp("}", temp)) { /* end bracket */
+                    if (!strcmp("}", temp)) { /* end bracket */
                         get_next_prop = 0;
                     }
-                }                              /* while (get_next_prop) */
-            }                                  /* else if(!HDstrcmp("SUBSET", key)) */
-            else if (!HDstrcmp("DATA", key)) { /* FINISHED */
+                }                            /* while (get_next_prop) */
+            }                                /* else if(!strcmp("SUBSET", key)) */
+            else if (!strcmp("DATA", key)) { /* FINISHED */
 #ifdef H5DEBUGIMPORT
                 printf("h5dump DATA key\n");
 #endif
                 scanret = 0;
                 break;
             }
-            scanret = HDfscanf(strm, "%254s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 #ifdef H5DEBUGIMPORT
         printf("h5dump path");
@@ -2174,7 +2174,7 @@ processConfigurationFile(char *infile, struct Input *in)
                         (void)fprintf(stderr, err3a, infile);
                         goto error;
                     }
-                    if (HDfscanf(strm, "%254s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -2191,7 +2191,7 @@ processConfigurationFile(char *infile, struct Input *in)
                         goto error;
                     }
 
-                    if (HDfscanf(strm, "%254s", temp) != 1) {
+                    if (fscanf(strm, "%254s", temp) != 1) {
                         (void)fprintf(stderr, "%s", err18);
                         goto error;
                     }
@@ -2218,7 +2218,7 @@ processConfigurationFile(char *infile, struct Input *in)
                         (void)fprintf(stderr, err5a, infile);
                         goto error;
                     }
-                    if (HDfscanf(strm, "%254d", (&ival)) != 1) {
+                    if (fscanf(strm, "%254d", (&ival)) != 1) {
                         (void)fprintf(stderr, "%s", err19);
                         goto error;
                     }
@@ -2415,7 +2415,7 @@ processConfigurationFile(char *infile, struct Input *in)
                 default:
                     break;
             }
-            scanret = HDfscanf(strm, "%254s", key);
+            scanret = fscanf(strm, "%254s", key);
         }
 
         /*
@@ -2505,7 +2505,7 @@ mapKeywordToIndex(char *key)
     int i;
 
     for (i = 0; i < NUM_KEYS; i++)
-        if (!HDstrcmp(keytable[i], key))
+        if (!strcmp(keytable[i], key))
             return i;
     return -1;
 }
@@ -2518,22 +2518,22 @@ parsePathInfo(struct path_info *path, char *temp)
     int         i    = 0;
     const char *err1 = "Path string larger than MAX_PATH_NAME_LENGTH.\n";
 
-    token = HDstrtok(temp, delimiter);
-    if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) {
+    token = strtok(temp, delimiter);
+    if (strlen(token) >= MAX_PATH_NAME_LENGTH) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
-    HDstrcpy(path->group[i++], token);
+    strcpy(path->group[i++], token);
 
     while (1) {
-        token = HDstrtok(NULL, delimiter);
+        token = strtok(NULL, delimiter);
         if (token == NULL)
             break;
-        if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) {
+        if (strlen(token) >= MAX_PATH_NAME_LENGTH) {
             (void)fprintf(stderr, "%s", err1);
             return (-1);
         }
-        HDstrcpy(path->group[i++], token);
+        strcpy(path->group[i++], token);
     }
     path->count = i;
     return (0);
@@ -2548,12 +2548,12 @@ parseDimensions(struct Input *in, char *strm)
     int         i    = 0;
     const char *err1 = "Unable to allocate dynamic memory.\n";
 
-    HDstrncpy(temp, strm, sizeof(temp));
+    strncpy(temp, strm, sizeof(temp));
     temp[sizeof(temp) - 1] = '\0';
-    HDstrtok(temp, delimiter);
+    strtok(temp, delimiter);
 
     while (1) {
-        token = HDstrtok(NULL, delimiter);
+        token = strtok(NULL, delimiter);
         if (token == NULL)
             break;
         i++;
@@ -2565,12 +2565,12 @@ parseDimensions(struct Input *in, char *strm)
     }
 
     i = 0;
-    HDstrncpy(temp, strm, sizeof(temp));
+    strncpy(temp, strm, sizeof(temp));
     temp[sizeof(temp) - 1]   = '\0';
-    in->sizeOfDimension[i++] = strtoull(HDstrtok(temp, delimiter), NULL, BASE_10);
+    in->sizeOfDimension[i++] = strtoull(strtok(temp, delimiter), NULL, BASE_10);
 
     while (1) {
-        token = HDstrtok(NULL, delimiter);
+        token = strtok(NULL, delimiter);
         if (token == NULL)
             break;
         in->sizeOfDimension[i++] = strtoull(token, NULL, BASE_10);
@@ -2586,7 +2586,7 @@ getOutputClass(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output class.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -2606,7 +2606,7 @@ OutputClassStrToInt(char *temp)
     int  i;
     char classKeywordTable[3][15] = {"IN", "FP", "UIN"};
     for (i = 0; i < 3; i++)
-        if (!HDstrcmp(classKeywordTable[i], temp))
+        if (!strcmp(classKeywordTable[i], temp))
             return i;
 
     return -1;
@@ -2621,7 +2621,7 @@ getOutputSize(struct Input *in, FILE *strm)
     const char *err1                     = "Unable to get integer value.\n";
     const char *err2                     = "Invalid value for output size.\n";
 
-    if (HDfscanf(strm, "%d", (&ival)) != 1) {
+    if (fscanf(strm, "%d", (&ival)) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -2658,7 +2658,7 @@ getInputClassType(struct Input *in, char *buffer)
     const char *err2   = "Invalid value for output architecture.\n";
     const char *err3   = "Invalid value for input byte-order.\n";
 
-    if (!HDstrcmp(buffer, "H5T_STD_I8BE")) {
+    if (!strcmp(buffer, "H5T_STD_I8BE")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2679,7 +2679,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I8LE")) {
+    else if (!strcmp(buffer, "H5T_STD_I8LE")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2700,7 +2700,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I16BE")) {
+    else if (!strcmp(buffer, "H5T_STD_I16BE")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2721,7 +2721,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I16LE")) {
+    else if (!strcmp(buffer, "H5T_STD_I16LE")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2742,7 +2742,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I32BE")) {
+    else if (!strcmp(buffer, "H5T_STD_I32BE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2763,7 +2763,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I32LE")) {
+    else if (!strcmp(buffer, "H5T_STD_I32LE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2784,7 +2784,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I64BE")) {
+    else if (!strcmp(buffer, "H5T_STD_I64BE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2805,7 +2805,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_I64LE")) {
+    else if (!strcmp(buffer, "H5T_STD_I64LE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2826,7 +2826,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U8BE")) {
+    else if (!strcmp(buffer, "H5T_STD_U8BE")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2847,7 +2847,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U8LE")) {
+    else if (!strcmp(buffer, "H5T_STD_U8LE")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2868,7 +2868,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U16BE")) {
+    else if (!strcmp(buffer, "H5T_STD_U16BE")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2889,7 +2889,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U16LE")) {
+    else if (!strcmp(buffer, "H5T_STD_U16LE")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2910,7 +2910,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U32BE")) {
+    else if (!strcmp(buffer, "H5T_STD_U32BE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2931,7 +2931,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U32LE")) {
+    else if (!strcmp(buffer, "H5T_STD_U32LE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2952,7 +2952,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U64BE")) {
+    else if (!strcmp(buffer, "H5T_STD_U64BE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2973,7 +2973,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_U64LE")) {
+    else if (!strcmp(buffer, "H5T_STD_U64LE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -2994,7 +2994,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_SCHAR")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_SCHAR")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3006,7 +3006,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_UCHAR")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_UCHAR")) {
         in->inputSize                      = 8;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3018,7 +3018,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_SHORT")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_SHORT")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3030,7 +3030,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_USHORT")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_USHORT")) {
         in->inputSize                      = 16;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3042,7 +3042,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_INT")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_INT")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3054,7 +3054,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_UINT")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_UINT")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3066,7 +3066,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_LONG")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_LONG")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3078,7 +3078,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_ULONG")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_ULONG")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3090,7 +3090,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_LLONG")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_LLONG")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3102,7 +3102,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 4;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_ULLONG")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_ULLONG")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3114,7 +3114,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 7;
     }
-    else if (!HDstrcmp(buffer, "H5T_IEEE_F32BE")) {
+    else if (!strcmp(buffer, "H5T_IEEE_F32BE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3135,7 +3135,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_IEEE_F32LE")) {
+    else if (!strcmp(buffer, "H5T_IEEE_F32LE")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3156,7 +3156,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_IEEE_F64BE")) {
+    else if (!strcmp(buffer, "H5T_IEEE_F64BE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3177,7 +3177,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_IEEE_F64LE")) {
+    else if (!strcmp(buffer, "H5T_IEEE_F64LE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3198,19 +3198,19 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_VAX_F32")) {
+    else if (!strcmp(buffer, "H5T_VAX_F32")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_VAX_F64")) {
+    else if (!strcmp(buffer, "H5T_VAX_F64")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_FLOAT")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_FLOAT")) {
         in->inputSize                      = 32;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3222,7 +3222,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_DOUBLE")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_DOUBLE")) {
         in->inputSize                      = 64;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3234,7 +3234,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_NATIVE_LDOUBLE")) {
+    else if (!strcmp(buffer, "H5T_NATIVE_LDOUBLE")) {
         in->inputSize                      = H5_SIZEOF_LONG_DOUBLE;
         in->configOptionVector[INPUT_SIZE] = 1;
 
@@ -3246,14 +3246,14 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = 3;
     }
-    else if (!HDstrcmp(buffer, "H5T_TIME: not yet implemented")) {
+    else if (!strcmp(buffer, "H5T_TIME: not yet implemented")) {
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STRING")) {
+    else if (!strcmp(buffer, "H5T_STRING")) {
         kindex = 5;
     }
     /*    case H5T_BITFIELD: */
-    else if (!HDstrcmp(buffer, "H5T_STD_B8BE")) {
+    else if (!strcmp(buffer, "H5T_STD_B8BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3272,7 +3272,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B8LE")) {
+    else if (!strcmp(buffer, "H5T_STD_B8LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3291,7 +3291,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B16BE")) {
+    else if (!strcmp(buffer, "H5T_STD_B16BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3310,7 +3310,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B16LE")) {
+    else if (!strcmp(buffer, "H5T_STD_B16LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3329,7 +3329,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B32BE")) {
+    else if (!strcmp(buffer, "H5T_STD_B32BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3348,7 +3348,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B32LE")) {
+    else if (!strcmp(buffer, "H5T_STD_B32LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3367,7 +3367,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B64BE")) {
+    else if (!strcmp(buffer, "H5T_STD_B64BE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3386,7 +3386,7 @@ getInputClassType(struct Input *in, char *buffer)
 
         kindex = -1;
     }
-    else if (!HDstrcmp(buffer, "H5T_STD_B64LE")) {
+    else if (!strcmp(buffer, "H5T_STD_B64LE")) {
 
         if ((kindex = OutputArchStrToInt("STD")) == -1) {
             (void)fprintf(stderr, "%s", err2);
@@ -3406,27 +3406,27 @@ getInputClassType(struct Input *in, char *buffer)
         kindex = -1;
     }
     /*    case H5T_OPAQUE: */
-    else if (!HDstrcmp(buffer, "H5T_OPAQUE")) {
+    else if (!strcmp(buffer, "H5T_OPAQUE")) {
         kindex = -1;
     }
     /*    case H5T_COMPOUND: */
-    else if (!HDstrcmp(buffer, "H5T_COMPOUND")) {
+    else if (!strcmp(buffer, "H5T_COMPOUND")) {
         kindex = -1;
     }
     /*    case H5T_REFERENCE: */
-    else if (!HDstrcmp(buffer, "H5T_REFERENCE")) {
+    else if (!strcmp(buffer, "H5T_REFERENCE")) {
         kindex = -1;
     }
     /*    case H5T_ENUM: */
-    else if (!HDstrcmp(buffer, "H5T_ENUM")) {
+    else if (!strcmp(buffer, "H5T_ENUM")) {
         kindex = -1;
     }
     /*    case H5T_VLEN: */
-    else if (!HDstrcmp(buffer, "H5T_VLEN")) {
+    else if (!strcmp(buffer, "H5T_VLEN")) {
         kindex = -1;
     }
     /*    case H5T_ARRAY: */
-    else if (!HDstrcmp(buffer, "H5T_ARRAY")) {
+    else if (!strcmp(buffer, "H5T_ARRAY")) {
         kindex = -1;
     }
 
@@ -3454,7 +3454,7 @@ InputClassStrToInt(char *temp)
     int  i;
     char classKeywordTable[8][15] = {"TEXTIN", "TEXTFP", "TEXTFPE", "FP", "IN", "STR", "TEXTUIN", "UIN"};
     for (i = 0; i < 8; i++)
-        if (!HDstrcmp(classKeywordTable[i], temp))
+        if (!strcmp(classKeywordTable[i], temp))
             return i;
     return -1;
 }
@@ -3484,7 +3484,7 @@ getInputByteOrder(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for input byte-order.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3506,7 +3506,7 @@ getRank(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get integer value.\n";
     const char *err2 = "Invalid value for rank.\n";
 
-    if (HDfscanf(strm, "%d", (&ival)) != 1) {
+    if (fscanf(strm, "%d", (&ival)) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3535,7 +3535,7 @@ getDimensionSizes(struct Input *in, FILE *strm)
         return (-1);
     }
 
-    while (HDfscanf(strm, "%llu", (&ullval)) == 1)
+    while (fscanf(strm, "%llu", (&ullval)) == 1)
         in->sizeOfDimension[i++] = ullval;
 
     if (in->rank != i) {
@@ -3561,7 +3561,7 @@ getChunkedDimensionSizes(struct Input *in, FILE *strm)
         return (-1);
     }
 
-    while (HDfscanf(strm, "%llu", (&ullval)) == 1)
+    while (fscanf(strm, "%llu", (&ullval)) == 1)
         in->sizeOfChunk[i++] = ullval;
 
     if (in->rank != i) {
@@ -3594,7 +3594,7 @@ getMaximumDimensionSizes(struct Input *in, FILE *strm)
         return (-1);
     }
 
-    while (HDfscanf(strm, "%lld", (&llval)) == 1) {
+    while (fscanf(strm, "%lld", (&llval)) == 1) {
         if (llval == -1)
             in->maxsizeOfDimension[i++] = H5S_UNLIMITED;
         else
@@ -3624,7 +3624,7 @@ getOutputArchitecture(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output architecture.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3644,7 +3644,7 @@ OutputArchStrToInt(const char *temp)
     int  i;
     char outputArchKeywordTable[8][15] = {"NATIVE", "STD", "IEEE", "INTEL", "CRAY", "MIPS", "ALPHA", "UNIX"};
     for (i = 0; i < 8; i++)
-        if (!HDstrcmp(outputArchKeywordTable[i], temp))
+        if (!strcmp(outputArchKeywordTable[i], temp))
             return i;
     return -1;
 }
@@ -3657,7 +3657,7 @@ getOutputByteOrder(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for output byte-order.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3677,7 +3677,7 @@ OutputByteOrderStrToInt(const char *temp)
     int  i;
     char outputByteOrderKeywordTable[2][15] = {"BE", "LE"};
     for (i = 0; i < 2; i++)
-        if (!HDstrcmp(outputByteOrderKeywordTable[i], temp))
+        if (!strcmp(outputByteOrderKeywordTable[i], temp))
             return i;
     return -1;
 }
@@ -3690,7 +3690,7 @@ getCompressionType(struct Input *in, FILE *strm)
     const char *err1 = "Unable to get 'string' value.\n";
     const char *err2 = "Invalid value for compression.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
@@ -3713,7 +3713,7 @@ CompressionTypeStrToInt(char *temp)
     int  i;
     char CompressionTypeKeywordTable[1][15] = {"GZIP"};
     for (i = 0; i < 1; i++)
-        if (!HDstrcmp(CompressionTypeKeywordTable[i], temp))
+        if (!strcmp(CompressionTypeKeywordTable[i], temp))
             return i;
     return -1;
 }
@@ -3732,7 +3732,7 @@ getCompressionParameter(struct Input *in, FILE *strm)
 
     switch (in->compressionType) {
         case 0: /* GZIP */
-            if (HDfscanf(strm, "%d", (&ival)) != 1) {
+            if (fscanf(strm, "%d", (&ival)) != 1) {
                 (void)fprintf(stderr, "%s", err1);
                 return (-1);
             }
@@ -3757,14 +3757,14 @@ getExternalFilename(struct Input *in, FILE *strm)
     char        temp[255];
     const char *err1 = "Unable to get 'string' value.\n";
 
-    if (HDfscanf(strm, "%254s", temp) != 1) {
+    if (fscanf(strm, "%254s", temp) != 1) {
         (void)fprintf(stderr, "%s", err1);
         return (-1);
     }
 
-    temp_len           = HDstrlen(temp);
+    temp_len           = strlen(temp);
     in->externFilename = (char *)malloc((temp_len + 1) * sizeof(char));
-    (void)HDstrcpy(in->externFilename, temp);
+    (void)strcpy(in->externFilename, temp);
     in->externFilename[temp_len] = '\0';
     return (0);
 }
@@ -3785,10 +3785,10 @@ setDefaultValues(struct Input *in, int count)
     in->rank           = 0;
     in->path.count     = 1;
 
-    HDstrcpy(temp, "dataset");
-    HDsnprintf(num, sizeof(num), "%d", count);
-    HDstrcat(temp, num);
-    HDstrcpy(in->path.group[0], temp);
+    strcpy(temp, "dataset");
+    snprintf(num, sizeof(num), "%d", count);
+    strcat(temp, num);
+    strcpy(in->path.group[0], temp);
 
     in->outputArchitecture = 0;  /* NATIVE */
     in->outputByteOrder    = -1; /* use default    */
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 6f318a4..d97d339 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -23,7 +23,7 @@ hsize_t compute_user_block_size(hsize_t);
 hsize_t copy_some_to_file(int, int, hsize_t, hsize_t, ssize_t);
 void    parse_command_line(int, const char *const *);
 
-static int   do_clobber  = FALSE;
+static int   do_clobber  = false;
 static char *output_file = NULL;
 static char *input_file  = NULL;
 static char *ub_file     = NULL;
@@ -105,22 +105,22 @@ leave(int ret)
 void
 parse_command_line(int argc, const char *const *argv)
 {
-    int opt = FALSE;
+    int opt = false;
 
     /* parse command line options */
     while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'o':
-                output_file = HDstrdup(H5_optarg);
+                output_file = strdup(H5_optarg);
                 break;
             case 'i':
-                input_file = HDstrdup(H5_optarg);
+                input_file = strdup(H5_optarg);
                 break;
             case 'u':
-                ub_file = HDstrdup(H5_optarg);
+                ub_file = strdup(H5_optarg);
                 break;
             case 'c':
-                do_clobber = TRUE;
+                do_clobber = true;
                 break;
             case 'h':
                 usage(h5tools_getprogname());
@@ -294,7 +294,7 @@ main(int argc, char *argv[])
     startub = usize;
 
     if (usize > 0) {
-        if (do_clobber == TRUE) {
+        if (do_clobber == true) {
             /* where is max of the current size or the new UB */
             if (usize > newubsize) {
                 newubsize = usize;
@@ -420,8 +420,8 @@ copy_some_to_file(int infid, int outfid, hsize_t starting, hsize_t startout, ssi
     } /* end if */
 
     while (howmuch > 0) {
-        HDlseek(outfid, (off_t)to, SEEK_SET);
-        HDlseek(infid, (off_t)from, SEEK_SET);
+        HDlseek(outfid, (HDoff_t)to, SEEK_SET);
+        HDlseek(infid, (HDoff_t)from, SEEK_SET);
 
         if (howmuch > 512) {
             nchars = HDread(infid, buf, (unsigned)512);
@@ -499,7 +499,7 @@ write_pad(int ofile, hsize_t old_where, hsize_t *new_where)
 
     buf[0] = '\0';
 
-    HDlseek(ofile, (off_t)old_where, SEEK_SET);
+    HDlseek(ofile, (HDoff_t)old_where, SEEK_SET);
 
     psize = compute_user_block_size(old_where);
     psize -= old_where;
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index d752014..b2d1e4d 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -24,7 +24,7 @@ hsize_t write_pad(int, hsize_t);
 hsize_t compute_pad(hsize_t);
 herr_t  copy_to_file(FILE *, FILE *, ssize_t, ssize_t);
 
-int   do_delete   = FALSE;
+int   do_delete   = false;
 char *output_file = NULL;
 char *input_file  = NULL;
 char *ub_file     = NULL;
@@ -92,25 +92,25 @@ usage(const char *prog)
 static int
 parse_command_line(int argc, const char *const *argv)
 {
-    int opt = FALSE;
+    int opt = false;
 
     /* parse command line options */
     while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'o':
-                output_file = HDstrdup(H5_optarg);
+                output_file = strdup(H5_optarg);
                 if (output_file)
                     h5tools_set_data_output_file(output_file, 1);
                 break;
 
             case 'i':
-                input_file = HDstrdup(H5_optarg);
+                input_file = strdup(H5_optarg);
                 if (input_file)
                     h5tools_set_input_file(input_file, 1);
                 break;
 
             case 'u':
-                ub_file = HDstrdup(H5_optarg);
+                ub_file = strdup(H5_optarg);
                 if (ub_file)
                     h5tools_set_output_file(ub_file, 1);
                 else
@@ -118,7 +118,7 @@ parse_command_line(int argc, const char *const *argv)
                 break;
 
             case 'd':
-                do_delete = TRUE;
+                do_delete = true;
                 break;
 
             case 'h':
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index 84567c8..04c5ff3 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -106,30 +106,30 @@ typedef struct {
     const char     *fname;          /* Filename */
     hid_t           fid;            /* File ID */
     hid_t           gid;            /* Group ID */
-    hbool_t         symlink_target; /* Whether this is the target of an symbolic link */
+    bool            symlink_target; /* Whether this is the target of an symbolic link */
     symlink_trav_t *symlink_list;   /* List of visited symbolic links */
     size_t          base_len;       /* Length of base path name, if not root */
     size_t          name_start;     /* # of leading characters to strip off path names on output */
 } iter_t;
 
 /* Command-line switches */
-static int     verbose_g          = 0;     /* lots of extra output */
-static int     width_g            = 80;    /* output width in characters */
-static hbool_t address_g          = FALSE; /* print raw data addresses */
-static hbool_t data_g             = FALSE; /* display dataset values? */
-static hbool_t label_g            = FALSE; /* label compound values? */
-static hbool_t string_g           = FALSE; /* print 1-byte numbers as ASCII? */
-static hbool_t fullname_g         = FALSE; /* print full path names */
-static hbool_t recursive_g        = FALSE; /* recursive descent listing */
-static hbool_t follow_symlink_g   = FALSE; /* follow symbolic links */
-static hbool_t no_dangling_link_g = FALSE; /* treat dangling link is error */
-static hbool_t follow_elink_g     = FALSE; /* follow external links */
-static hbool_t grp_literal_g      = FALSE; /* list group, not contents */
-static hbool_t hexdump_g          = FALSE; /* show data as raw hexadecimal */
-static hbool_t simple_output_g    = FALSE; /* make output more machine-readable */
-static hbool_t show_file_name_g   = FALSE; /* show file name for full names */
-static hbool_t no_line_wrap_g     = FALSE; /* show data content without line wrap */
-static hbool_t display_root_g     = FALSE; /* show root group in output? */
+static int  verbose_g          = 0;     /* lots of extra output */
+static int  width_g            = 80;    /* output width in characters */
+static bool address_g          = false; /* print raw data addresses */
+static bool data_g             = false; /* display dataset values? */
+static bool label_g            = false; /* label compound values? */
+static bool string_g           = false; /* print 1-byte numbers as ASCII? */
+static bool fullname_g         = false; /* print full path names */
+static bool recursive_g        = false; /* recursive descent listing */
+static bool follow_symlink_g   = false; /* follow symbolic links */
+static bool no_dangling_link_g = false; /* treat dangling link is error */
+static bool follow_elink_g     = false; /* follow external links */
+static bool grp_literal_g      = false; /* list group, not contents */
+static bool hexdump_g          = false; /* show data as raw hexadecimal */
+static bool simple_output_g    = false; /* make output more machine-readable */
+static bool show_file_name_g   = false; /* show file name for full names */
+static bool no_line_wrap_g     = false; /* show data content without line wrap */
+static bool display_root_g     = false; /* show root group in output? */
 
 /* Information about how to display each type of object */
 static struct dispatch_t {
@@ -147,10 +147,10 @@ static struct dispatch_t {
         dispatch_g[TYPE].list2 = (LIST2);                                                                    \
     } while (0)
 
-static void    print_type(h5tools_str_t *buffer, hid_t type, int ind);
-static hbool_t print_int_type(h5tools_str_t *buffer, hid_t type, int ind);
-static hbool_t print_float_type(h5tools_str_t *buffer, hid_t type, int ind);
-static herr_t  visit_obj(hid_t file, const char *oname, iter_t *iter);
+static void   print_type(h5tools_str_t *buffer, hid_t type, int ind);
+static bool   print_int_type(h5tools_str_t *buffer, hid_t type, int ind);
+static bool   print_float_type(h5tools_str_t *buffer, hid_t type, int ind);
+static herr_t visit_obj(hid_t file, const char *oname, iter_t *iter);
 
 /*-------------------------------------------------------------------------
  * Function: usage
@@ -274,7 +274,7 @@ usage(void)
  *-------------------------------------------------------------------------
  */
 static int
-print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
+print_string(h5tools_str_t *buffer, const char *s, bool escape_spaces)
 {
     int nprint = 0;
 
@@ -349,8 +349,8 @@ print_string(h5tools_str_t *buffer, const char *s, hbool_t escape_spaces)
  *
  * Purpose:     Print an object name and another string.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
 static int
@@ -361,27 +361,27 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname, con
     int         n;
 
     if (show_file_name_g)
-        HDsnprintf(fullname, sizeof(fullname), "%s/%s", iter->fname, oname + iter->name_start);
+        snprintf(fullname, sizeof(fullname), "%s/%s", iter->fname, oname + iter->name_start);
     else
         name = oname + iter->name_start;
 
     /* Print the object name, either full name or base name */
     if (fullname_g)
-        n = print_string(buffer, name, TRUE);
+        n = print_string(buffer, name, true);
     else {
         const char *last_sep; /* The location of the last group separator */
 
         /* Find the last component of the path name */
-        if (NULL == (last_sep = HDstrrchr(name, '/')))
+        if (NULL == (last_sep = strrchr(name, '/')))
             last_sep = name;
         else {
             last_sep++;
         } /* end else */
-        n = print_string(buffer, last_sep, TRUE);
+        n = print_string(buffer, last_sep, true);
     } /* end else */
     h5tools_str_append(buffer, "%*s ", MAX(0, (24 - n)), s);
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -389,145 +389,145 @@ print_obj_name(h5tools_str_t *buffer, const iter_t *iter, const char *oname, con
  *
  * Purpose:     Prints the name of a native C data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed.
+ * Return:      Success: true
+ *              Failure: false, nothing printed.
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     if (!simple_output_g) {
-        if (H5Tequal(type, H5T_NATIVE_SCHAR) == TRUE) {
+        if (H5Tequal(type, H5T_NATIVE_SCHAR) == true) {
             h5tools_str_append(buffer, "native signed char");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UCHAR) == true) {
             h5tools_str_append(buffer, "native unsigned char");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT) == true) {
             h5tools_str_append(buffer, "native int");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT) == true) {
             h5tools_str_append(buffer, "native unsigned int");
         }
-        else if (H5Tequal(type, H5T_NATIVE_SHORT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_SHORT) == true) {
             h5tools_str_append(buffer, "native short");
         }
-        else if (H5Tequal(type, H5T_NATIVE_USHORT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_USHORT) == true) {
             h5tools_str_append(buffer, "native unsigned short");
         }
-        else if (H5Tequal(type, H5T_NATIVE_LONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LONG) == true) {
             h5tools_str_append(buffer, "native long");
         }
-        else if (H5Tequal(type, H5T_NATIVE_ULONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_ULONG) == true) {
             h5tools_str_append(buffer, "native unsigned long");
         }
-        else if (H5Tequal(type, H5T_NATIVE_LLONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_LLONG) == true) {
             h5tools_str_append(buffer, "native long long");
         }
-        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_ULLONG) == true) {
             h5tools_str_append(buffer, "native unsigned long long");
         }
-        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_FLOAT) == true) {
             h5tools_str_append(buffer, "native float");
         }
-        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_DOUBLE) == true) {
             h5tools_str_append(buffer, "native double");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT8) == true) {
             h5tools_str_append(buffer, "native int8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT8) == true) {
             h5tools_str_append(buffer, "native uint8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT16) == true) {
             h5tools_str_append(buffer, "native int16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT16) == true) {
             h5tools_str_append(buffer, "native uint16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT32) == true) {
             h5tools_str_append(buffer, "native int32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT32) == true) {
             h5tools_str_append(buffer, "native uint32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT64) == true) {
             h5tools_str_append(buffer, "native int64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT64) == true) {
             h5tools_str_append(buffer, "native uint64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST8) == true) {
             h5tools_str_append(buffer, "native int_least8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST8) == true) {
             h5tools_str_append(buffer, "native uint_least8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST16) == true) {
             h5tools_str_append(buffer, "native int_least16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST16) == true) {
             h5tools_str_append(buffer, "native uint_least16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST32) == true) {
             h5tools_str_append(buffer, "native int_least32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST32) == true) {
             h5tools_str_append(buffer, "native uint_least32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_LEAST64) == true) {
             h5tools_str_append(buffer, "native int_least64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_LEAST64) == true) {
             h5tools_str_append(buffer, "native uint_least64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_FAST8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST8) == true) {
             h5tools_str_append(buffer, "native int_fast8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST8) == true) {
             h5tools_str_append(buffer, "native uint_fast8_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_FAST16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST16) == true) {
             h5tools_str_append(buffer, "native int_fast16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST16) == true) {
             h5tools_str_append(buffer, "native uint_fast16_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_FAST32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST32) == true) {
             h5tools_str_append(buffer, "native int_fast32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST32) == true) {
             h5tools_str_append(buffer, "native uint_fast32_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_INT_FAST64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_INT_FAST64) == true) {
             h5tools_str_append(buffer, "native int_fast64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_UINT_FAST64) == true) {
             h5tools_str_append(buffer, "native uint_fast64_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_B8) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_B8) == true) {
             h5tools_str_append(buffer, "native 8-bit field");
         }
-        else if (H5Tequal(type, H5T_NATIVE_B16) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_B16) == true) {
             h5tools_str_append(buffer, "native 16-bit field");
         }
-        else if (H5Tequal(type, H5T_NATIVE_B32) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_B32) == true) {
             h5tools_str_append(buffer, "native 32-bit field");
         }
-        else if (H5Tequal(type, H5T_NATIVE_B64) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_B64) == true) {
             h5tools_str_append(buffer, "native 64-bit field");
         }
-        else if (H5Tequal(type, H5T_NATIVE_HSIZE) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_HSIZE) == true) {
             h5tools_str_append(buffer, "native hsize_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_HSSIZE) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_HSSIZE) == true) {
             h5tools_str_append(buffer, "native hssize_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_HERR) == TRUE) {
+        else if (H5Tequal(type, H5T_NATIVE_HERR) == true) {
             h5tools_str_append(buffer, "native herr_t");
         }
-        else if (H5Tequal(type, H5T_NATIVE_HBOOL) == TRUE) {
-            h5tools_str_append(buffer, "native hbool_t");
+        else if (H5Tequal(type, H5T_NATIVE_HBOOL) == true) {
+            h5tools_str_append(buffer, "native bool");
         }
         else {
             return print_int_type(buffer, type, ind);
@@ -536,7 +536,7 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
     else {
         return print_int_type(buffer, type, ind);
     }
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -544,29 +544,29 @@ print_native_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print the name of an IEEE floating-point data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_ieee_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
-    if (H5Tequal(type, H5T_IEEE_F32BE) == TRUE) {
+    if (H5Tequal(type, H5T_IEEE_F32BE) == true) {
         h5tools_str_append(buffer, "IEEE 32-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F32LE) == TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F32LE) == true) {
         h5tools_str_append(buffer, "IEEE 32-bit little-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64BE) == TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64BE) == true) {
         h5tools_str_append(buffer, "IEEE 64-bit big-endian float");
     }
-    else if (H5Tequal(type, H5T_IEEE_F64LE) == TRUE) {
+    else if (H5Tequal(type, H5T_IEEE_F64LE) == true) {
         h5tools_str_append(buffer, "IEEE 64-bit little-endian float");
     }
     else {
         return print_float_type(buffer, type, ind);
     }
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -661,11 +661,11 @@ print_precision(h5tools_str_t *buffer, hid_t type, int ind)
  *              the first line. Additional information might appear in
  *              parentheses on the following lines.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     H5T_order_t order;          /* byte order value */
@@ -674,7 +674,7 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
     const char *sign_s = NULL;  /* sign scheme string */
 
     if (H5T_INTEGER != H5Tget_class(type))
-        return FALSE;
+        return false;
 
     /* Byte order */
     if (H5Tget_size(type) > 1) {
@@ -717,7 +717,7 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
     h5tools_str_append(buffer, "%lu-bit%s%s integer", (unsigned long)(8 * H5Tget_size(type)), order_s,
                        sign_s);
     print_precision(buffer, type, ind);
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -725,11 +725,11 @@ print_int_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print info about a floating point data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     H5T_order_t order;          /* byte order value */
@@ -744,7 +744,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
     const char *pad_s = NULL;   /* internal padding string */
 
     if (H5T_FLOAT != H5Tget_class(type))
-        return FALSE;
+        return false;
 
     /* Byte order */
     if (H5Tget_size(type) > 1) {
@@ -820,7 +820,7 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
         }
         h5tools_str_append(buffer, "\n%*s(internal padding bits are %s)", ind, "", pad_s);
     }
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -828,11 +828,11 @@ print_float_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print info about a compound data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     char    *name = NULL; /* member name */
@@ -843,16 +843,16 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
     unsigned i;           /* miscellaneous counters */
 
     if (H5T_COMPOUND != H5Tget_class(type))
-        return FALSE;
+        return false;
     if ((nmembs = H5Tget_nmembers(type)) < 0)
-        return FALSE;
+        return false;
 
     h5tools_str_append(buffer, "struct {");
     for (i = 0; i < (unsigned)nmembs; i++) {
         /* Name and offset */
         name = H5Tget_member_name(type, i);
         h5tools_str_append(buffer, "\n%*s\"", ind + 4, "");
-        n = print_string(buffer, name, FALSE);
+        n = print_string(buffer, name, false);
         h5tools_str_append(buffer, "\"%*s +%-4lu ", MAX(0, 16 - n), "",
                            (unsigned long)H5Tget_member_offset(type, i));
         H5free_memory(name);
@@ -865,7 +865,7 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
     size = H5Tget_size(type);
     h5tools_str_append(buffer, "\n%*s} %lu byte%s", ind, "", (unsigned long)size, 1 == size ? "" : "s");
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -873,20 +873,20 @@ print_cmpd_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print info about an enumeration data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     int   nmembs; /* number of members */
     hid_t super;  /* enum base integer type */
 
     if (H5T_ENUM != H5Tget_class(type))
-        return FALSE;
+        return false;
     if ((nmembs = H5Tget_nmembers(type)) < 0)
-        return FALSE;
+        return false;
 
     super = H5Tget_super(type);
     h5tools_str_append(buffer, "enum ");
@@ -933,7 +933,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
                 free(value);
                 H5Tclose(super);
 
-                return FALSE;
+                return false;
             }
 
         /* Sort members by increasing value */
@@ -944,7 +944,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
             int nchars; /* number of output characters */
 
             h5tools_str_append(buffer, "\n%*s", ind + 4, "");
-            nchars = print_string(buffer, name[i], TRUE);
+            nchars = print_string(buffer, name[i], true);
             h5tools_str_append(buffer, "%*s = ", MAX(0, 16 - nchars), "");
 
             if (native < 0) {
@@ -981,7 +981,7 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     H5Tclose(super);
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -989,11 +989,11 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print information about a string data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
 {
     H5T_str_t   pad;
@@ -1002,7 +1002,7 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
     const char *cset_s = NULL;
 
     if (H5T_STRING != H5Tget_class(type))
-        return FALSE;
+        return false;
 
     /* Padding */
     pad = H5Tget_strpad(type);
@@ -1073,7 +1073,7 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
         h5tools_str_append(buffer, "%lu-byte", (unsigned long)H5Tget_size(type));
     }
     h5tools_str_append(buffer, " %s %s string", pad_s, cset_s);
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1081,30 +1081,30 @@ print_string_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
  *
  * Purpose:     Prints information about a reference data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
 {
     if (H5T_REFERENCE != H5Tget_class(type))
-        return FALSE;
+        return false;
 
-    if (H5Tequal(type, H5T_STD_REF) == TRUE) {
+    if (H5Tequal(type, H5T_STD_REF) == true) {
         h5tools_str_append(buffer, "standard reference");
     }
-    else if (H5Tequal(type, H5T_STD_REF_OBJ) == TRUE) {
+    else if (H5Tequal(type, H5T_STD_REF_OBJ) == true) {
         h5tools_str_append(buffer, "object reference");
     }
-    else if (H5Tequal(type, H5T_STD_REF_DSETREG) == TRUE) {
+    else if (H5Tequal(type, H5T_STD_REF_DSETREG) == true) {
         h5tools_str_append(buffer, "dataset region reference");
     }
     else {
         h5tools_str_append(buffer, "%lu-byte unknown reference", (unsigned long)H5Tget_size(type));
     }
 
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1112,28 +1112,28 @@ print_reference_type(h5tools_str_t *buffer, hid_t type, int H5_ATTR_UNUSED ind)
  *
  * Purpose:     Prints information about an opaque data type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     char  *tag;
     size_t size;
 
     if (H5T_OPAQUE != H5Tget_class(type))
-        return FALSE;
+        return false;
 
     size = H5Tget_size(type);
     h5tools_str_append(buffer, "%lu-byte opaque type", (unsigned long)size);
     if ((tag = H5Tget_tag(type))) {
         h5tools_str_append(buffer, "\n%*s(tag = \"", ind, "");
-        print_string(buffer, tag, FALSE);
+        print_string(buffer, tag, false);
         h5tools_str_append(buffer, "\")");
         H5free_memory(tag);
     }
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1141,33 +1141,33 @@ print_opaque_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print information about a variable-length type
  *
- * Return:      Success:        TRUE
- *              Failure:        FALSE
+ * Return:      Success:        true
+ *              Failure:        false
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_vlen_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     hid_t super;
 
     if (H5T_VLEN != H5Tget_class(type))
-        return FALSE;
+        return false;
 
     h5tools_str_append(buffer, "variable length of\n%*s", ind + 4, "");
     super = H5Tget_super(type);
     print_type(buffer, super, ind + 4);
     H5Tclose(super);
-    return TRUE;
+    return true;
 }
 
 /*---------------------------------------------------------------------------
  * Purpose:     Print information about an array type
  *
- * Return:      Success:        TRUE
- *              Failure:        FALSE
+ * Return:      Success:        true
+ *              Failure:        false
  *---------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     hid_t    super;
@@ -1175,7 +1175,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
     hsize_t *dims = NULL;
 
     if (H5T_ARRAY != H5Tget_class(type))
-        return FALSE;
+        return false;
     ndims = H5Tget_array_ndims(type);
     if (ndims) {
         dims = (hsize_t *)malloc((unsigned)ndims * sizeof(dims[0]));
@@ -1196,7 +1196,7 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
     super = H5Tget_super(type);
     print_type(buffer, super, ind + 4);
     H5Tclose(super);
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1204,18 +1204,18 @@ print_array_type(h5tools_str_t *buffer, hid_t type, int ind)
  *
  * Purpose:     Print information about a bitfield type.
  *
- * Return:      Success: TRUE
- *              Failure: FALSE, nothing printed
+ * Return:      Success: true
+ *              Failure: false, nothing printed
  *-------------------------------------------------------------------------
  */
-static hbool_t
+static bool
 print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
 {
     H5T_order_t order;          /* byte order value */
     const char *order_s = NULL; /* byte order string */
 
     if (H5T_BITFIELD != H5Tget_class(type))
-        return FALSE;
+        return false;
     if (H5Tget_size(type) > 1) {
         order = H5Tget_order(type);
         if (H5T_ORDER_LE == order) {
@@ -1237,7 +1237,7 @@ print_bitfield_type(h5tools_str_t *buffer, hid_t type, int ind)
 
     h5tools_str_append(buffer, "%lu-bit%s bitfield", (unsigned long)(8 * H5Tget_size(type)), order_s);
     print_precision(buffer, type, ind);
-    return TRUE;
+    return true;
 }
 
 /*-------------------------------------------------------------------------
@@ -1381,23 +1381,23 @@ dump_dataset_values(hid_t dset)
     }
     outputformat.arr_linebreak = 0;
     /* Floating point types should display full precision */
-    HDsnprintf(fmt_float, sizeof(fmt_float), "%%1.%dg", FLT_DIG);
+    snprintf(fmt_float, sizeof(fmt_float), "%%1.%dg", FLT_DIG);
     outputformat.fmt_float = fmt_float;
-    HDsnprintf(fmt_double, sizeof(fmt_double), "%%1.%dg", DBL_DIG);
+    snprintf(fmt_double, sizeof(fmt_double), "%%1.%dg", DBL_DIG);
     outputformat.fmt_double = fmt_double;
 
     if (hexdump_g) {
         /* Print all data in hexadecimal format if the `-x' or `--hexdump'
          * command line switch was given. */
-        outputformat.raw = TRUE;
+        outputformat.raw = true;
     }
     else if (string_g && H5Tget_size(f_type) == 1 && (H5Tget_class(f_type) == H5T_INTEGER)) {
         /* Print 1-byte integer data as an ASCI character string instead of
          * integers if the `-s' or `--string' command-line option was given. */
-        outputformat.ascii     = TRUE;
+        outputformat.ascii     = true;
         outputformat.elmt_suf1 = "";
         outputformat.elmt_suf2 = "";
-        HDsnprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
+        snprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
         outputformat.line_pre = string_prefix;
         outputformat.line_suf = "\"";
     }
@@ -1412,7 +1412,7 @@ dump_dataset_values(hid_t dset)
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0,
                            (hsize_t)0);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
     ctx.cur_column  = (size_t)curr_pos;
     if (H5Tget_class(f_type) == H5T_REFERENCE) {
         H5TOOLS_DEBUG("reference class type");
@@ -1428,7 +1428,7 @@ dump_dataset_values(hid_t dset)
         H5Sget_simple_extent_dims(space, total_size, NULL);
         init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         if (NULL !=
             (ref_buf = (H5R_ref_t *)calloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) {
@@ -1550,23 +1550,23 @@ dump_attribute_values(hid_t attr)
     }
     outputformat.arr_linebreak = 0;
     /* Floating point types should display full precision */
-    HDsnprintf(fmt_float, sizeof(fmt_float), "%%1.%dg", FLT_DIG);
+    snprintf(fmt_float, sizeof(fmt_float), "%%1.%dg", FLT_DIG);
     outputformat.fmt_float = fmt_float;
-    HDsnprintf(fmt_double, sizeof(fmt_double), "%%1.%dg", DBL_DIG);
+    snprintf(fmt_double, sizeof(fmt_double), "%%1.%dg", DBL_DIG);
     outputformat.fmt_double = fmt_double;
 
     if (hexdump_g) {
         /* Print all data in hexadecimal format if the `-x' or `--hexdump'
          * command line switch was given. */
-        outputformat.raw = TRUE;
+        outputformat.raw = true;
     }
     else if (string_g && H5Tget_size(f_type) == 1 && (H5Tget_class(f_type) == H5T_INTEGER)) {
         /* Print 1-byte integer data as an ASCI character string instead of
          * integers if the `-s' or `--string' command-line option was given. */
-        outputformat.ascii     = TRUE;
+        outputformat.ascii     = true;
         outputformat.elmt_suf1 = "";
         outputformat.elmt_suf2 = "";
-        HDsnprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
+        snprintf(string_prefix, sizeof(string_prefix), "%s\"", outputformat.line_pre);
         outputformat.line_pre = string_prefix;
         outputformat.line_suf = "\"";
     }
@@ -1582,7 +1582,7 @@ dump_attribute_values(hid_t attr)
     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols, (hsize_t)0,
                            (hsize_t)0);
 
-    ctx.need_prefix = TRUE;
+    ctx.need_prefix = true;
     ctx.cur_column  = (size_t)curr_pos;
     if (H5Tget_class(f_type) == H5T_REFERENCE) {
         H5TOOLS_DEBUG("reference class type");
@@ -1598,7 +1598,7 @@ dump_attribute_values(hid_t attr)
         H5Sget_simple_extent_dims(space, total_size, NULL);
         init_acc_pos(ctx.ndims, total_size, ctx.acc, ctx.pos, ctx.p_min_idx);
 
-        ctx.need_prefix = TRUE;
+        ctx.need_prefix = true;
 
         if (NULL !=
             (ref_buf = (H5R_ref_t *)calloc(MAX(sizeof(unsigned), sizeof(H5R_ref_t)), (size_t)ndims))) {
@@ -1675,7 +1675,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain
     h5tools_str_reset(&buffer);
     h5tools_str_append(&buffer, "    Attribute: ");
 
-    print_string(&buffer, attr_name, TRUE);
+    print_string(&buffer, attr_name, true);
 
     H5TOOLS_DEBUG("Attribute name:%s", attr_name);
     if ((attr = H5Aopen(obj, attr_name, H5P_DEFAULT)) >= 0) {
@@ -1876,7 +1876,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                     for (i = 0, max_len = 0; i < nf; i++) {
                         if (H5Pget_external(dcpl, (unsigned)i, sizeof(f_name), f_name, NULL, NULL) < 0)
                             continue;
-                        n       = print_string(NULL, f_name, TRUE);
+                        n       = print_string(NULL, f_name, true);
                         max_len = MAX(max_len, n);
                     } /* end for */
                     h5tools_str_append(&buffer, "    %-10s %d external file%s\n", "Extern:", nf,
@@ -1899,13 +1899,13 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                             h5tools_str_append(&buffer,
                                                "        #%03d %10" PRIuHSIZE " %10" PRIuHSIZE " %10s ", i,
                                                total, (hsize_t)f_offset, "INF");
-                            print_string(&buffer, f_name, TRUE);
+                            print_string(&buffer, f_name, true);
                         }
                         else {
                             h5tools_str_append(
                                 &buffer, "        #%03d %10" PRIuHSIZE " %10" PRIuHSIZE " %10" PRIuHSIZE " ",
                                 i, total, (hsize_t)f_offset, f_size);
-                            print_string(&buffer, f_name, TRUE);
+                            print_string(&buffer, f_name, true);
                         }
                         h5tools_str_append(&buffer, "\n");
                         total += f_size;
@@ -1932,9 +1932,9 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                         H5Pget_virtual_filename(dcpl, next, f_name, sizeof(f_name));
                         H5Pget_virtual_dsetname(dcpl, next, dset_name, sizeof(dset_name));
                         h5tools_str_append(&buffer, "    %-10s        ", " ");
-                        print_string(&buffer, f_name, TRUE);
+                        print_string(&buffer, f_name, true);
                         h5tools_str_append(&buffer, "   ");
-                        print_string(&buffer, dset_name, TRUE);
+                        print_string(&buffer, dset_name, true);
                         h5tools_str_append(&buffer, "\n");
                     }
                     h5tools_str_append(&buffer, "     %-10s}\n", " ");
@@ -1995,7 +1995,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
                 filt_id   = H5Pget_filter2(dcpl, (unsigned)i, &filt_flags, &cd_nelmts, cd_values,
                                            sizeof(f_name), f_name, NULL);
                 f_name[sizeof(f_name) - 1] = '\0';
-                HDsnprintf(s, sizeof(s), "Filter-%d:", i);
+                snprintf(s, sizeof(s), "Filter-%d:", i);
                 h5tools_str_append(&buffer, "    %-10s %s-%u %s {", s, (f_name[0] ? f_name : "method"),
                                    (unsigned)filt_id, ((filt_flags & H5Z_FLAG_OPTIONAL) ? "OPT" : ""));
                 for (cd_num = 0; cd_num < cd_nelmts; cd_num++)
@@ -2114,7 +2114,7 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi
     if (first_seen) {
         h5tools_str_reset(&buffer);
         h5tools_str_append(&buffer, ", same as ");
-        print_string(&buffer, first_seen, TRUE);
+        print_string(&buffer, first_seen, true);
         if (!iter->symlink_target) {
             h5tools_str_append(&buffer, "\n");
         }
@@ -2182,7 +2182,7 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi
                 else
                     tm = HDlocaltime(&(oinfo->mtime));
                 if (tm) {
-                    HDstrftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
+                    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", tm);
                     h5tools_str_reset(&buffer);
                     h5tools_str_append(&buffer, "    %-10s %s\n", "Modified:", buf);
                     h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos,
@@ -2210,7 +2210,7 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi
                             comment[cmt_bufsize] = 0;
                             h5tools_str_reset(&buffer);
                             h5tools_str_append(&buffer, "    %-10s \"", "Comment:");
-                            print_string(&buffer, comment, FALSE);
+                            print_string(&buffer, comment, false);
                             h5tools_str_append(&buffer, "\"\n");
                             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos,
                                                    (size_t)info->line_ncols, (hsize_t)0, (hsize_t)0);
@@ -2236,7 +2236,7 @@ done:
         h5tools_str_append(&buffer, "}\n");
         h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
                                (hsize_t)0, (hsize_t)0);
-        iter->symlink_target = FALSE;
+        iter->symlink_target = false;
     }
     h5tools_str_close(&buffer);
 
@@ -2292,7 +2292,7 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
                 goto done;
             /* no dangling link option given and detect dangling link */
             else if (no_dangling_link_g && ret == 0)
-                iter->symlink_list->dangle_link = TRUE;
+                iter->symlink_list->dangle_link = true;
 
             h5tools_str_append(&buffer, "Soft Link {");
             h5tools_str_append(&buffer, "%s", buf);
@@ -2300,7 +2300,7 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
             h5tools_render_element(rawoutstream, info, &ctx, &buffer, &curr_pos, (size_t)info->line_ncols,
                                    (hsize_t)0, (hsize_t)0);
             if (follow_symlink_g) {
-                hbool_t orig_grp_literal = grp_literal_g;
+                bool orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
@@ -2320,12 +2320,12 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
 
                 /* Adjust user data to specify that we are operating on the
                  * target of an soft link */
-                iter->symlink_target = TRUE;
+                iter->symlink_target = true;
 
                 /* Prevent recursive listing of soft link target if
                  * recursive_g is off */
                 if (!recursive_g)
-                    grp_literal_g = TRUE;
+                    grp_literal_g = true;
                 /* Recurse through the soft link */
                 if (visit_obj(iter->fid, name, iter) < 0) {
                     grp_literal_g = orig_grp_literal;
@@ -2346,7 +2346,7 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
         case H5L_TYPE_EXTERNAL: {
             const char *filename;
             const char *path;
-            hbool_t     follow_link = follow_symlink_g || follow_elink_g;
+            bool        follow_link = follow_symlink_g || follow_elink_g;
 
             ret = H5tools_get_symlink_info(iter->fid, name, &lnk_info, follow_link);
             /* lnk_info.trg_path is malloced in H5tools_get_symlink_info()
@@ -2357,7 +2357,7 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
                 goto done;
             /* no dangling link option given and detect dangling link */
             else if (no_dangling_link_g && ret == 0)
-                iter->symlink_list->dangle_link = TRUE;
+                iter->symlink_list->dangle_link = true;
 
             if (H5Lunpack_elink_val(buf, linfo->u.val_size, NULL, &filename, &path) < 0)
                 goto done;
@@ -2375,7 +2375,7 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
             /* Recurse through the external link */
             /* keep the follow_elink_g for backward compatibility with -E */
             if (follow_link) {
-                hbool_t orig_grp_literal = grp_literal_g;
+                bool orig_grp_literal = grp_literal_g;
                 h5tools_str_reset(&buffer);
                 h5tools_str_append(&buffer, " ");
 
@@ -2396,12 +2396,12 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter)
 
                 /* Adjust user data to specify that we are operating on the
                  * target of an external link */
-                iter->symlink_target = TRUE;
+                iter->symlink_target = true;
 
                 /* Prevent recursive listing of external link target if
                  * recursive_g is off */
                 if (!recursive_g)
-                    grp_literal_g = TRUE;
+                    grp_literal_g = true;
 
                 /* Recurse through the external link */
                 if (visit_obj(iter->fid, name, iter) < 0) {
@@ -2461,7 +2461,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
     if (H5Oget_info_by_name3(file, oname, &oi, H5O_INFO_BASIC | H5O_INFO_TIME, H5P_DEFAULT) < 0) {
         if (iter->symlink_target) {
             h5tools_str_append(&buffer, "{**NOT FOUND**}\n");
-            iter->symlink_target = FALSE;
+            iter->symlink_target = false;
         }
         else
             print_obj_name(&buffer, iter, oname, "**NOT FOUND**");
@@ -2488,7 +2488,7 @@ visit_obj(hid_t file, const char *oname, iter_t *iter)
         iter->name_start = iter->base_len;
 
         /* Specified name is a group. List the complete contents of the group. */
-        h5trav_visit(file, oname, (hbool_t)(display_root_g || iter->symlink_target), recursive_g, list_obj,
+        h5trav_visit(file, oname, (bool)(display_root_g || iter->symlink_target), recursive_g, list_obj,
                      list_lnk, iter, H5O_INFO_BASIC | H5O_INFO_TIME);
 
         /* Close group */
@@ -2529,7 +2529,7 @@ get_width(void)
 
     /* Try to get it from the COLUMNS environment variable first since it's
      * value is sometimes wrong. */
-    if ((s = HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
+    if ((s = getenv("COLUMNS")) && *s && isdigit((int)*s))
         width = (int)strtol(s, NULL, 0);
 
 #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG)
@@ -2587,24 +2587,24 @@ get_width(void)
  *
  * Purpose:     check if command line arguments are valid
  *
- * Return:      Success: TRUE (1)
- *              Failure: FALSE (0)
+ * Return:      Success: true (1)
+ *              Failure: false (0)
  *-------------------------------------------------------------------------*/
-static hbool_t
+static bool
 is_valid_args(void)
 {
-    hbool_t ret = TRUE;
+    bool ret = true;
 
     if (recursive_g && grp_literal_g) {
         fprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n");
-        ret = FALSE;
+        ret = false;
         goto out;
     }
 
     if (no_dangling_link_g && !follow_symlink_g) {
         fprintf(rawerrorstream,
                 "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n");
-        ret = FALSE;
+        ret = false;
         goto out;
     }
 
@@ -2649,8 +2649,8 @@ main(int argc, char *argv[])
     char               drivername[50];
     int                err_exit        = 0;
     hid_t              fapl_id         = H5P_DEFAULT;
-    hbool_t            custom_vol_fapl = FALSE;
-    hbool_t            custom_vfd_fapl = FALSE;
+    bool               custom_vol_fapl = false;
+    bool               custom_vfd_fapl = false;
     h5tools_vol_info_t vol_info        = {0};
     h5tools_vfd_info_t vfd_info        = {0};
 
@@ -2659,7 +2659,7 @@ main(int argc, char *argv[])
     H5FD_ros3_fapl_ext_t ros3_fa = {
         {
             1,     /* Structure Version */
-            FALSE, /* Authenticate?     */
+            false, /* Authenticate?     */
             "",    /* AWS Region        */
             "",    /* Access Key ID     */
             "",    /* Secret Access Key */
@@ -2700,98 +2700,98 @@ main(int argc, char *argv[])
 
     /* Switches come before non-switch arguments */
     for (argno = 1; argno < argc && '-' == argv[argno][0]; argno++) {
-        if (!HDstrcmp(argv[argno], "--")) {
+        if (!strcmp(argv[argno], "--")) {
             /* Last switch */
             argno++;
             break;
         }
-        else if (!HDstrcmp(argv[argno], "--help")) {
+        else if (!strcmp(argv[argno], "--help")) {
             usage();
             leave(EXIT_SUCCESS);
         }
-        else if (!HDstrcmp(argv[argno], "--address")) {
-            address_g = TRUE;
+        else if (!strcmp(argv[argno], "--address")) {
+            address_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--data")) {
-            data_g = TRUE;
+        else if (!strcmp(argv[argno], "--data")) {
+            data_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--enable-error-stack")) {
+        else if (!strcmp(argv[argno], "--enable-error-stack")) {
             enable_error_stack = 1;
         }
-        else if (!HDstrcmp(argv[argno], "--errors")) {
+        else if (!strcmp(argv[argno], "--errors")) {
             /* deprecated --errors */
             enable_error_stack = 1;
         }
-        else if (!HDstrcmp(argv[argno], "--follow-symlinks")) {
-            follow_symlink_g = TRUE;
+        else if (!strcmp(argv[argno], "--follow-symlinks")) {
+            follow_symlink_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--no-dangling-links")) {
-            no_dangling_link_g = TRUE;
+        else if (!strcmp(argv[argno], "--no-dangling-links")) {
+            no_dangling_link_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--external")) {
-            follow_elink_g = TRUE;
+        else if (!strcmp(argv[argno], "--external")) {
+            follow_elink_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--full")) {
-            fullname_g = TRUE;
+        else if (!strcmp(argv[argno], "--full")) {
+            fullname_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--group")) {
-            grp_literal_g = TRUE;
+        else if (!strcmp(argv[argno], "--group")) {
+            grp_literal_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--label")) {
-            label_g = TRUE;
+        else if (!strcmp(argv[argno], "--label")) {
+            label_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--recursive")) {
-            recursive_g = TRUE;
-            fullname_g  = TRUE;
+        else if (!strcmp(argv[argno], "--recursive")) {
+            recursive_g = true;
+            fullname_g  = true;
         }
-        else if (!HDstrcmp(argv[argno], "--simple")) {
-            simple_output_g = TRUE;
+        else if (!strcmp(argv[argno], "--simple")) {
+            simple_output_g = true;
         }
-        else if (!HDstrcmp(argv[argno], "--string")) {
-            string_g = TRUE;
+        else if (!strcmp(argv[argno], "--string")) {
+            string_g = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vol-value=", (size_t)12)) {
+        else if (!strncmp(argv[argno], "--vol-value=", (size_t)12)) {
             vol_info.type    = VOL_BY_VALUE;
             vol_info.u.value = (H5VL_class_value_t)atoi(argv[argno] + 12);
-            custom_vol_fapl  = TRUE;
+            custom_vol_fapl  = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vol-name=", (size_t)11)) {
+        else if (!strncmp(argv[argno], "--vol-name=", (size_t)11)) {
             vol_info.type   = VOL_BY_NAME;
             vol_info.u.name = argv[argno] + 11;
-            custom_vol_fapl = TRUE;
+            custom_vol_fapl = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vol-info=", (size_t)11)) {
+        else if (!strncmp(argv[argno], "--vol-info=", (size_t)11)) {
             vol_info.info_string = argv[argno] + 11;
         }
-        else if (!HDstrncmp(argv[argno], "--vfd=", (size_t)6)) {
+        else if (!strncmp(argv[argno], "--vfd=", (size_t)6)) {
             vfd_info.type   = VFD_BY_NAME;
             vfd_info.u.name = argv[argno] + 6;
-            custom_vfd_fapl = TRUE;
+            custom_vfd_fapl = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vfd-value=", (size_t)12)) {
+        else if (!strncmp(argv[argno], "--vfd-value=", (size_t)12)) {
             vfd_info.type    = VFD_BY_VALUE;
             vfd_info.u.value = (H5FD_class_value_t)atoi(argv[argno] + 12);
-            custom_vfd_fapl  = TRUE;
+            custom_vfd_fapl  = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vfd-name=", (size_t)11)) {
+        else if (!strncmp(argv[argno], "--vfd-name=", (size_t)11)) {
             vfd_info.type   = VFD_BY_NAME;
             vfd_info.u.name = argv[argno] + 11;
-            custom_vfd_fapl = TRUE;
+            custom_vfd_fapl = true;
         }
-        else if (!HDstrncmp(argv[argno], "--vfd-info=", (size_t)11)) {
+        else if (!strncmp(argv[argno], "--vfd-info=", (size_t)11)) {
             vfd_info.info = (const void *)(argv[argno] + 11);
         }
-        else if (!HDstrncmp(argv[argno], "--width=", (size_t)8)) {
+        else if (!strncmp(argv[argno], "--width=", (size_t)8)) {
             width_g = (int)strtol(argv[argno] + 8, &rest, 0);
 
             if (0 == width_g)
-                no_line_wrap_g = TRUE;
+                no_line_wrap_g = true;
             else if (width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
         }
-        else if (!HDstrcmp(argv[argno], "--width")) {
+        else if (!strcmp(argv[argno], "--width")) {
             if ((argno + 1) >= argc) {
                 usage();
                 leave(EXIT_FAILURE);
@@ -2805,17 +2805,17 @@ main(int argc, char *argv[])
                 leave(EXIT_FAILURE);
             }
         }
-        else if (!HDstrcmp(argv[argno], "--verbose")) {
+        else if (!strcmp(argv[argno], "--verbose")) {
             verbose_g++;
         }
-        else if (!HDstrcmp(argv[argno], "--version")) {
+        else if (!strcmp(argv[argno], "--version")) {
             print_version(h5tools_getprogname());
             leave(EXIT_SUCCESS);
         }
-        else if (!HDstrcmp(argv[argno], "--hexdump")) {
-            hexdump_g = TRUE;
+        else if (!strcmp(argv[argno], "--hexdump")) {
+            hexdump_g = true;
         }
-        else if (!HDstrncmp(argv[argno], "-w", (size_t)2)) {
+        else if (!strncmp(argv[argno], "-w", (size_t)2)) {
             if (argv[argno][2]) {
                 s = argv[argno] + 2;
             }
@@ -2829,14 +2829,14 @@ main(int argc, char *argv[])
             width_g = (int)strtol(s, &rest, 0);
 
             if (0 == width_g) {
-                no_line_wrap_g = TRUE;
+                no_line_wrap_g = true;
             }
             else if (width_g < 0 || *rest) {
                 usage();
                 leave(EXIT_FAILURE);
             }
         }
-        else if (!HDstrncmp(argv[argno], "--s3-cred=", (size_t)10)) {
+        else if (!strncmp(argv[argno], "--s3-cred=", (size_t)10)) {
 #ifdef H5_HAVE_ROS3_VFD
             char const *start = NULL;
 
@@ -2863,7 +2863,7 @@ main(int argc, char *argv[])
             leave(EXIT_FAILURE);
 #endif
         }
-        else if (!HDstrncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
+        else if (!strncmp(argv[argno], "--hdfs-attrs=", (size_t)13)) {
 #ifdef H5_HAVE_LIBHDFS
             char const *start = NULL;
 
@@ -2897,11 +2897,11 @@ main(int argc, char *argv[])
                         break;
 
                     case 'a': /* --address */
-                        address_g = TRUE;
+                        address_g = true;
                         break;
 
                     case 'd': /* --data */
-                        data_g = TRUE;
+                        data_g = true;
                         break;
 
                     /* deprecated -e */
@@ -2910,32 +2910,32 @@ main(int argc, char *argv[])
                         break;
 
                     case 'E': /* --external */
-                        follow_elink_g = TRUE;
+                        follow_elink_g = true;
                         break;
 
                     case 'f': /* --full */
-                        fullname_g = TRUE;
+                        fullname_g = true;
                         break;
 
                     case 'g': /* --group */
-                        grp_literal_g = TRUE;
+                        grp_literal_g = true;
                         break;
 
                     case 'l': /* --label */
-                        label_g = TRUE;
+                        label_g = true;
                         break;
 
                     case 'r': /* --recursive */
-                        recursive_g = TRUE;
-                        fullname_g  = TRUE;
+                        recursive_g = true;
+                        fullname_g  = true;
                         break;
 
                     case 'S': /* --simple */
-                        simple_output_g = TRUE;
+                        simple_output_g = true;
                         break;
 
                     case 's': /* --string */
-                        string_g = TRUE;
+                        string_g = true;
                         break;
 
                     case 'v': /* --verbose */
@@ -2948,7 +2948,7 @@ main(int argc, char *argv[])
                         break;
 
                     case 'x': /* --hexdump */
-                        hexdump_g = TRUE;
+                        hexdump_g = true;
                         break;
 
                     default:
@@ -2983,13 +2983,13 @@ main(int argc, char *argv[])
     /* Setup a custom fapl for file accesses */
     if (custom_vol_fapl || custom_vfd_fapl) {
 #ifdef H5_HAVE_ROS3_VFD
-        if (custom_vfd_fapl && (0 == HDstrcmp(vfd_info.u.name, drivernames[ROS3_VFD_IDX]))) {
+        if (custom_vfd_fapl && (0 == strcmp(vfd_info.u.name, drivernames[ROS3_VFD_IDX]))) {
             if (!vfd_info.info)
                 vfd_info.info = &ros3_fa;
         }
 #endif
 #ifdef H5_HAVE_LIBHDFS
-        if (custom_vfd_fapl && (0 == HDstrcmp(vfd_info.u.name, drivernames[HDFS_VFD_IDX]))) {
+        if (custom_vfd_fapl && (0 == strcmp(vfd_info.u.name, drivernames[HDFS_VFD_IDX]))) {
             if (!vfd_info.info)
                 vfd_info.info = &hdfs_fa;
         }
@@ -3021,7 +3021,7 @@ main(int argc, char *argv[])
         symlink_trav_t symlink_list;
         size_t         u;
 
-        fname   = HDstrdup(argv[argno++]);
+        fname   = strdup(argv[argno++]);
         oname   = NULL;
         file_id = H5I_INVALID_HID;
 
@@ -3037,7 +3037,7 @@ main(int argc, char *argv[])
 
             /* Shorten the file name; lengthen the object name */
             x     = oname;
-            oname = HDstrrchr(fname, '/');
+            oname = strrchr(fname, '/');
             if (x)
                 *x = '/';
             if (!oname)
@@ -3055,10 +3055,10 @@ main(int argc, char *argv[])
             /* Always use absolute paths to avoid confusion, keep track of where
              * to begin path name output */
             *oname        = '/';
-            iter.base_len = HDstrlen(oname);
+            iter.base_len = strlen(oname);
             iter.base_len -= oname[iter.base_len - 1] == '/';
             x = oname;
-            if (NULL == (oname = HDstrdup(oname))) {
+            if (NULL == (oname = strdup(oname))) {
                 fprintf(rawerrorstream, "memory allocation failed\n");
                 leave(EXIT_FAILURE);
             }
@@ -3070,7 +3070,7 @@ main(int argc, char *argv[])
         if (!oname || !*oname) {
             oname = root_name;
             if (recursive_g)
-                display_root_g = TRUE;
+                display_root_g = true;
             iter.base_len   = 0;
             iter.name_start = 0;
             /* Use x to remember if we have allocated space in oname */
@@ -3081,16 +3081,16 @@ main(int argc, char *argv[])
         iter.fname                     = fname;
         iter.fid                       = file_id;
         iter.gid                       = H5I_INVALID_HID;
-        iter.symlink_target            = FALSE;
+        iter.symlink_target            = false;
         iter.symlink_list              = &symlink_list;
-        iter.symlink_list->dangle_link = FALSE;
+        iter.symlink_list->dangle_link = false;
 
         /* Initialize list of visited symbolic links */
         symlink_list.nused = symlink_list.nalloc = 0;
         symlink_list.objs                        = NULL;
 
         /* Check for root group as object name */
-        if (HDstrcmp(oname, root_name) != 0) {
+        if (strcmp(oname, root_name) != 0) {
             /* Check the type of link given */
             if (H5Lget_info2(file_id, oname, &li, H5P_DEFAULT) < 0) {
                 hsize_t           curr_pos = 0; /* total data element position   */
diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c
index 8830c82..fc2f0c7 100644
--- a/tools/src/h5perf/pio_engine.c
+++ b/tools/src/h5perf/pio_engine.c
@@ -278,7 +278,7 @@ do_pio(parameters param)
         /* Open file for write */
         char base_name[256];
 
-        HDsnprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf);
+        snprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf);
         pio_create_filename(iot, base_name, fname, FILENAME_MAX);
         if (pio_debug_level > 0)
             fprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname);
@@ -402,7 +402,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
     }
 
     /* First use the environment variable and then try the constant */
-    prefix = HDgetenv("HDF5_PARAPREFIX");
+    prefix = getenv("HDF5_PARAPREFIX");
 
 #ifdef HDF5_PARAPREFIX
     if (!prefix)
@@ -416,8 +416,8 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
          * directory instead. */
         char *user, *login, *subdir;
 
-        user   = HDgetenv("USER");
-        login  = HDgetenv("LOGIN");
+        user   = getenv("USER");
+        login  = getenv("LOGIN");
         subdir = (user ? user : login);
 
         if (subdir) {
@@ -431,11 +431,11 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
         }
         else {
             /* We didn't append the prefix yet */
-            HDstrncpy(fullname, prefix, size);
+            strncpy(fullname, prefix, size);
             fullname[size - 1] = '\0';
         }
 
-        if ((HDstrlen(fullname) + HDstrlen(base_name) + 1) < size) {
+        if ((strlen(fullname) + strlen(base_name) + 1) < size) {
             /* Append the base_name with a slash first. Multiple slashes are
              * handled below. */
             h5_stat_t buf;
@@ -445,31 +445,31 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
                 if (HDmkdir(fullname, (mode_t)0755) < 0 && errno != EEXIST) {
                     /* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
                      * Default to PREFIX's original prefix value. */
-                    HDstrcpy(fullname, prefix);
+                    strcpy(fullname, prefix);
                 }
 
-            HDstrcat(fullname, "/");
-            HDstrcat(fullname, base_name);
+            strcat(fullname, "/");
+            strcat(fullname, base_name);
         }
         else {
             /* Buffer is too small */
             return NULL;
         }
     }
-    else if (HDstrlen(base_name) >= size) {
+    else if (strlen(base_name) >= size) {
         /* Buffer is too small */
         return NULL;
     }
     else {
-        HDstrcpy(fullname, base_name);
+        strcpy(fullname, base_name);
     }
 
     /* Append a suffix */
     if (suffix) {
-        if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+        if (strlen(fullname) + strlen(suffix) >= size)
             return NULL;
 
-        HDstrcat(fullname, suffix);
+        strcat(fullname, suffix);
     }
 
     /* Remove any double slashes in the filename */
@@ -887,7 +887,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby
                     }     /* end if */
                 }         /* end else */
 
-                HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
+                snprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
                 h5ds_id = H5DCREATE(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, h5dcpl);
 
                 if (h5ds_id < 0) {
@@ -1862,7 +1862,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt
                 break;
 
             case PHDF5:
-                HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
+                snprintf(dname, sizeof(dname), "Dataset_%ld", ndset);
                 h5ds_id = H5DOPEN(fd->h5fd, dname);
                 if (h5ds_id < 0) {
                     fprintf(stderr, "HDF5 Dataset open failed\n");
diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c
index 37e6aeb..e72de32 100644
--- a/tools/src/h5perf/pio_perf.c
+++ b/tools/src/h5perf/pio_perf.c
@@ -83,12 +83,12 @@
 /* report 0.0 in case t is zero too */
 #define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL((t), 0.0) ? 0.0 : ((((double)bytes) / ONE_MB) / (t)))
 
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
-#ifndef FALSE
-#define FALSE (!TRUE)
-#endif /* FALSE */
+#ifndef true
+#define true 1
+#endif /* true */
+#ifndef false
+#define false (!true)
+#endif /* false */
 
 /* global variables */
 FILE    *output;              /* output file                          */
@@ -736,10 +736,10 @@ h5_set_info_object(void)
     int   ret_value = 0;
 
     /* handle any MPI INFO hints via $HDF5_MPI_INFO */
-    if ((envp = HDgetenv("HDF5_MPI_INFO")) != NULL) {
+    if ((envp = getenv("HDF5_MPI_INFO")) != NULL) {
         char *next, *valp;
 
-        valp = envp = next = HDstrdup(envp);
+        valp = envp = next = strdup(envp);
 
         if (!valp)
             return 0;
@@ -764,7 +764,7 @@ h5_set_info_object(void)
             if (*next == ';')
                 ++next;
 
-            namep = HDstrncpy(key_val, valp, len);
+            namep = strncpy(key_val, valp, len);
 
             /* pass up any beginning whitespaces */
             while (*namep && (*namep == ' ' || *namep == '\t'))
@@ -774,13 +774,13 @@ h5_set_info_object(void)
                 continue; /* was all white space, so move to next k/v pair */
 
             /* eat up any ending white spaces */
-            endp = &namep[HDstrlen(namep) - 1];
+            endp = &namep[strlen(namep) - 1];
 
             while (endp && (*endp == ' ' || *endp == '\t'))
                 *endp-- = '\0';
 
             /* find the '=' */
-            valp = HDstrchr(namep, '=');
+            valp = strchr(namep, '=');
 
             if (valp != NULL) { /* it's a valid key/value pairing */
                 char *tmp_val = valp + 1;
@@ -1049,7 +1049,7 @@ output_report(const char *fmt, ...)
 
         va_start(ap, fmt);
         H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
-        HDvfprintf(output, fmt, ap);
+        vfprintf(output, fmt, ap);
         H5_GCC_CLANG_DIAG_ON("format-nonliteral")
         va_end(ap);
     }
@@ -1072,7 +1072,7 @@ print_indent(int indent)
         indent *= TAB_SPACE;
 
         for (; indent > 0; --indent)
-            HDfputc(' ', output);
+            fputc(' ', output);
     }
 }
 
@@ -1215,7 +1215,7 @@ report_parameters(struct options *opts)
         fprintf(output, "Contiguous\n");
 
     {
-        char *prefix = HDgetenv("HDF5_PARAPREFIX");
+        char *prefix = getenv("HDF5_PARAPREFIX");
 
         fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set"));
     }
@@ -1255,13 +1255,13 @@ parse_command_line(int argc, const char *const *argv)
     cl_opts->interleaved   = 0;     /* Default to contiguous blocks in dataset */
     cl_opts->collective    = 0;     /* Default to independent I/O access */
     cl_opts->dim2d         = 0;     /* Default to 1D */
-    cl_opts->print_times   = FALSE; /* Printing times is off by default */
-    cl_opts->print_raw     = FALSE; /* Printing raw data throughput is off by default */
+    cl_opts->print_times   = false; /* Printing times is off by default */
+    cl_opts->print_raw     = false; /* Printing raw data throughput is off by default */
     cl_opts->h5_alignment  = 1;     /* No alignment for HDF5 objects by default */
     cl_opts->h5_threshold  = 1;     /* No threshold for aligning HDF5 objects by default */
-    cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
-    cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
-    cl_opts->verify        = FALSE; /* No Verify data correctness by default */
+    cl_opts->h5_use_chunks = false; /* Don't chunk the HDF5 dataset by default */
+    cl_opts->h5_write_only = false; /* Do both read and write by default */
+    cl_opts->verify        = false; /* No Verify data correctness by default */
 
     while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
@@ -1313,7 +1313,7 @@ parse_command_line(int argc, const char *const *argv)
                 break;
             case 'c':
                 /* Turn on chunked HDF5 dataset creation */
-                cl_opts->h5_use_chunks = TRUE;
+                cl_opts->h5_use_chunks = true;
                 break;
             case 'C':
                 cl_opts->collective = 1;
@@ -1334,7 +1334,7 @@ parse_command_line(int argc, const char *const *argv)
                         if (isalnum(*end) && i < 10)
                             buf[i++] = *end;
 
-                    if (HDstrlen(buf) > 1 || isdigit(buf[0])) {
+                    if (strlen(buf) > 1 || isdigit(buf[0])) {
                         size_t j;
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
@@ -1354,15 +1354,15 @@ parse_command_line(int argc, const char *const *argv)
                         switch (*buf) {
                             case 'r':
                                 /* Turn on raw data throughput info */
-                                cl_opts->print_raw = TRUE;
+                                cl_opts->print_raw = true;
                                 break;
                             case 't':
                                 /* Turn on time printing */
-                                cl_opts->print_times = TRUE;
+                                cl_opts->print_times = true;
                                 break;
                             case 'v':
                                 /* Turn on verify data correctness*/
-                                cl_opts->verify = TRUE;
+                                cl_opts->verify = true;
                                 break;
                             default:
                                 fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf);
@@ -1406,7 +1406,7 @@ parse_command_line(int argc, const char *const *argv)
                 cl_opts->h5_threshold = parse_size_directive(H5_optarg);
                 break;
             case 'w':
-                cl_opts->h5_write_only = TRUE;
+                cl_opts->h5_write_only = true;
                 break;
             case 'x':
                 cl_opts->min_xfer_size = (size_t)parse_size_directive(H5_optarg);
diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c
index 1f73a62..2363f6a 100644
--- a/tools/src/h5perf/sio_engine.c
+++ b/tools/src/h5perf/sio_engine.c
@@ -139,9 +139,7 @@ do_sio(parameters param, results *res)
     /* IO type */
     iot = param.io_type;
 
-    if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
-        GOTOERROR(FAIL);
-
+    /* MUST initialize fd early since we check its file IDs in cleanup code */
     switch (iot) {
         case POSIXIO:
             fd.posixfd  = -1;
@@ -157,6 +155,9 @@ do_sio(parameters param, results *res)
             GOTOERROR(FAIL);
     }
 
+    if (NULL == (fname = calloc(FILENAME_MAX, sizeof(char))))
+        GOTOERROR(FAIL);
+
     linear_buf_size = 1;
 
     for (i = 0; i < param.rank; i++) {
@@ -197,7 +198,7 @@ do_sio(parameters param, results *res)
      */
     /* Open file for write */
 
-    HDstrcpy(base_name, "#sio_tmp");
+    strcpy(base_name, "#sio_tmp");
     sio_create_filename(iot, base_name, fname, FILENAME_MAX, &param);
 
     if (sio_debug_level > 0)
@@ -310,7 +311,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
     }
 
     /* First use the environment variable and then try the constant */
-    prefix = HDgetenv("HDF5_PREFIX");
+    prefix = getenv("HDF5_PREFIX");
 
 #ifdef HDF5_PREFIX
     if (!prefix)
@@ -324,8 +325,8 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
          * directory instead. */
         char *user, *login, *subdir;
 
-        user   = HDgetenv("USER");
-        login  = HDgetenv("LOGIN");
+        user   = getenv("USER");
+        login  = getenv("LOGIN");
         subdir = (user ? user : login);
 
         if (subdir) {
@@ -339,11 +340,11 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
         }
         else {
             /* We didn't append the prefix yet */
-            HDstrncpy(fullname, prefix, size);
+            strncpy(fullname, prefix, size);
             fullname[size - 1] = '\0';
         }
 
-        if ((HDstrlen(fullname) + HDstrlen(base_name) + 1) < size) {
+        if ((strlen(fullname) + strlen(base_name) + 1) < size) {
             /* Append the base_name with a slash first. Multiple slashes are
              * handled below. */
             h5_stat_t buf;
@@ -353,11 +354,11 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
                 if (HDmkdir(fullname, 0755) < 0 && errno != EEXIST) {
                     /* We couldn't make the "/tmp/${USER,LOGIN}" subdirectory.
                      * Default to PREFIX's original prefix value. */
-                    HDstrcpy(fullname, prefix);
+                    strcpy(fullname, prefix);
                 }
 
-            HDstrcat(fullname, "/");
-            HDstrcat(fullname, base_name);
+            strcat(fullname, "/");
+            strcat(fullname, base_name);
         }
         else {
             /* Buffer is too small */
@@ -369,15 +370,15 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si
         return NULL;
     }
     else {
-        HDstrcpy(fullname, base_name);
+        strcpy(fullname, base_name);
     }
 
     /* Append a suffix */
     if (suffix) {
-        if (HDstrlen(fullname) + HDstrlen(suffix) >= size)
+        if (strlen(fullname) + strlen(suffix) >= size)
             return NULL;
 
-        HDstrcat(fullname, suffix);
+        strcat(fullname, suffix);
     }
 
     /* Remove any double slashes in the filename */
@@ -513,7 +514,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer)
                 } /* end if */
             }     /* end if */
 
-            HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (unsigned long)parms->num_bytes);
+            snprintf(dname, sizeof(dname), "Dataset_%ld", (unsigned long)parms->num_bytes);
             h5ds_id =
                 H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT);
 
@@ -836,7 +837,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer)
             break;
 
         case HDF5:
-            HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes);
+            snprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes);
             h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT);
             if (h5ds_id < 0) {
                 fprintf(stderr, "HDF5 Dataset open failed\n");
@@ -1129,7 +1130,7 @@ set_vfd(parameters *param)
     }
     else if (vfd == core) {
         /* In-core temporary file with 1MB increment */
-        if (H5Pset_fapl_core(my_fapl, (size_t)1024 * 1024, TRUE) < 0)
+        if (H5Pset_fapl_core(my_fapl, (size_t)1024 * 1024, true) < 0)
             return -1;
     }
     else if (vfd == split) {
@@ -1153,18 +1154,18 @@ set_vfd(parameters *param)
         memset(memb_name, 0, sizeof memb_name);
         memset(memb_addr, 0, sizeof memb_addr);
 
-        assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+        assert(strlen(multi_letters) == H5FD_MEM_NTYPES);
 
         if (NULL == (sv = calloc(1, sizeof(*sv))))
             return -1;
         for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
             memb_fapl[mt] = H5P_DEFAULT;
-            HDsnprintf(sv->arr[mt], 1024, "%%s-%c.h5", multi_letters[mt]);
+            snprintf(sv->arr[mt], 1024, "%%s-%c.h5", multi_letters[mt]);
             memb_name[mt] = sv->arr[mt];
             memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
         }
 
-        if (H5Pset_fapl_multi(my_fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0) {
+        if (H5Pset_fapl_multi(my_fapl, memb_map, memb_fapl, memb_name, memb_addr, false) < 0) {
             free(sv);
             return -1;
         }
@@ -1175,7 +1176,7 @@ set_vfd(parameters *param)
         hsize_t fam_size = 1 * 1024 * 1024; /*100 MB*/
 
         /* Family of files, each 1MB and using the default driver */
-        /* if ((val=HDstrtok(NULL, " \t\n\r")))
+        /* if ((val=strtok(NULL, " \t\n\r")))
             fam_size = (hsize_t)(strtod(val, NULL) * 1024*1024); */
         if (H5Pset_fapl_family(my_fapl, fam_size, H5P_DEFAULT) < 0)
             return -1;
@@ -1259,7 +1260,7 @@ do_cleanupfile(iotype iot, char *filename)
         goto done;
 
     if (clean_file_g == -1)
-        clean_file_g = (HDgetenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
+        clean_file_g = (getenv(HDF5_NOCLEANUP) == NULL) ? 1 : 0;
 
     if (clean_file_g) {
 
@@ -1274,7 +1275,7 @@ do_cleanupfile(iotype iot, char *filename)
                 if (driver == H5FD_FAMILY) {
                     for (j = 0; /*void*/; j++) {
                         H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
-                        HDsnprintf(temp, temp_sz, filename, j);
+                        snprintf(temp, temp_sz, filename, j);
                         H5_GCC_CLANG_DIAG_ON("format-nonliteral")
 
                         if (HDaccess(temp, F_OK) < 0)
@@ -1284,7 +1285,7 @@ do_cleanupfile(iotype iot, char *filename)
                     }
                 }
                 else if (driver == H5FD_CORE) {
-                    hbool_t backing; /* Whether the core file has backing store */
+                    bool backing; /* Whether the core file has backing store */
 
                     H5Pget_fapl_core(fapl, NULL, &backing);
 
@@ -1294,10 +1295,10 @@ do_cleanupfile(iotype iot, char *filename)
                 }
                 else if (driver == H5FD_MULTI) {
                     H5FD_mem_t mt;
-                    assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+                    assert(strlen(multi_letters) == H5FD_MEM_NTYPES);
 
                     for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
-                        HDsnprintf(temp, temp_sz, "%s-%c.h5", filename, multi_letters[mt]);
+                        snprintf(temp, temp_sz, "%s-%c.h5", filename, multi_letters[mt]);
                         HDremove(temp); /*don't care if it fails*/
                     }
                 }
diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c
index 5ffad71..ad536ba 100644
--- a/tools/src/h5perf/sio_perf.c
+++ b/tools/src/h5perf/sio_perf.c
@@ -67,12 +67,12 @@
 /* report 0.0 in case t is zero too */
 #define MB_PER_SEC(bytes, t) (H5_DBL_ABS_EQUAL(t, 0.0) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
 
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
-#ifndef FALSE
-#define FALSE (!TRUE)
-#endif /* FALSE */
+#ifndef true
+#define true 1
+#endif /* true */
+#ifndef false
+#define false (!true)
+#endif /* false */
 
 /* global variables */
 FILE *output;              /* output file                          */
@@ -203,7 +203,7 @@ main(int argc, char *argv[])
     if (opts->output_file) {
         if ((output = fopen(opts->output_file, "w")) == NULL) {
             fprintf(stderr, "%s: cannot open output file\n", progname);
-            HDperror(opts->output_file);
+            perror(opts->output_file);
             goto finish;
         }
     }
@@ -627,7 +627,7 @@ output_report(const char *fmt, ...)
 
     va_start(ap, fmt);
     H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
-    HDvfprintf(output, fmt, ap);
+    vfprintf(output, fmt, ap);
     H5_GCC_CLANG_DIAG_ON("format-nonliteral")
     va_end(ap);
 }
@@ -644,7 +644,7 @@ print_indent(int indent)
     indent *= TAB_SPACE;
 
     for (; indent > 0; --indent)
-        HDfputc(' ', output);
+        fputc(' ', output);
 }
 
 static void
@@ -777,7 +777,7 @@ report_parameters(struct options *opts)
     }
 
     {
-        char *prefix = HDgetenv("HDF5_PREFIX");
+        char *prefix = getenv("HDF5_PREFIX");
 
         fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set"));
     }
@@ -824,14 +824,14 @@ parse_command_line(int argc, const char *const *argv)
 
     cl_opts->vfd = sec2;
 
-    cl_opts->print_times   = FALSE; /* Printing times is off by default */
-    cl_opts->print_raw     = FALSE; /* Printing raw data throughput is off by default */
+    cl_opts->print_times   = false; /* Printing times is off by default */
+    cl_opts->print_raw     = false; /* Printing raw data throughput is off by default */
     cl_opts->h5_alignment  = 1;     /* No alignment for HDF5 objects by default */
     cl_opts->h5_threshold  = 1;     /* No threshold for aligning HDF5 objects by default */
-    cl_opts->h5_use_chunks = FALSE; /* Don't chunk the HDF5 dataset by default */
-    cl_opts->h5_write_only = FALSE; /* Do both read and write by default */
-    cl_opts->h5_extendable = FALSE; /* Use extendable dataset */
-    cl_opts->verify        = FALSE; /* No Verify data correctness by default */
+    cl_opts->h5_use_chunks = false; /* Don't chunk the HDF5 dataset by default */
+    cl_opts->h5_write_only = false; /* Do both read and write by default */
+    cl_opts->h5_extendable = false; /* Use extendable dataset */
+    cl_opts->verify        = false; /* No Verify data correctness by default */
 
     while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
@@ -921,7 +921,7 @@ parse_command_line(int argc, const char *const *argv)
                         if (isalnum(*end) && i < 10)
                             buf[i++] = *end;
 
-                    if (HDstrlen(buf) > 1 || isdigit(buf[0])) {
+                    if (strlen(buf) > 1 || isdigit(buf[0])) {
                         size_t j;
 
                         for (j = 0; j < 10 && buf[j] != '\0'; ++j)
@@ -941,15 +941,15 @@ parse_command_line(int argc, const char *const *argv)
                         switch (*buf) {
                             case 'r':
                                 /* Turn on raw data throughput info */
-                                cl_opts->print_raw = TRUE;
+                                cl_opts->print_raw = true;
                                 break;
                             case 't':
                                 /* Turn on time printing */
-                                cl_opts->print_times = TRUE;
+                                cl_opts->print_times = true;
                                 break;
                             case 'v':
                                 /* Turn on verify data correctness*/
-                                cl_opts->verify = TRUE;
+                                cl_opts->verify = true;
                                 break;
                             default:
                                 fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf);
@@ -1029,10 +1029,10 @@ parse_command_line(int argc, const char *const *argv)
                 }
                 break;
             case 'w':
-                cl_opts->h5_write_only = TRUE;
+                cl_opts->h5_write_only = true;
                 break;
             case 't':
-                cl_opts->h5_extendable = TRUE;
+                cl_opts->h5_extendable = true;
                 break;
             case 'x': {
                 const char *end = H5_optarg;
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index 7849e29..6747c25 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -67,7 +67,7 @@ h5repack(const char *infile, const char *outfile, pack_opt_t *options)
  *-------------------------------------------------------------------------
  */
 int
-h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
+h5repack_init(pack_opt_t *options, int verbose, bool latest)
 {
     int k, n;
 
@@ -373,7 +373,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_
     H5O_info2_t   oinfo; /* object info */
     int           j;
     unsigned      u;
-    hbool_t       is_ref     = 0;
+    bool          is_ref     = 0;
     H5T_class_t   type_class = -1;
     int           ret_value  = 0;
 
@@ -523,7 +523,7 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_
 
             /* Check if we have VL data and string in the attribute's  datatype that must
              * be reclaimed */
-            if (TRUE == h5tools_detect_vlen(wtype_id))
+            if (true == h5tools_detect_vlen(wtype_id))
                 H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
 
             free(buf);
@@ -562,7 +562,7 @@ done:
             /* Check if we have VL data and string in the attribute's
              * datatype that must be reclaimed
              */
-            if (TRUE == h5tools_detect_vlen(wtype_id))
+            if (true == h5tools_detect_vlen(wtype_id))
                 H5Treclaim(wtype_id, space_id, H5P_DEFAULT, buf);
 
             /* Free buf */
diff --git a/tools/src/h5repack/h5repack.h b/tools/src/h5repack/h5repack.h
index 0387c68..fa79c6f 100644
--- a/tools/src/h5repack/h5repack.h
+++ b/tools/src/h5repack/h5repack.h
@@ -35,7 +35,7 @@
 /* File space default information */
 #define FS_PAGESIZE_DEF  4096
 #define FS_STRATEGY_DEF  H5F_FSPACE_STRATEGY_FSM_AGGR
-#define FS_PERSIST_DEF   FALSE
+#define FS_PERSIST_DEF   false
 #define FS_THRESHOLD_DEF 1
 
 /*-------------------------------------------------------------------------
@@ -111,11 +111,11 @@ typedef struct {
     chunk_info_t   chunk_g;                          /* global chunk INFO for the ALL case */
     H5D_layout_t   layout_g;                         /* global layout information for the ALL case */
     int            verbose;                          /* verbose mode */
-    hbool_t        merge;                            /* Merge external file. */
-    hbool_t        prune;                            /* Don't follow external file. */
+    bool           merge;                            /* Merge external file. */
+    bool           prune;                            /* Don't follow external file. */
     hsize_t        min_comp;                         /* minimum size to compress, in bytes */
     int            use_native;                       /* use a native type in write */
-    hbool_t        latest;                           /* pack file with the latest file format */
+    bool           latest;                           /* pack file with the latest file format */
     H5F_libver_t   low_bound;                        /* The file's low bound as in H5Fset_libver_bounds() */
     H5F_libver_t   high_bound;                       /* The file's high bound as in H5Fset_libver_bounds() */
     hid_t          fin_fapl;                         /* FAPL to use for opening the input file */
@@ -153,7 +153,7 @@ extern "C" {
 int h5repack(const char *infile, const char *outfile, pack_opt_t *options);
 int h5repack_addfilter(const char *str, pack_opt_t *options);
 int h5repack_addlayout(const char *str, pack_opt_t *options);
-int h5repack_init(pack_opt_t *options, int verbose, hbool_t latest);
+int h5repack_init(pack_opt_t *options, int verbose, bool latest);
 int h5repack_end(pack_opt_t *options);
 int h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options);
 int h5repack_cmp_pl(const char *fname1, hid_t fname1_fapl, const char *fname2, hid_t fname2_fapl);
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index dd32a3c..3921913 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -67,11 +67,11 @@ copy_objects(const char *fnamein, const char *fnameout, pack_opt_t *options)
     trav_table_t         *travt   = NULL;
     hsize_t               ub_size = 0;     /* size of user block */
     H5F_fspace_strategy_t set_strategy;    /* Strategy to be set in output file */
-    hbool_t               set_persist;     /* Persist free-space status to be set in output file */
+    bool                  set_persist;     /* Persist free-space status to be set in output file */
     hsize_t               set_threshold;   /* Free-space section threshold to be set in output file */
     hsize_t               set_pagesize;    /* File space page size to be set in output file */
     H5F_fspace_strategy_t in_strategy;     /* Strategy from input file */
-    hbool_t               in_persist;      /* Persist free-space status from input file */
+    bool                  in_persist;      /* Persist free-space status from input file */
     hsize_t               in_threshold;    /* Free-space section threshold from input file */
     hsize_t               in_pagesize;     /* File space page size from input file */
     unsigned              crt_order_flags; /* group creation order flag */
@@ -274,7 +274,7 @@ copy_objects(const char *fnamein, const char *fnameout, pack_opt_t *options)
     if (options->fs_persist == -1) /* A default "persist" is specified by user */
         set_persist = FS_PERSIST_DEF;
     else if (options->fs_persist != 0) /* Set "persist" as specified by user */
-        set_persist = (hbool_t)options->fs_persist;
+        set_persist = (bool)options->fs_persist;
 
     if (options->fs_threshold == -1) /* A "0" threshold is specified by user */
         set_threshold = (hsize_t)0;
@@ -654,7 +654,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
     int                is_ref = 0;
     htri_t             is_named;
     htri_t             is_vlen = 0;
-    hbool_t            limit_maxdims;
+    bool               limit_maxdims;
     hsize_t            size_dset;
     int                ret_value = 0;
 
@@ -683,7 +683,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
         for (i = 0; i < travt->nobjs; i++) {
             /* init variables per obj */
             buf           = NULL;
-            limit_maxdims = FALSE;
+            limit_maxdims = false;
 
             switch (travt->objs[i].type) {
                 case H5TRAV_TYPE_UNKNOWN:
@@ -725,7 +725,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                      * and copy its attributes using that ID
                      *-------------------------------------------------------------------------
                      */
-                    if (HDstrcmp(travt->objs[i].name, "/") == 0) {
+                    if (strcmp(travt->objs[i].name, "/") == 0) {
                         if ((grp_out = H5Gopen2(fidout, "/", H5P_DEFAULT)) < 0)
                             H5TOOLS_GOTO_ERROR((-1), "H5Gopen2 failed");
                     }
@@ -763,7 +763,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                  *-------------------------------------------------------------------------
                  */
                 case H5TRAV_TYPE_DATASET: {
-                    hbool_t use_h5ocopy;
+                    bool use_h5ocopy;
 
                     read_time  = 0.0;
                     write_time = 0.0;
@@ -778,7 +778,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                     /* check if filters were requested for individual objects */
                     if (options->op_tbl->objs) {
                         for (u = 0; u < options->op_tbl->nelems; u++) {
-                            if (HDstrcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0)
+                            if (strcmp(travt->objs[i].name, options->op_tbl->objs[u].path) == 0)
                                 for (ifil = 0; ifil < options->op_tbl->objs[ifil].nfilters; ifil++) {
                                     if (options->op_tbl->objs[u].filter[ifil].filtn > 0)
                                         req_filter = 1;
@@ -867,7 +867,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                             H5TOOLS_GOTO_ERROR((-1), "H5Pget_vol_id failed");
 
                         if (in_vol_id != out_vol_id)
-                            use_h5ocopy = FALSE;
+                            use_h5ocopy = false;
 
                         if (in_vol_id != default_vol_id)
                             if (H5VLclose(in_vol_id) < 0)
@@ -979,15 +979,15 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                         if (options->op_tbl->nelems > 0) {
                                             /* if current obj match specified obj */
                                             if (options_get_object(travt->objs[i].name, options->op_tbl))
-                                                limit_maxdims = TRUE;
+                                                limit_maxdims = true;
                                         }
                                         else /* no dataset is specified */
-                                            limit_maxdims = TRUE;
+                                            limit_maxdims = true;
 
                                         /* if convert to COMPACT */
                                         if (options->layout_g == H5D_COMPACT)
                                             if (size_dset > MAX_COMPACT_DSIZE)
-                                                limit_maxdims = FALSE;
+                                                limit_maxdims = false;
 
                                         /* unset unlimited max dims */
                                         if (limit_maxdims)
@@ -1032,7 +1032,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                     /* Set up collective write if using filters in parallel */
                                     {
 #ifdef H5_HAVE_PARALLEL
-                                        hbool_t parallel = (H5FD_MPIO == H5Pget_driver(options->fout_fapl));
+                                        bool parallel = (H5FD_MPIO == H5Pget_driver(options->fout_fapl));
 
                                         if (parallel && apply_s && apply_f) {
                                             if ((dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0)
@@ -1070,7 +1070,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
 
                                         /* Check if we have VL data in the dataset's
                                          * datatype that must be reclaimed */
-                                        if (TRUE == H5Tdetect_class(wtype_id, H5T_VLEN))
+                                        if (true == H5Tdetect_class(wtype_id, H5T_VLEN))
                                             if (H5Treclaim(wtype_id, f_space_id, H5P_DEFAULT, buf) < 0)
                                                 H5TOOLS_GOTO_ERROR((-1), "H5Treclaim failed");
 
@@ -1104,8 +1104,8 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                             H5I_INVALID_HID; /* dataset creation property list ID */
 
                                         /* check if we have VL data in the dataset's datatype */
-                                        if (H5Tdetect_class(wtype_id, H5T_VLEN) == TRUE)
-                                            vl_data = TRUE;
+                                        if (H5Tdetect_class(wtype_id, H5T_VLEN) == true)
+                                            vl_data = true;
 
                                         /* check first if writing dataset is chunked,
                                          * if so use its chunk layout for better performance. */
@@ -1420,7 +1420,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                             }
 
                             /* Set flag for intermediate group creation */
-                            if (H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0)
+                            if (H5Pset_create_intermediate_group(lcpl_id, true) < 0)
                                 H5TOOLS_GOTO_ERROR((-1), "H5Pset_create_intermediate_group failed");
 
                             if (H5Ocopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, ocpl_id,
@@ -1528,7 +1528,7 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_
     char         f_objname[256]; /* filter objname */
     int          i;
 
-    HDstrcpy(strfilter, "\0");
+    strcpy(strfilter, "\0");
 
     /* get information about input filters */
     if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
@@ -1539,65 +1539,65 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_
 
         if ((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts, cd_values,
                                     sizeof(f_objname), f_objname, NULL)) < 0) {
-            HDstrcat(strfilter, "ERROR ");
+            strcat(strfilter, "ERROR ");
             continue;
         }
 
         switch (filtn) {
             case H5Z_FILTER_NONE:
-                HDstrcat(strfilter, "NONE ");
+                strcat(strfilter, "NONE ");
                 break;
 
             case H5Z_FILTER_DEFLATE:
-                HDstrcat(strfilter, "GZIP ");
+                strcat(strfilter, "GZIP ");
 
 #if defined(PRINT_DEBUG)
                 {
                     unsigned level = cd_values[0];
 
-                    HDsnprintf(temp, sizeof(temp), "(%d)", level);
-                    HDstrcat(strfilter, temp);
+                    snprintf(temp, sizeof(temp), "(%d)", level);
+                    strcat(strfilter, temp);
                 }
 #endif
                 break;
 
             case H5Z_FILTER_SZIP:
-                HDstrcat(strfilter, "SZIP ");
+                strcat(strfilter, "SZIP ");
 
 #if defined(PRINT_DEBUG)
                 {
                     unsigned options_mask = cd_values[0]; /* from dcpl, not filt*/
                     unsigned ppb          = cd_values[1];
 
-                    HDsnprintf(temp, sizeof(temp), "(%d,", ppb);
-                    HDstrcat(strfilter, temp);
+                    snprintf(temp, sizeof(temp), "(%d,", ppb);
+                    strcat(strfilter, temp);
                     if (options_mask & H5_SZIP_EC_OPTION_MASK)
-                        HDstrcpy(temp, "EC) ");
+                        strcpy(temp, "EC) ");
                     else if (options_mask & H5_SZIP_NN_OPTION_MASK)
-                        HDstrcpy(temp, "NN) ");
+                        strcpy(temp, "NN) ");
                 }
-                HDstrcat(strfilter, temp);
+                strcat(strfilter, temp);
 #endif
                 break;
 
             case H5Z_FILTER_SHUFFLE:
-                HDstrcat(strfilter, "SHUF ");
+                strcat(strfilter, "SHUF ");
                 break;
 
             case H5Z_FILTER_FLETCHER32:
-                HDstrcat(strfilter, "FLET ");
+                strcat(strfilter, "FLET ");
                 break;
 
             case H5Z_FILTER_NBIT:
-                HDstrcat(strfilter, "NBIT ");
+                strcat(strfilter, "NBIT ");
                 break;
 
             case H5Z_FILTER_SCALEOFFSET:
-                HDstrcat(strfilter, "SCALEOFFSET ");
+                strcat(strfilter, "SCALEOFFSET ");
                 break;
 
             default:
-                HDstrcat(strfilter, "UD ");
+                strcat(strfilter, "UD ");
                 break;
         } /* end switch */
     }     /* end for each filter */
@@ -1610,10 +1610,10 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_
     else {
         char str[512], temp[512];
 
-        HDstrcpy(str, "dset     ");
-        HDstrcat(str, strfilter);
-        HDsnprintf(temp, sizeof(temp), "  (%.3f:1)", ratio);
-        HDstrcat(str, temp);
+        strcpy(str, "dset     ");
+        strcat(str, strfilter);
+        snprintf(temp, sizeof(temp), "  (%.3f:1)", ratio);
+        strcat(str, temp);
         if (options->verbose == 2)
             printf(FORMAT_OBJ_TIME, str, read_time, write_time, objname);
         else
diff --git a/tools/src/h5repack/h5repack_filters.c b/tools/src/h5repack/h5repack_filters.c
index 512e4fa..9669d0c 100644
--- a/tools/src/h5repack/h5repack_filters.c
+++ b/tools/src/h5repack/h5repack_filters.c
@@ -57,7 +57,7 @@ aux_copy_obj(hid_t        dcpl_id,        /* dataset creation property list */
     }
 
     objout->nfilters = nfilters;
-    HDstrcpy(objout->path, name);
+    strcpy(objout->path, name);
 
     if ((layout = H5Pget_layout(dcpl_id)) < 0)
         H5TOOLS_GOTO_ERROR((-1), "H5Pget_layout failed");
@@ -92,7 +92,7 @@ aux_find_obj(const char  *name,        /* object name from traverse list */
     unsigned int i;
 
     for (i = 0; i < options->op_tbl->nelems; i++) {
-        if (HDstrcmp(options->op_tbl->objs[i].path, name) == 0) {
+        if (strcmp(options->op_tbl->objs[i].path, name) == 0) {
             *obj = options->op_tbl->objs[i];
             return (int)i;
         }
@@ -104,7 +104,7 @@ aux_find_obj(const char  *name,        /* object name from traverse list */
         if (pname[0] == '/')
             pname++;
 
-        if (HDstrcmp(pdest, pname) == 0) {
+        if (strcmp(pdest, pname) == 0) {
             *obj = options->op_tbl->objs[i];
             return (int)i;
         }
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index 85bc15d..85ab93a 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -400,11 +400,11 @@ read_info(const char *filename, pack_opt_t *options)
 
     /* cycle until end of file reached */
     while (1) {
-        if (EOF == HDfscanf(fp, "%9s", stype))
+        if (EOF == fscanf(fp, "%9s", stype))
             break;
 
         /* Info indicator must be for layout or filter */
-        if (HDstrcmp(stype, "-l") != 0 && HDstrcmp(stype, "-f") != 0) {
+        if (strcmp(stype, "-l") != 0 && strcmp(stype, "-f") != 0) {
             error_msg("bad file format for %s", filename);
             h5tools_setstatus(EXIT_FAILURE);
             ret_value = EXIT_FAILURE;
@@ -415,7 +415,7 @@ read_info(const char *filename, pack_opt_t *options)
         i = 0;
         c = '0';
         while (c != ' ') {
-            if (HDfscanf(fp, "%c", &c) < 0 && ferror(fp)) {
+            if (fscanf(fp, "%c", &c) < 0 && ferror(fp)) {
                 error_msg("fscanf error\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret_value = EXIT_FAILURE;
@@ -427,7 +427,7 @@ read_info(const char *filename, pack_opt_t *options)
         c = '0';
         /* go until end */
         while (c != ' ') {
-            if (HDfscanf(fp, "%c", &c) < 0 && ferror(fp)) {
+            if (fscanf(fp, "%c", &c) < 0 && ferror(fp)) {
                 error_msg("fscanf error\n");
                 h5tools_setstatus(EXIT_FAILURE);
                 ret_value = EXIT_FAILURE;
@@ -441,7 +441,7 @@ read_info(const char *filename, pack_opt_t *options)
         }
         comp_info[i - 1] = '\0'; /*cut the last " */
 
-        if (!HDstrcmp(stype, "-l")) {
+        if (!strcmp(stype, "-l")) {
             if (h5repack_addlayout(comp_info, options) == -1) {
                 error_msg("could not add chunk option\n");
                 h5tools_setstatus(EXIT_FAILURE);
@@ -481,9 +481,9 @@ set_sort_by(const char *form)
 {
     H5_index_t idx_type = H5_INDEX_UNKNOWN;
 
-    if (!HDstrcmp(form, "name"))
+    if (!strcmp(form, "name"))
         idx_type = H5_INDEX_NAME;
-    else if (!HDstrcmp(form, "creation_order"))
+    else if (!strcmp(form, "creation_order"))
         idx_type = H5_INDEX_CRT_ORDER;
 
     return idx_type;
@@ -504,9 +504,9 @@ set_sort_order(const char *form)
 {
     H5_iter_order_t iter_order = H5_ITER_UNKNOWN;
 
-    if (!HDstrcmp(form, "ascending"))
+    if (!strcmp(form, "ascending"))
         iter_order = H5_ITER_INC;
-    else if (!HDstrcmp(form, "descending"))
+    else if (!strcmp(form, "descending"))
         iter_order = H5_ITER_DEC;
 
     return iter_order;
@@ -525,10 +525,10 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
     h5tools_vol_info_t out_vol_info;
     h5tools_vfd_info_t in_vfd_info;
     h5tools_vfd_info_t out_vfd_info;
-    hbool_t            custom_in_vol  = FALSE;
-    hbool_t            custom_in_vfd  = FALSE;
-    hbool_t            custom_out_vol = FALSE;
-    hbool_t            custom_out_vfd = FALSE;
+    bool               custom_in_vol  = false;
+    bool               custom_in_vfd  = false;
+    bool               custom_out_vol = false;
+    bool               custom_out_vfd = false;
     hid_t              tmp_fapl       = H5I_INVALID_HID;
     int                bound, opt;
     int                ret_value = 0;
@@ -620,7 +620,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 break;
 
             case 'L':
-                options->latest = TRUE;
+                options->latest = true;
                 break;
 
             case 'j':
@@ -646,30 +646,30 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 break;
 
             case 'X':
-                options->merge = TRUE;
+                options->merge = true;
                 break;
 
             case 'W':
-                options->prune = TRUE;
+                options->prune = true;
                 break;
 
             case 'c':
                 options->grp_compact = atoi(H5_optarg);
                 if (options->grp_compact > 0)
-                    options->latest = TRUE; /* must use latest format */
+                    options->latest = true; /* must use latest format */
                 break;
 
             case 'd':
                 options->grp_indexed = atoi(H5_optarg);
                 if (options->grp_indexed > 0)
-                    options->latest = TRUE; /* must use latest format */
+                    options->latest = true; /* must use latest format */
                 break;
 
             case 's': {
                 int   idx       = 0;
                 int   ssize     = 0;
-                char *msgPtr    = HDstrchr(H5_optarg, ':');
-                options->latest = TRUE; /* must use latest format */
+                char *msgPtr    = strchr(H5_optarg, ':');
+                options->latest = true; /* must use latest format */
                 if (msgPtr == NULL) {
                     ssize = atoi(H5_optarg);
                     for (idx = 0; idx < 5; idx++)
@@ -678,18 +678,18 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
                 else {
                     char msgType[10];
 
-                    HDstrcpy(msgType, msgPtr + 1);
+                    strcpy(msgType, msgPtr + 1);
                     msgPtr[0] = '\0';
                     ssize     = atoi(H5_optarg);
-                    if (!HDstrncmp(msgType, "dspace", 6))
+                    if (!strncmp(msgType, "dspace", 6))
                         options->msg_size[0] = ssize;
-                    else if (!HDstrncmp(msgType, "dtype", 5))
+                    else if (!strncmp(msgType, "dtype", 5))
                         options->msg_size[1] = ssize;
-                    else if (!HDstrncmp(msgType, "fill", 4))
+                    else if (!strncmp(msgType, "fill", 4))
                         options->msg_size[2] = ssize;
-                    else if (!HDstrncmp(msgType, "pline", 5))
+                    else if (!strncmp(msgType, "pline", 5))
                         options->msg_size[3] = ssize;
-                    else if (!HDstrncmp(msgType, "attr", 4))
+                    else if (!strncmp(msgType, "attr", 4))
                         options->msg_size[4] = ssize;
                 }
             } break;
@@ -723,14 +723,14 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             case 'S': {
                 char strategy[MAX_NC_NAME];
 
-                HDstrcpy(strategy, H5_optarg);
-                if (!HDstrcmp(strategy, "FSM_AGGR"))
+                strcpy(strategy, H5_optarg);
+                if (!strcmp(strategy, "FSM_AGGR"))
                     options->fs_strategy = H5F_FSPACE_STRATEGY_FSM_AGGR;
-                else if (!HDstrcmp(strategy, "PAGE"))
+                else if (!strcmp(strategy, "PAGE"))
                     options->fs_strategy = H5F_FSPACE_STRATEGY_PAGE;
-                else if (!HDstrcmp(strategy, "AGGR"))
+                else if (!strcmp(strategy, "AGGR"))
                     options->fs_strategy = H5F_FSPACE_STRATEGY_AGGR;
-                else if (!HDstrcmp(strategy, "NONE"))
+                else if (!strcmp(strategy, "NONE"))
                     options->fs_strategy = H5F_FSPACE_STRATEGY_NONE;
                 else {
                     error_msg("invalid file space management strategy `%s`\n", H5_optarg);
@@ -792,13 +792,13 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             case '1':
                 in_vol_info.type    = VOL_BY_VALUE;
                 in_vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                custom_in_vol       = TRUE;
+                custom_in_vol       = true;
                 break;
 
             case '2':
                 in_vol_info.type   = VOL_BY_NAME;
                 in_vol_info.u.name = H5_optarg;
-                custom_in_vol      = TRUE;
+                custom_in_vol      = true;
                 break;
 
             case '3':
@@ -808,13 +808,13 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             case '4':
                 out_vol_info.type    = VOL_BY_VALUE;
                 out_vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                custom_out_vol       = TRUE;
+                custom_out_vol       = true;
                 break;
 
             case '5':
                 out_vol_info.type   = VOL_BY_NAME;
                 out_vol_info.u.name = H5_optarg;
-                custom_out_vol      = TRUE;
+                custom_out_vol      = true;
                 break;
 
             case '6':
@@ -824,13 +824,13 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             case '7':
                 in_vfd_info.type    = VFD_BY_VALUE;
                 in_vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                custom_in_vfd       = TRUE;
+                custom_in_vfd       = true;
                 break;
 
             case '8':
                 in_vfd_info.type   = VFD_BY_NAME;
                 in_vfd_info.u.name = H5_optarg;
-                custom_in_vfd      = TRUE;
+                custom_in_vfd      = true;
                 break;
 
             case '9':
@@ -840,13 +840,13 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             case '0':
                 out_vfd_info.type    = VFD_BY_VALUE;
                 out_vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                custom_out_vfd       = TRUE;
+                custom_out_vfd       = true;
                 break;
 
             case 'Y':
                 out_vfd_info.type   = VFD_BY_NAME;
                 out_vfd_info.u.name = H5_optarg;
-                custom_out_vfd      = TRUE;
+                custom_out_vfd      = true;
                 break;
 
             case 'Z':
@@ -864,7 +864,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
             infile  = argv[H5_optind];
             outfile = argv[H5_optind + 1];
 
-            if (!HDstrcmp(infile, outfile)) {
+            if (!strcmp(infile, outfile)) {
                 error_msg("file names cannot be the same\n");
                 usage(h5tools_getprogname());
                 h5tools_setstatus(EXIT_FAILURE);
@@ -886,7 +886,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
     }
 
     /* If the input file uses the onion VFD, get the revision number */
-    if (in_vfd_info.u.name && !HDstrcmp(in_vfd_info.u.name, "onion")) {
+    if (in_vfd_info.u.name && !strcmp(in_vfd_info.u.name, "onion")) {
         if (in_vfd_info.info) {
             errno                      = 0;
             onion_fa_in_g.revision_num = strtoull(in_vfd_info.info, NULL, 10);
@@ -981,7 +981,7 @@ main(int argc, char **argv)
     }
 
     /* initialize options  */
-    if (h5repack_init(&options, 0, FALSE) < 0) {
+    if (h5repack_init(&options, 0, false) < 0) {
         printf("Error occurred while initializing repack options\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
diff --git a/tools/src/h5repack/h5repack_opttable.c b/tools/src/h5repack/h5repack_opttable.c
index 2018527..8a9042d 100644
--- a/tools/src/h5repack/h5repack_opttable.c
+++ b/tools/src/h5repack/h5repack_opttable.c
@@ -28,7 +28,7 @@ init_packobject(pack_info_t *obj)
 {
     int j, k;
 
-    HDstrcpy(obj->path, "\0");
+    strcpy(obj->path, "\0");
     for (j = 0; j < H5_REPACK_MAX_NFILTERS; j++) {
         obj->filter[j].filtn     = -1;
         obj->filter[j].cd_nelmts = CD_VALUES;
@@ -181,7 +181,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
 {
     unsigned i, j, I;
     unsigned added     = 0;
-    hbool_t  found     = FALSE;
+    bool     found     = false;
     int      ret_value = 0;
 
     /* increase the size of the collection by N_OBJS if necessary */
@@ -196,7 +196,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
             /* linear table search */
             for (i = 0; i < table->nelems; i++) {
                 /*already on the table */
-                if (HDstrcmp(obj_list[j].obj, table->objs[i].path) == 0) {
+                if (strcmp(obj_list[j].obj, table->objs[i].path) == 0) {
                     /* already chunk info inserted for this one; exit */
                     if (table->objs[i].chunk.rank > 0) {
                         H5TOOLS_INFO("chunk information already inserted for <%s>\n", obj_list[j].obj);
@@ -205,7 +205,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
                     /* insert the layout info */
                     else {
                         aux_tblinsert_layout(table, i, pack);
-                        found = TRUE;
+                        found = true;
                         break;
                     }
                 } /* if */
@@ -215,7 +215,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
                 /* keep the grow in a temp var */
                 I = table->nelems + added;
                 added++;
-                HDstrcpy(table->objs[I].path, obj_list[j].obj);
+                strcpy(table->objs[I].path, obj_list[j].obj);
                 aux_tblinsert_layout(table, I, pack);
             }
             /* cases where we have an already inserted name but there is a new name also
@@ -223,11 +223,11 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
              -f dset1:GZIP=1 -l dset1,dset2:CHUNK=20x20
              dset1 is already inserted, but dset2 must also be
              */
-            else if (found && HDstrcmp(obj_list[j].obj, table->objs[i].path) != 0) {
+            else if (found && strcmp(obj_list[j].obj, table->objs[i].path) != 0) {
                 /* keep the grow in a temp var */
                 I = table->nelems + added;
                 added++;
-                HDstrcpy(table->objs[I].path, obj_list[j].obj);
+                strcpy(table->objs[I].path, obj_list[j].obj);
                 aux_tblinsert_layout(table, I, pack);
             }
         } /* j */
@@ -238,7 +238,7 @@ options_add_layout(obj_list_t *obj_list, unsigned n_objs, pack_info_t *pack, pac
         for (j = 0; j < n_objs; j++) {
             I = table->nelems + added;
             added++;
-            HDstrcpy(table->objs[I].path, obj_list[j].obj);
+            strcpy(table->objs[I].path, obj_list[j].obj);
             aux_tblinsert_layout(table, I, pack);
         }
     }
@@ -261,7 +261,7 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pa
 {
     unsigned int i, j, I;
     unsigned     added = 0;
-    hbool_t      found = FALSE;
+    bool         found = false;
 
     /* increase the size of the collection by N_OBJS if necessary */
     if (table->nelems + n_objs >= table->size)
@@ -275,10 +275,10 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pa
             /* linear table search */
             for (i = 0; i < table->nelems; i++) {
                 /*already on the table */
-                if (HDstrcmp(obj_list[j].obj, table->objs[i].path) == 0) {
+                if (strcmp(obj_list[j].obj, table->objs[i].path) == 0) {
                     /* insert */
                     aux_tblinsert_filter(table, i, filt);
-                    found = TRUE;
+                    found = true;
                     break;
                 } /* if */
             }     /* i */
@@ -287,7 +287,7 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pa
                 /* keep the grow in a temp var */
                 I = table->nelems + added;
                 added++;
-                HDstrcpy(table->objs[I].path, obj_list[j].obj);
+                strcpy(table->objs[I].path, obj_list[j].obj);
                 aux_tblinsert_filter(table, I, filt);
             }
             /* cases where we have an already inserted name but there is a new name also
@@ -295,11 +295,11 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pa
              -l dset1:CHUNK=20x20 -f dset1,dset2:GZIP=1
              dset1 is already inserted, but dset2 must also be
              */
-            else if (found && HDstrcmp(obj_list[j].obj, table->objs[i].path) != 0) {
+            else if (found && strcmp(obj_list[j].obj, table->objs[i].path) != 0) {
                 /* keep the grow in a temp var */
                 I = table->nelems + added;
                 added++;
-                HDstrcpy(table->objs[I].path, obj_list[j].obj);
+                strcpy(table->objs[I].path, obj_list[j].obj);
                 aux_tblinsert_filter(table, I, filt);
             }
         } /* j */
@@ -311,7 +311,7 @@ options_add_filter(obj_list_t *obj_list, unsigned n_objs, filter_info_t filt, pa
         for (j = 0; j < n_objs; j++) {
             I = table->nelems + added;
             added++;
-            HDstrcpy(table->objs[I].path, obj_list[j].obj);
+            strcpy(table->objs[I].path, obj_list[j].obj);
             aux_tblinsert_filter(table, I, filt);
         }
     }
@@ -338,15 +338,15 @@ options_get_object(const char *path, pack_opttbl_t *table)
 
     for (i = 0; i < table->nelems; i++) {
         /* make full path (start with "/") to compare correctly  */
-        if (HDstrncmp(table->objs[i].path, "/", 1) != 0) {
-            HDstrcpy(tbl_path, "/");
-            HDstrcat(tbl_path, table->objs[i].path);
+        if (strncmp(table->objs[i].path, "/", 1) != 0) {
+            strcpy(tbl_path, "/");
+            strcat(tbl_path, table->objs[i].path);
         }
         else
-            HDstrcpy(tbl_path, table->objs[i].path);
+            strcpy(tbl_path, table->objs[i].path);
 
         /* found it */
-        if (HDstrcmp(tbl_path, path) == 0) {
+        if (strcmp(tbl_path, path) == 0) {
             return (&table->objs[i]);
         }
     }
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index f88ba6f..0317ef7 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -41,7 +41,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
 {
     size_t      i, m, u;
     char        c;
-    size_t      len = HDstrlen(str);
+    size_t      len = strlen(str);
     int         f, k, l, p, q, end_obj = -1, no_param = 0;
     unsigned    j, n;
     char        sobj[MAX_NC_NAME];
@@ -94,7 +94,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                 else
                     sobj[k + 1] = '\0';
 
-                HDstrcpy(obj_list[n].obj, sobj);
+                strcpy(obj_list[n].obj, sobj);
                 memset(sobj, 0, sizeof(sobj));
                 n++;
                 k = -1;
@@ -123,7 +123,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                  * example SZIP=8,NN
                  *-------------------------------------------------------------------------
                  */
-                if (HDstrcmp(scomp, "SZIP") == 0) {
+                if (strcmp(scomp, "SZIP") == 0) {
                     l = -1; /* mask index check */
                     for (m = 0, u = i + 1; u < len; u++, m++) {
                         if (str[u] == ',') {
@@ -146,9 +146,9 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (l == 2) {
                                 smask[l] = '\0';
                                 i        = len - 1; /* end */
-                                if (HDstrcmp(smask, "NN") == 0)
+                                if (strcmp(smask, "NN") == 0)
                                     filt->cd_values[j++] = H5_SZIP_NN_OPTION_MASK;
-                                else if (HDstrcmp(smask, "EC") == 0)
+                                else if (strcmp(smask, "EC") == 0)
                                     filt->cd_values[j++] = H5_SZIP_EC_OPTION_MASK;
                                 else {
                                     error_msg("szip mask must be 'NN' or 'EC' \n");
@@ -173,7 +173,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                  *  SOFF=3,DF
                  *-------------------------------------------------------------------------
                  */
-                else if (HDstrcmp(scomp, "SOFF") == 0) {
+                else if (strcmp(scomp, "SOFF") == 0) {
                     l = -1; /* mask index check */
                     for (m = 0, u = i + 1; u < len; u++, m++) {
                         if (str[u] == ',') {
@@ -196,9 +196,9 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                             if (l == 2) {
                                 smask[l] = '\0';
                                 i        = len - 1; /* end */
-                                if (HDstrcmp(smask, "IN") == 0)
+                                if (strcmp(smask, "IN") == 0)
                                     filt->cd_values[j++] = H5Z_SO_INT;
-                                else if (HDstrcmp(smask, "DS") == H5Z_SO_FLOAT_DSCALE)
+                                else if (strcmp(smask, "DS") == H5Z_SO_FLOAT_DSCALE)
                                     filt->cd_values[j++] = H5Z_SO_FLOAT_DSCALE;
                                 else {
                                     error_msg("scale type must be 'IN' or 'DS' \n");
@@ -216,7 +216,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                  *  UD=307,0,1,9
                  *-------------------------------------------------------------------------
                  */
-                else if (HDstrcmp(scomp, "UD") == 0) {
+                else if (strcmp(scomp, "UD") == 0) {
                     l = -1; /* filter number index check */
                     f = -1; /* filter flag index check */
                     p = -1; /* CD_VAL count check */
@@ -298,7 +298,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_NONE
              *-------------------------------------------------------------------------
              */
-            if (HDstrcmp(scomp, "NONE") == 0) {
+            if (strcmp(scomp, "NONE") == 0) {
                 filt->filtn     = H5Z_FILTER_NONE;
                 filt->cd_nelmts = 0;
             }
@@ -307,7 +307,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_DEFLATE
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "GZIP") == 0) {
+            else if (strcmp(scomp, "GZIP") == 0) {
                 filt->filtn     = H5Z_FILTER_DEFLATE;
                 filt->cd_nelmts = 1;
                 if (no_param) { /*no more parameters, GZIP must have parameter */
@@ -322,7 +322,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_SZIP
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "SZIP") == 0) {
+            else if (strcmp(scomp, "SZIP") == 0) {
                 filt->filtn     = H5Z_FILTER_SZIP;
                 filt->cd_nelmts = 2;
                 if (no_param) { /*no more parameters, SZIP must have parameter */
@@ -337,7 +337,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_SHUFFLE
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "SHUF") == 0) {
+            else if (strcmp(scomp, "SHUF") == 0) {
                 filt->filtn     = H5Z_FILTER_SHUFFLE;
                 filt->cd_nelmts = 0;
                 if (m > 0) { /*shuffle does not have parameter */
@@ -351,7 +351,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_FLETCHER32
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "FLET") == 0) {
+            else if (strcmp(scomp, "FLET") == 0) {
                 filt->filtn     = H5Z_FILTER_FLETCHER32;
                 filt->cd_nelmts = 0;
                 if (m > 0) { /*shuffle does not have parameter */
@@ -365,7 +365,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_NBIT
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "NBIT") == 0) {
+            else if (strcmp(scomp, "NBIT") == 0) {
                 filt->filtn     = H5Z_FILTER_NBIT;
                 filt->cd_nelmts = 0;
                 if (m > 0) { /*nbit does not have parameter */
@@ -379,7 +379,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * H5Z_FILTER_SCALEOFFSET
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "SOFF") == 0) {
+            else if (strcmp(scomp, "SOFF") == 0) {
                 filt->filtn     = H5Z_FILTER_SCALEOFFSET;
                 filt->cd_nelmts = 2;
                 if (no_param) { /*no more parameters, SOFF must have parameter */
@@ -393,7 +393,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
              * User Defined Filter
              *-------------------------------------------------------------------------
              */
-            else if (HDstrcmp(scomp, "UD") == 0) {
+            else if (strcmp(scomp, "UD") == 0) {
                 /* parameters does not match count */
                 if (filt->cd_nelmts != j) {
                     if (obj_list)
@@ -448,7 +448,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                 error_msg("pixels_per_block is too large in <%s>\n", str);
                 exit(EXIT_FAILURE);
             }
-            if ((HDstrcmp(smask, "NN") != 0) && (HDstrcmp(smask, "EC") != 0)) {
+            if ((strcmp(smask, "NN") != 0) && (strcmp(smask, "EC") != 0)) {
                 if (obj_list)
                     free(obj_list);
                 error_msg("szip mask must be 'NN' or 'EC' \n");
@@ -486,7 +486,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
     obj_list_t *obj_list = NULL;
     unsigned    i, j, n;
     char        c;
-    size_t      len = HDstrlen(str);
+    size_t      len = strlen(str);
     int         k, end_obj = -1, c_index;
     char        sobj[MAX_NC_NAME];
     char        sdim[10];
@@ -527,7 +527,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                     sobj[k] = '\0';
                 else
                     sobj[k + 1] = '\0';
-                HDstrcpy(obj_list[n].obj, sobj);
+                strcpy(obj_list[n].obj, sobj);
                 memset(sobj, 0, sizeof(sobj));
                 n++;
                 k = -1;
@@ -546,11 +546,11 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
     for (j = (unsigned)(end_obj + 1), n = 0; n <= 5; j++, n++) {
         if (n == 5) {
             slayout[n] = '\0'; /*cut string */
-            if (HDstrcmp(slayout, "COMPA") == 0)
+            if (strcmp(slayout, "COMPA") == 0)
                 pack->layout = H5D_COMPACT;
-            else if (HDstrcmp(slayout, "CONTI") == 0)
+            else if (strcmp(slayout, "CONTI") == 0)
                 pack->layout = H5D_CONTIGUOUS;
-            else if (HDstrcmp(slayout, "CHUNK") == 0)
+            else if (strcmp(slayout, "CHUNK") == 0)
                 pack->layout = H5D_CHUNKED;
             else {
                 error_msg("in parse layout, not a valid layout in <%s>\n", str);
@@ -604,7 +604,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                 else if (i == len - 1) { /*no more parameters */
                     sdim[k] = '\0';
                     k       = 0;
-                    if (HDstrcmp(sdim, "NONE") == 0) {
+                    if (strcmp(sdim, "NONE") == 0) {
                         pack->chunk.rank = -2;
                     }
                     else {
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index ce4a5cf..e71d6db 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -451,7 +451,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
     unsigned    u, i, j;
     int         rank;
     H5T_class_t type_class = -1;
-    hbool_t     is_ref = 0, is_ref_vlen = 0, is_ref_array = 0, is_ref_comp = 0;
+    bool        is_ref = 0, is_ref_vlen = 0, is_ref_array = 0, is_ref_comp = 0;
     void       *refbuf           = NULL;
     void       *buf              = NULL;
     unsigned   *ref_comp_index   = NULL;
diff --git a/tools/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c
index 572aa48..819dd94 100644
--- a/tools/src/h5repack/h5repack_verify.c
+++ b/tools/src/h5repack/h5repack_verify.c
@@ -49,7 +49,7 @@ h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options
     hid_t                 fcpl_in  = H5I_INVALID_HID;  /* file creation property for input file */
     hid_t                 fcpl_out = H5I_INVALID_HID;  /* file creation property for output file */
     H5F_fspace_strategy_t in_strategy, out_strategy;   /* file space handling strategy for in/output file */
-    hbool_t               in_persist, out_persist;     /* free-space persist status for in/output file */
+    bool                  in_persist, out_persist;     /* free-space persist status for in/output file */
     hsize_t               in_threshold, out_threshold; /* free-space section threshold for in/output file */
     hsize_t               in_pagesize, out_pagesize;   /* file space page size for input/output file */
     int                   ret_value = 0;
@@ -234,7 +234,7 @@ h5repack_verify(const char *in_fname, const char *out_fname, pack_opt_t *options
      * the same as the input file's free-space persist status
      */
     if (options->fs_persist) {
-        if (out_persist != (hbool_t)(options->fs_persist == (-1) ? FALSE : options->fs_persist))
+        if (out_persist != (bool)(options->fs_persist == (-1) ? false : options->fs_persist))
             H5TOOLS_GOTO_ERROR((-1), "free-space persist status not set as unexpected");
     }
     else {
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 5cfa61d..15232e4 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -101,7 +101,7 @@ typedef struct iter_t {
     hsize_t        super_ext_size;                  /* superblock extension size */
     hsize_t        ublk_size;                       /* user block size (if exists) */
     H5F_fspace_strategy_t fs_strategy;              /* File space management strategy */
-    hbool_t               fs_persist;               /* Free-space persist or not */
+    bool                  fs_persist;               /* Free-space persist or not */
     hsize_t               fs_threshold;             /* Free-space section threshold */
     hsize_t               fsp_size;                 /* File space page size */
     hsize_t               free_space;               /* Amount of freespace in the file */
@@ -122,7 +122,7 @@ static const char *drivername = NULL;
 static H5FD_ros3_fapl_ext_t ros3_fa = {
     {
         1,     /* Structure Version */
-        FALSE, /* Authenticate?     */
+        false, /* Authenticate?     */
         "",    /* AWS Region        */
         "",    /* Access Key ID     */
         "",    /* Secret Access Key */
@@ -143,22 +143,22 @@ static H5FD_hdfs_fapl_t hdfs_fa = {
 };
 #endif /* H5_HAVE_LIBHDFS */
 
-static int display_all = TRUE;
+static int display_all = true;
 
 /* Enable the printing of selected statistics */
-static int display_file            = FALSE; /* display file information */
-static int display_group           = FALSE; /* display groups information */
-static int display_dset            = FALSE; /* display datasets information */
-static int display_dset_dtype_meta = FALSE; /* display datasets' datatype information */
-static int display_attr            = FALSE; /* display attributes information */
-static int display_free_sections   = FALSE; /* display free space information */
-static int display_summary         = FALSE; /* display summary of file space information */
+static int display_file            = false; /* display file information */
+static int display_group           = false; /* display groups information */
+static int display_dset            = false; /* display datasets information */
+static int display_dset_dtype_meta = false; /* display datasets' datatype information */
+static int display_attr            = false; /* display attributes information */
+static int display_free_sections   = false; /* display free space information */
+static int display_summary         = false; /* display summary of file space information */
 
-static int display_file_metadata  = FALSE; /* display file space info for file's metadata */
-static int display_group_metadata = FALSE; /* display file space info for groups' metadata */
-static int display_dset_metadata  = FALSE; /* display file space info for datasets' metadata */
+static int display_file_metadata  = false; /* display file space info for file's metadata */
+static int display_group_metadata = false; /* display file space info for groups' metadata */
+static int display_dset_metadata  = false; /* display file space info for datasets' metadata */
 
-static int display_object = FALSE; /* not implemented yet */
+static int display_object = false; /* not implemented yet */
 
 /* Initialize threshold for small groups/datasets/attributes */
 static int sgroups_threshold = DEF_SIZE_SMALL_GROUPS;
@@ -516,10 +516,10 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info2_t *oi, const H5O_n
     if ((tid = H5Dget_type(did)) < 0)
         H5TOOLS_GOTO_ERROR(FAIL, "H5Dget_type() failed");
 
-    type_found = FALSE;
+    type_found = false;
     for (u = 0; u < iter->dset_ntypes; u++)
         if (H5Tequal(iter->dset_type_info[u].tid, tid) > 0) {
-            type_found = TRUE;
+            type_found = true;
             break;
         } /* end for */
 
@@ -825,23 +825,23 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re
                 break;
 
             case 'F':
-                display_all           = FALSE;
-                display_file_metadata = TRUE;
+                display_all           = false;
+                display_file_metadata = true;
                 break;
 
             case 'f':
-                display_all  = FALSE;
-                display_file = TRUE;
+                display_all  = false;
+                display_file = true;
                 break;
 
             case 'G':
-                display_all            = FALSE;
-                display_group_metadata = TRUE;
+                display_all            = false;
+                display_group_metadata = true;
                 break;
 
             case 'g':
-                display_all   = FALSE;
-                display_group = TRUE;
+                display_all   = false;
+                display_group = true;
                 break;
 
             case 'l':
@@ -858,13 +858,13 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re
                 break;
 
             case 'D':
-                display_all           = FALSE;
-                display_dset_metadata = TRUE;
+                display_all           = false;
+                display_dset_metadata = true;
                 break;
 
             case 'd':
-                display_all  = FALSE;
-                display_dset = TRUE;
+                display_all  = false;
+                display_dset = true;
                 break;
 
             case 'm':
@@ -881,13 +881,13 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re
                 break;
 
             case 'T':
-                display_all             = FALSE;
-                display_dset_dtype_meta = TRUE;
+                display_all             = false;
+                display_dset_dtype_meta = true;
                 break;
 
             case 'A':
-                display_all  = FALSE;
-                display_attr = TRUE;
+                display_all  = false;
+                display_attr = true;
                 break;
 
             case 'a':
@@ -904,18 +904,18 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re
                 break;
 
             case 's':
-                display_all           = FALSE;
-                display_free_sections = TRUE;
+                display_all           = false;
+                display_free_sections = true;
                 break;
 
             case 'S':
-                display_all     = FALSE;
-                display_summary = TRUE;
+                display_all     = false;
+                display_summary = true;
                 break;
 
             case 'O':
-                display_all    = FALSE;
-                display_object = TRUE;
+                display_all    = false;
+                display_object = true;
 
                 /* Allocate space to hold the command line info */
                 if (NULL == (hand = (struct handler_t *)calloc((size_t)1, sizeof(struct handler_t)))) {
@@ -932,7 +932,7 @@ parse_command_line(int argc, const char *const *argv, struct handler_t **hand_re
 
                 /* Store object names */
                 for (u = 0; u < hand->obj_count; u++)
-                    if (NULL == (hand->obj[u] = HDstrdup(H5_optarg))) {
+                    if (NULL == (hand->obj[u] = strdup(H5_optarg))) {
                         error_msg("unable to allocate memory for object name\n");
                         goto error;
                     } /* end if */
@@ -1514,17 +1514,17 @@ static void
 print_file_statistics(const iter_t *iter)
 {
     if (display_all) {
-        display_file            = TRUE;
-        display_group           = TRUE;
-        display_dset            = TRUE;
-        display_dset_dtype_meta = TRUE;
-        display_attr            = TRUE;
-        display_free_sections   = TRUE;
-        display_summary         = TRUE;
-
-        display_file_metadata  = TRUE;
-        display_group_metadata = TRUE;
-        display_dset_metadata  = TRUE;
+        display_file            = true;
+        display_group           = true;
+        display_dset            = true;
+        display_dset_dtype_meta = true;
+        display_attr            = true;
+        display_free_sections   = true;
+        display_summary         = true;
+
+        display_file_metadata  = true;
+        display_group_metadata = true;
+        display_dset_metadata  = true;
     }
 
     if (display_file)
@@ -1625,11 +1625,11 @@ main(int argc, char *argv[])
         vfd_info.u.name = drivername;
 
 #ifdef H5_HAVE_ROS3_VFD
-        if (!HDstrcmp(drivername, drivernames[ROS3_VFD_IDX]))
+        if (!strcmp(drivername, drivernames[ROS3_VFD_IDX]))
             vfd_info.info = &ros3_fa;
 #endif
 #ifdef H5_HAVE_LIBHDFS
-        if (!HDstrcmp(drivername, drivernames[HDFS_VFD_IDX]))
+        if (!strcmp(drivername, drivernames[HDFS_VFD_IDX]))
             vfd_info.info = &hdfs_fa;
 #endif
 
@@ -1708,7 +1708,7 @@ main(int argc, char *argv[])
             unsigned u;
 
             for (u = 0; u < hand->obj_count; u++) {
-                if (h5trav_visit(fid, hand->obj[u], TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) <
+                if (h5trav_visit(fid, hand->obj[u], true, true, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) <
                     0) {
                     error_msg("unable to traverse object \"%s\"\n", hand->obj[u]);
                     h5tools_setstatus(EXIT_FAILURE);
@@ -1718,7 +1718,7 @@ main(int argc, char *argv[])
             } /* end for */
         }     /* end if */
         else {
-            if (h5trav_visit(fid, "/", TRUE, TRUE, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
+            if (h5trav_visit(fid, "/", true, true, obj_stats, lnk_stats, &iter, H5O_INFO_ALL) < 0) {
                 error_msg("unable to traverse objects/links in file \"%s\"\n", fname);
                 h5tools_setstatus(EXIT_FAILURE);
             }
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 2272626..31f7c17 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -34,10 +34,10 @@
 #define DEFAULT_INCREMENT (1024 * 1024)
 
 static char   *fname_g            = NULL;
-static hbool_t clear_status_flags = FALSE;
-static hbool_t remove_cache_image = FALSE;
-static hbool_t print_filesize     = FALSE;
-static hbool_t increment_eoa_eof  = FALSE;
+static bool    clear_status_flags = false;
+static bool    remove_cache_image = false;
+static bool    print_filesize     = false;
+static bool    increment_eoa_eof  = false;
 static hsize_t increment          = DEFAULT_INCREMENT;
 
 /*
@@ -130,19 +130,19 @@ parse_command_line(int argc, const char *const *argv)
                 goto done;
 
             case 's':
-                clear_status_flags = TRUE;
+                clear_status_flags = true;
                 break;
 
             case 'm':
-                remove_cache_image = TRUE;
+                remove_cache_image = true;
                 break;
 
             case 'z':
-                print_filesize = TRUE;
+                print_filesize = true;
                 break;
 
             case 'i':
-                increment_eoa_eof = TRUE;
+                increment_eoa_eof = true;
                 if (H5_optarg != NULL) {
                     if (atoi(H5_optarg) < 0) {
                         usage(h5tools_getprogname());
@@ -167,7 +167,7 @@ parse_command_line(int argc, const char *const *argv)
         goto error;
     } /* end if */
 
-    fname_g = HDstrdup(argv[H5_optind]);
+    fname_g = strdup(argv[H5_optind]);
 
 done:
     return (0);
@@ -260,7 +260,7 @@ main(int argc, char *argv[])
     }
 
     /* Duplicate the file name */
-    fname = HDstrdup(fname_g);
+    fname = strdup(fname_g);
 
     /* Get a copy of the file access property list */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
@@ -308,7 +308,7 @@ main(int argc, char *argv[])
     }
 
     /* Open the file */
-    if ((fid = h5tools_fopen(fname, flags, fapl, FALSE, NULL, (size_t)0)) < 0) {
+    if ((fid = h5tools_fopen(fname, flags, fapl, false, NULL, (size_t)0)) < 0) {
         error_msg("h5tools_fopen\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c
index fa93244..1bba419 100644
--- a/tools/src/misc/h5debug.c
+++ b/tools/src/misc/h5debug.c
@@ -233,7 +233,7 @@ main(int argc, char *argv[])
     size_t         u;
     H5E_auto2_t    func           = NULL;
     void          *edata          = NULL;
-    hbool_t        api_ctx_pushed = FALSE; /* Whether API context pushed */
+    bool           api_ctx_pushed = false; /* Whether API context pushed */
     herr_t         status         = SUCCEED;
     int            exit_value     = 0;
 
@@ -262,7 +262,7 @@ main(int argc, char *argv[])
         exit_value = 1;
         goto done;
     } /* end if */
-    if (HDstrchr(argv[1], '%'))
+    if (strchr(argv[1], '%'))
         if (H5Pset_fapl_family(fapl, (hsize_t)0, H5P_DEFAULT) < 0) {
             fprintf(stderr, "cannot set file access property list\n");
             exit_value = 1;
@@ -280,7 +280,7 @@ main(int argc, char *argv[])
         exit_value = 1;
         goto done;
     }
-    api_ctx_pushed = TRUE;
+    api_ctx_pushed = true;
 
     if (NULL == (vol_obj = (H5VL_object_t *)H5VL_vol_object(fid))) {
         fprintf(stderr, "cannot obtain vol_obj pointer\n");
@@ -772,15 +772,15 @@ main(int argc, char *argv[])
         printf("%-*s ", VCOL, "Signature:");
         for (u = 0; u < sizeof(sig); u++) {
             if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u])
-                HDputchar(sig[u]);
+                putchar(sig[u]);
             else if ('\\' == sig[u]) {
-                HDputchar('\\');
-                HDputchar('\\');
+                putchar('\\');
+                putchar('\\');
             }
             else
                 printf("\\%03o", sig[u]);
         }
-        HDputchar('\n');
+        putchar('\n');
 
         fprintf(stderr, "unknown signature\n");
         exit_value = 4;
@@ -807,7 +807,7 @@ done:
 
     /* Pop API context */
     if (api_ctx_pushed)
-        H5CX_pop(FALSE);
+        H5CX_pop(false);
 
     H5Eset_auto2(H5E_DEFAULT, func, edata);
 
diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c
index f996d8d..42a5eaa 100644
--- a/tools/src/misc/h5delete.c
+++ b/tools/src/misc/h5delete.c
@@ -31,17 +31,17 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    hbool_t     quiet = FALSE;
+    bool        quiet = false;
     const char *name  = NULL;
     int         ret   = 0;
 
     switch (argc) {
         case 3:
-            if (HDstrcmp(argv[1], "-f") != 0) {
+            if (strcmp(argv[1], "-f") != 0) {
                 usage();
                 return EXIT_FAILURE;
             }
-            quiet = TRUE;
+            quiet = true;
             name  = argv[2];
             break;
         case 2:
diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c
index 31deb8b..92e3042 100644
--- a/tools/src/misc/h5mkgrp.c
+++ b/tools/src/misc/h5mkgrp.c
@@ -30,13 +30,13 @@ static struct h5_long_options l_opts[] = {
 
 /* Command line parameter settings */
 typedef struct mkgrp_opt_t {
-    char   *fname;   /* File name to operate on */
-    hbool_t latest;  /* Whether file should use latest format versions */
-    hbool_t verbose; /* Whether output should be verbose */
-    hbool_t parents; /* Whether to create intermediate groups */
-    size_t  ngroups; /* Number of groups to create */
-    char  **groups;  /* Pointer to array of group names */
-    hid_t   fapl_id; /* fapl to use when opening the file */
+    char  *fname;   /* File name to operate on */
+    bool   latest;  /* Whether file should use latest format versions */
+    bool   verbose; /* Whether output should be verbose */
+    bool   parents; /* Whether to create intermediate groups */
+    size_t ngroups; /* Number of groups to create */
+    char **groups;  /* Pointer to array of group names */
+    hid_t  fapl_id; /* fapl to use when opening the file */
 } mkgrp_opt_t;
 
 static mkgrp_opt_t params_g; /* Command line parameter settings */
@@ -135,8 +135,8 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
 {
     int                opt;        /* Option from command line */
     size_t             curr_group; /* Current group name to copy */
-    hbool_t            custom_vol = FALSE;
-    hbool_t            custom_vfd = FALSE;
+    bool               custom_vol = false;
+    bool               custom_vfd = false;
     h5tools_vol_info_t vol_info;
     h5tools_vfd_info_t vfd_info;
     hid_t              tmp_fapl_id = H5I_INVALID_HID;
@@ -162,17 +162,17 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
 
             /* Create objects with the latest version of the format */
             case 'l':
-                options->latest = TRUE;
+                options->latest = true;
                 break;
 
             /* Create parent groups */
             case 'p':
-                options->parents = TRUE;
+                options->parents = true;
                 break;
 
             /* Verbose output */
             case 'v':
-                options->verbose = TRUE;
+                options->verbose = true;
                 break;
 
             /* Display version */
@@ -184,13 +184,13 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
             case '1':
                 vol_info.type    = VOL_BY_VALUE;
                 vol_info.u.value = (H5VL_class_value_t)atoi(H5_optarg);
-                custom_vol       = TRUE;
+                custom_vol       = true;
                 break;
 
             case '2':
                 vol_info.type   = VOL_BY_NAME;
                 vol_info.u.name = H5_optarg;
-                custom_vol      = TRUE;
+                custom_vol      = true;
                 break;
 
             case '3':
@@ -200,13 +200,13 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
             case '4':
                 vfd_info.type    = VFD_BY_VALUE;
                 vfd_info.u.value = (H5FD_class_value_t)atoi(H5_optarg);
-                custom_vfd       = TRUE;
+                custom_vfd       = true;
                 break;
 
             case '5':
                 vfd_info.type   = VFD_BY_NAME;
                 vfd_info.u.name = H5_optarg;
-                custom_vfd      = TRUE;
+                custom_vfd      = true;
                 break;
 
             case '6':
@@ -228,7 +228,7 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
     }
 
     /* Retrieve file name */
-    options->fname = HDstrdup(argv[H5_optind]);
+    options->fname = strdup(argv[H5_optind]);
     H5_optind++;
 
     /* Check for group(s) to be created */
@@ -245,7 +245,7 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options)
     /* Retrieve the group names */
     curr_group = 0;
     while (H5_optind < argc) {
-        options->groups[curr_group] = HDstrdup(argv[H5_optind]);
+        options->groups[curr_group] = strdup(argv[H5_optind]);
         curr_group++;
         H5_optind++;
     }
@@ -346,7 +346,7 @@ main(int argc, char *argv[])
     /* Check for creating intermediate groups */
     if (params_g.parents) {
         /* Set the intermediate group creation property */
-        if (H5Pset_create_intermediate_group(lcpl_id, TRUE) < 0) {
+        if (H5Pset_create_intermediate_group(lcpl_id, true) < 0) {
             error_msg("Could not set property for creating parent groups\n");
             leave(EXIT_FAILURE);
         }
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index e7bf055..feb447f 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -146,11 +146,11 @@ main(int argc, char *argv[])
     ssize_t     nio;               /*I/O return value        */
     int         argno = 1;         /*program argument number    */
     int         src, dst = -1;     /*source & destination files    */
-    int         need_seek = FALSE; /*destination needs to seek?    */
+    int         need_seek = false; /*destination needs to seek?    */
     int         need_write;        /*data needs to be written?    */
     h5_stat_t   sb;                /*temporary file stat buffer    */
 
-    int verbose = FALSE; /*display file names?        */
+    int verbose = false; /*display file names?        */
 
     const char *src_gen_name;    /*general source name        */
     char       *src_name = NULL; /*source member name        */
@@ -172,12 +172,12 @@ main(int argc, char *argv[])
     hid_t   fapl;            /*file access property list     */
     hid_t   file;
     hsize_t hdsize;                   /*destination logical memb size */
-    hbool_t family_to_single = FALSE; /*change family to single file driver? */
+    bool    family_to_single = false; /*change family to single file driver? */
 
     /*
      * Get the program name from argv[0]. Use only the last component.
      */
-    if ((prog_name = HDstrrchr(argv[0], '/')))
+    if ((prog_name = strrchr(argv[0], '/')))
         prog_name++;
     else
         prog_name = argv[0];
@@ -186,21 +186,21 @@ main(int argc, char *argv[])
      * Parse switches.
      */
     while (argno < argc && '-' == argv[argno][0]) {
-        if (!HDstrcmp(argv[argno], "-v")) {
-            verbose = TRUE;
+        if (!strcmp(argv[argno], "-v")) {
+            verbose = true;
             argno++;
         }
-        else if (!HDstrcmp(argv[argno], "-V")) {
+        else if (!strcmp(argv[argno], "-V")) {
             printf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR,
                    H5_VERS_RELEASE);
             exit(EXIT_SUCCESS);
         }
-        else if (!HDstrcmp(argv[argno], "-family_to_sec2")) {
-            family_to_single = TRUE;
+        else if (!strcmp(argv[argno], "-family_to_sec2")) {
+            family_to_single = true;
             argno++;
         }
-        else if (!HDstrcmp(argv[argno], "-family_to_single")) {
-            family_to_single = TRUE;
+        else if (!strcmp(argv[argno], "-family_to_single")) {
+            family_to_single = true;
             argno++;
         }
         else if ('b' == argv[argno][1]) {
@@ -227,16 +227,16 @@ main(int argc, char *argv[])
     if (argno >= argc)
         usage(prog_name);
     src_gen_name = argv[argno++];
-    HDsnprintf(src_name, NAMELEN, src_gen_name, src_membno);
+    snprintf(src_name, NAMELEN, src_gen_name, src_membno);
     src_is_family = strcmp(src_name, src_gen_name);
 
     if ((src = HDopen(src_name, O_RDONLY)) < 0) {
-        HDperror(src_name);
+        perror(src_name);
         exit(EXIT_FAILURE);
     }
 
     if (HDfstat(src, &sb) < 0) {
-        HDperror("fstat");
+        perror("fstat");
         exit(EXIT_FAILURE);
     }
     src_size = src_act_size = sb.st_size;
@@ -249,11 +249,11 @@ main(int argc, char *argv[])
     if (argno >= argc)
         usage(prog_name);
     dst_gen_name = argv[argno++];
-    HDsnprintf(dst_name, NAMELEN, dst_gen_name, dst_membno);
-    dst_is_family = HDstrcmp(dst_name, dst_gen_name);
+    snprintf(dst_name, NAMELEN, dst_gen_name, dst_membno);
+    dst_is_family = strcmp(dst_name, dst_gen_name);
 
     if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
-        HDperror(dst_name);
+        perror(dst_name);
         exit(EXIT_FAILURE);
     }
     if (verbose)
@@ -278,12 +278,12 @@ main(int argc, char *argv[])
         if (left_overs) {
             n          = (size_t)MIN((off_t)n, left_overs);
             left_overs = left_overs - (off_t)n;
-            need_write = FALSE;
+            need_write = false;
         }
         else if (src_offset < src_act_size) {
             n = (size_t)MIN((off_t)n, src_act_size - src_offset);
             if ((nio = HDread(src, buf, n)) < 0) {
-                HDperror("read");
+                perror("read");
                 exit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
@@ -299,7 +299,7 @@ main(int argc, char *argv[])
         else {
             n          = 0;
             left_overs = src_size - src_act_size;
-            need_write = FALSE;
+            need_write = false;
         }
 
         /*
@@ -309,21 +309,21 @@ main(int argc, char *argv[])
          */
         if (need_write) {
             if (need_seek && HDlseek(dst, dst_offset, SEEK_SET) < 0) {
-                HDperror("HDlseek");
+                perror("HDlseek");
                 exit(EXIT_FAILURE);
             }
             if ((nio = HDwrite(dst, buf, n)) < 0) {
-                HDperror("write");
+                perror("write");
                 exit(EXIT_FAILURE);
             }
             else if ((size_t)nio != n) {
                 fprintf(stderr, "%s: short write\n", dst_name);
                 exit(EXIT_FAILURE);
             }
-            need_seek = FALSE;
+            need_seek = false;
         }
         else {
-            need_seek = TRUE;
+            need_seek = true;
         }
 
         /*
@@ -341,17 +341,17 @@ main(int argc, char *argv[])
                 dst_offset = dst_offset + (off_t)n;
                 break;
             }
-            HDsnprintf(src_name, NAMELEN, src_gen_name, ++src_membno);
+            snprintf(src_name, NAMELEN, src_gen_name, ++src_membno);
             if ((src = HDopen(src_name, O_RDONLY)) < 0 && ENOENT == errno) {
                 dst_offset = dst_offset + (off_t)n;
                 break;
             }
             else if (src < 0) {
-                HDperror(src_name);
+                perror(src_name);
                 exit(EXIT_FAILURE);
             }
             if (HDfstat(src, &sb) < 0) {
-                HDperror("fstat");
+                perror("fstat");
                 exit(EXIT_FAILURE);
             }
             src_act_size = sb.st_size;
@@ -372,30 +372,30 @@ main(int argc, char *argv[])
         if (dst_is_family && dst_offset == dst_size) {
             if (0 == dst_membno) {
                 if (HDlseek(dst, dst_size - 1, SEEK_SET) < 0) {
-                    HDperror("HDHDlseek");
+                    perror("HDHDlseek");
                     exit(EXIT_FAILURE);
                 }
                 if (HDread(dst, buf, 1) < 0) {
-                    HDperror("read");
+                    perror("read");
                     exit(EXIT_FAILURE);
                 }
                 if (HDlseek(dst, dst_size - 1, SEEK_SET) < 0) {
-                    HDperror("HDlseek");
+                    perror("HDlseek");
                     exit(EXIT_FAILURE);
                 }
                 if (HDwrite(dst, buf, 1) < 0) {
-                    HDperror("write");
+                    perror("write");
                     exit(EXIT_FAILURE);
                 }
             }
             HDclose(dst);
-            HDsnprintf(dst_name, NAMELEN, dst_gen_name, ++dst_membno);
+            snprintf(dst_name, NAMELEN, dst_gen_name, ++dst_membno);
             if ((dst = HDopen(dst_name, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW)) < 0) {
-                HDperror(dst_name);
+                perror(dst_name);
                 exit(EXIT_FAILURE);
             }
             dst_offset = 0;
-            need_seek  = FALSE;
+            need_seek  = false;
             if (verbose)
                 fprintf(stderr, "> %s\n", dst_name);
         }
@@ -408,19 +408,19 @@ main(int argc, char *argv[])
      */
     if (need_seek) {
         if (HDlseek(dst, dst_offset - 1, SEEK_SET) < 0) {
-            HDperror("HDlseek");
+            perror("HDlseek");
             exit(EXIT_FAILURE);
         }
         if (HDread(dst, buf, 1) < 0) {
-            HDperror("read");
+            perror("read");
             exit(EXIT_FAILURE);
         }
         if (HDlseek(dst, dst_offset - 1, SEEK_SET) < 0) {
-            HDperror("HDlseek");
+            perror("HDlseek");
             exit(EXIT_FAILURE);
         }
         if (HDwrite(dst, buf, 1) < 0) {
-            HDperror("write");
+            perror("write");
             exit(EXIT_FAILURE);
         }
     }
@@ -429,7 +429,7 @@ main(int argc, char *argv[])
     /* Modify family driver information saved in superblock through private property.
      * These private properties are for this tool only. */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        HDperror("H5Pcreate");
+        perror("H5Pcreate");
         exit(EXIT_FAILURE);
     }
 
@@ -439,7 +439,7 @@ main(int argc, char *argv[])
          * the library to ignore the family driver information saved in the superblock.
          */
         if (H5Pset(fapl, H5F_ACS_FAMILY_TO_SINGLE_NAME, &family_to_single) < 0) {
-            HDperror("H5Pset");
+            perror("H5Pset");
             exit(EXIT_FAILURE);
         }
     }
@@ -448,14 +448,14 @@ main(int argc, char *argv[])
          * library to save the new member size(specified in command line) in superblock.
          * This private property is for this tool only. */
         if (H5Pset_fapl_family(fapl, H5F_FAMILY_DEFAULT, H5P_DEFAULT) < 0) {
-            HDperror("H5Pset_fapl_family");
+            perror("H5Pset_fapl_family");
             exit(EXIT_FAILURE);
         }
 
         /* Set the property of the new member size as hsize_t */
         hdsize = (hsize_t)dst_size;
         if (H5Pset(fapl, H5F_ACS_FAMILY_NEWSIZE_NAME, &hdsize) < 0) {
-            HDperror("H5Pset");
+            perror("H5Pset");
             exit(EXIT_FAILURE);
         }
     }
@@ -476,13 +476,13 @@ main(int argc, char *argv[])
 
     if (file >= 0) {
         if (H5Fclose(file) < 0) {
-            HDperror("H5Fclose");
+            perror("H5Fclose");
             exit(EXIT_FAILURE);
         } /* end if */
     }     /* end if */
 
     if (H5Pclose(fapl) < 0) {
-        HDperror("H5Pclose");
+        perror("H5Pclose");
         exit(EXIT_FAILURE);
     } /* end if */
 
diff --git a/tools/test/h5copy/CMakeTests.cmake b/tools/test/h5copy/CMakeTests.cmake
index b47000a..e443827 100644
--- a/tools/test/h5copy/CMakeTests.cmake
+++ b/tools/test/h5copy/CMakeTests.cmake
@@ -20,32 +20,35 @@
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
   set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_ref.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copytst.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter2.h5
+      h5copy_extlinks_src.h5
+      h5copy_extlinks_trg.h5
+      h5copy_ref.h5
+      h5copytst.h5
+      tudfilter.h5
+      tudfilter2.h5
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.out
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_misc1.err
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/tudfilter.h5_ERR.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_plugin_test.out.h5.txt
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help1.ddl
-      ${HDF5_TOOLS_TEST_H5COPY_SOURCE_DIR}/testfiles/h5copy_help2.ddl
+      h5copy_misc1.out
+      h5copy_misc1.err
+      tudfilter.h5.txt
+      tudfilter.h5_ERR.txt
+      h5copy_plugin_fail_ERR.out.h5.txt
+      h5copy_plugin_test.out.h5.txt
+      h5copy_help1.ddl
+      h5copy_help2.ddl
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5copy_files")
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5copy_files")
   endforeach ()
-  add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
+
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5copy_files")
+  endforeach ()
+   add_custom_target(h5copy_files ALL COMMENT "Copying files needed by h5copy tests" DEPENDS ${h5copy_files_list})
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls
index af499a5..af499a5 100644
--- a/tools/test/h5copy/testfiles/h5copy_extlinks_src.out.ls
+++ b/tools/test/h5copy/expected/h5copy_extlinks_src.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copy_help1.ddl b/tools/test/h5copy/expected/h5copy_help1.ddl
index 418faea..418faea 100644
--- a/tools/test/h5copy/testfiles/h5copy_help1.ddl
+++ b/tools/test/h5copy/expected/h5copy_help1.ddl
diff --git a/tools/test/h5copy/testfiles/h5copy_help2.ddl b/tools/test/h5copy/expected/h5copy_help2.ddl
index 418faea..418faea 100644
--- a/tools/test/h5copy/testfiles/h5copy_help2.ddl
+++ b/tools/test/h5copy/expected/h5copy_help2.ddl
diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.err b/tools/test/h5copy/expected/h5copy_misc1.err
index 2c2c867..2c2c867 100644
--- a/tools/test/h5copy/testfiles/h5copy_misc1.err
+++ b/tools/test/h5copy/expected/h5copy_misc1.err
diff --git a/tools/test/h5copy/testfiles/h5copy_misc1.out b/tools/test/h5copy/expected/h5copy_misc1.out
index 1c7181b..1c7181b 100644
--- a/tools/test/h5copy/testfiles/h5copy_misc1.out
+++ b/tools/test/h5copy/expected/h5copy_misc1.out
diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt
index 66e9eb2..66e9eb2 100644
--- a/tools/test/h5copy/testfiles/h5copy_plugin_fail_ERR.out.h5.txt
+++ b/tools/test/h5copy/expected/h5copy_plugin_fail_ERR.out.h5.txt
diff --git a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt
index 66e9eb2..66e9eb2 100644
--- a/tools/test/h5copy/testfiles/h5copy_plugin_test.out.h5.txt
+++ b/tools/test/h5copy/expected/h5copy_plugin_test.out.h5.txt
diff --git a/tools/test/h5copy/testfiles/h5copy_ref.out.ls b/tools/test/h5copy/expected/h5copy_ref.out.ls
index f5b31a7..f5b31a7 100644
--- a/tools/test/h5copy/testfiles/h5copy_ref.out.ls
+++ b/tools/test/h5copy/expected/h5copy_ref.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copytst.out.ls b/tools/test/h5copy/expected/h5copytst.out.ls
index 629915e..629915e 100644
--- a/tools/test/h5copy/testfiles/h5copytst.out.ls
+++ b/tools/test/h5copy/expected/h5copytst.out.ls
diff --git a/tools/test/h5copy/testfiles/h5copytst_new.out.ls b/tools/test/h5copy/expected/h5copytst_new.out.ls
index 9df6b2e..9df6b2e 100644
--- a/tools/test/h5copy/testfiles/h5copytst_new.out.ls
+++ b/tools/test/h5copy/expected/h5copytst_new.out.ls
diff --git a/tools/test/h5copy/testfiles/tudfilter.h5.txt b/tools/test/h5copy/expected/tudfilter.h5.txt
index eabe407..eabe407 100644
--- a/tools/test/h5copy/testfiles/tudfilter.h5.txt
+++ b/tools/test/h5copy/expected/tudfilter.h5.txt
diff --git a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt
index 3c5b3ca..3c5b3ca 100644
--- a/tools/test/h5copy/testfiles/tudfilter.h5_ERR.txt
+++ b/tools/test/h5copy/expected/tudfilter.h5_ERR.txt
diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c
index db50693..ac19f34 100644
--- a/tools/test/h5copy/h5copygentest.c
+++ b/tools/test/h5copy/h5copygentest.c
@@ -723,7 +723,7 @@ Test_Obj_Copy(void)
     }
 
     /* Test with old & new format groups */
-    for (new_format = FALSE; new_format <= TRUE; new_format++) {
+    for (new_format = false; new_format <= true; new_format++) {
 
         /* Set the FAPL for the type of format */
         /* Create source file */
diff --git a/tools/test/h5copy/testh5copy.sh.in b/tools/test/h5copy/testh5copy.sh.in
index 1f64d15..f2c4a8e 100644
--- a/tools/test/h5copy/testh5copy.sh.in
+++ b/tools/test/h5copy/testh5copy.sh.in
@@ -24,16 +24,16 @@ USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5COPY_OUTFILES="$SRC_TOOLS/test/h5copy/expected"
 
 TESTNAME=h5copy
 EXIT_SUCCESS=0
@@ -58,10 +58,10 @@ $SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5
 
 # List of expect files that will be copied over to local test dir
 LIST_OTHER_TEST_FILES="
-$SRC_H5COPY_TESTFILES/h5copy_misc1.out
-$SRC_H5COPY_TESTFILES/h5copy_misc1.err
-$SRC_H5COPY_TESTFILES/h5copy_help1.ddl
-$SRC_H5COPY_TESTFILES/h5copy_help2.ddl
+$SRC_H5COPY_OUTFILES/h5copy_misc1.out
+$SRC_H5COPY_OUTFILES/h5copy_misc1.err
+$SRC_H5COPY_OUTFILES/h5copy_help1.ddl
+$SRC_H5COPY_OUTFILES/h5copy_help2.ddl
 "
 
 H5COPY=../../src/h5copy/h5copy               # The tool name
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index b23f885..d89df46 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -19,303 +19,307 @@
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
-  set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_basic2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_types.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dtypes.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_empty.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_links.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_softlinks.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_linked_softlink.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_src.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_extlink_trg.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_src.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ext2softlink_trg.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset_zero_dim_size2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_danglelinks2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_grp_recurse_ext2-3.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude1-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude2-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_exclude3-2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_comp_vl_strs.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr_v_level2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_enum_invalid_values.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/compounds_array_vlen2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/non_comparables2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/tudfilter2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_strings2.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps1.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps2.h5
+  # tools/testfiles/vds
+  set (LIST_VDS_TEST_FILES
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (LIST_DIFF_TEST_FILES
+      h5diff_basic1.h5
+      h5diff_basic2.h5
+      h5diff_types.h5
+      h5diff_dtypes.h5
+      h5diff_attr1.h5
+      h5diff_attr2.h5
+      h5diff_attr3.h5
+      h5diff_dset1.h5
+      h5diff_dset2.h5
+      h5diff_dset3.h5
+      h5diff_hyper1.h5
+      h5diff_hyper2.h5
+      h5diff_empty.h5
+      h5diff_links.h5
+      h5diff_softlinks.h5
+      h5diff_linked_softlink.h5
+      h5diff_extlink_src.h5
+      h5diff_extlink_trg.h5
+      h5diff_ext2softlink_src.h5
+      h5diff_ext2softlink_trg.h5
+      h5diff_dset_zero_dim_size1.h5
+      h5diff_dset_zero_dim_size2.h5
+      h5diff_danglelinks1.h5
+      h5diff_danglelinks2.h5
+      h5diff_grp_recurse1.h5
+      h5diff_grp_recurse2.h5
+      h5diff_grp_recurse_ext1.h5
+      h5diff_grp_recurse_ext2-1.h5
+      h5diff_grp_recurse_ext2-2.h5
+      h5diff_grp_recurse_ext2-3.h5
+      h5diff_exclude1-1.h5
+      h5diff_exclude1-2.h5
+      h5diff_exclude2-1.h5
+      h5diff_exclude2-2.h5
+      h5diff_exclude3-1.h5
+      h5diff_exclude3-2.h5
+      h5diff_comp_vl_strs.h5
+      h5diff_attr_v_level1.h5
+      h5diff_attr_v_level2.h5
+      h5diff_enum_invalid_values.h5
+      compounds_array_vlen1.h5
+      compounds_array_vlen2.h5
+      non_comparables1.h5
+      non_comparables2.h5
+      tudfilter.h5
+      tudfilter2.h5
+      h5diff_strings1.h5
+      h5diff_strings2.h5
+      h5diff_eps1.h5
+      h5diff_eps2.h5
       # onion VFD files
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_objs.h5.onion
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_onion_dset_1d.h5.onion
-      # tools/testfiles/vds
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
+      h5diff_onion_objs.h5
+      h5diff_onion_objs.h5.onion
+      h5diff_onion_dset_ext.h5
+      h5diff_onion_dset_ext.h5.onion
+      h5diff_onion_dset_1d.h5
+      h5diff_onion_dset_1d.h5.onion
+  )
+  set (LIST_HDF5_TEST_FILES
       # tools/testfiles
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
+      tvlstr.h5
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
+      trefer_attr.h5
+      trefer_compat.h5
+      trefer_ext1.h5
+      trefer_ext2.h5
+      trefer_grp.h5
+      trefer_obj_del.h5
+      trefer_obj.h5
+      trefer_param.h5
+      trefer_reg_1d.h5
+      trefer_reg.h5
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_10.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_100.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_11.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_12.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_13.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_14.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_15.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_2.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_16_3.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_17.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_171.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_172.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18_1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_18.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_20.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_200.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_201.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_202.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_203.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_204.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_205.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_206.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_207.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_208.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_220.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_221.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_222.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_223.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_224.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_21.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_22.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_23.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_24.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_25.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_26.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_27.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_28.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_30.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_300.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_400.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_401.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_402.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_403.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_404.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_405.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_406.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_407.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_408.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_409.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_410.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_411.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_412.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_413.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_414.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_415.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_416.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_417.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_418.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_419.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_420.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_421.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_422.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_423.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_424.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_425.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_450.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_451.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_452.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_453.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_454.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/dangling_link.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_455.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_456.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_457.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_458.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_459.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_465.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_466.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_467.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_468.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_469.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_471.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_472.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_473.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_474.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_475.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_480.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_481.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_482.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_483.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_484.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_485.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_486.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_487.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_50.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_51.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_52.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_53.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_54.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_55.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_56.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_57.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_58_ref.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_59.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_500.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_501.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_502.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_503.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_504.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_505.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_506.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_507.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_508.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_509.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_510.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_511.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_512.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_513.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_514.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_515.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_516.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_517.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_518.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_530.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_540.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_60.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_61.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_62.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_63.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_600.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_601_ERR.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_603.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_604.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_605.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_606.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_607.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_608.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_609.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_610.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_612.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_613.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_614.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_615.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_616.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_617.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_618.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_619.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_621.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_622.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_623.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_624.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_625.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_626.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_627.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_628.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_629.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_630.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_631.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_640.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_641.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_642.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_643.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_644.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_645.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_646.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_70.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_700.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_701.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_702.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_703.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_704.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_705.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_706.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_707.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_708.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_709.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_710.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_830.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_900.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_901.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_902.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8625.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_8639.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_reg.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.err
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v1.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v2.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_v3.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_vlstr.txt
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_eps.txt
+      h5diff_10.txt
+      h5diff_100.txt
+      h5diff_11.txt
+      h5diff_12.txt
+      h5diff_13.txt
+      h5diff_14.txt
+      h5diff_15.txt
+      h5diff_16_1.txt
+      h5diff_16_2.txt
+      h5diff_16_3.txt
+      h5diff_17.txt
+      h5diff_171.txt
+      h5diff_172.txt
+      h5diff_18_1.txt
+      h5diff_18.txt
+      h5diff_20.txt
+      h5diff_200.txt
+      h5diff_201.txt
+      h5diff_202.txt
+      h5diff_203.txt
+      h5diff_204.txt
+      h5diff_205.txt
+      h5diff_206.txt
+      h5diff_207.txt
+      h5diff_208.txt
+      h5diff_220.txt
+      h5diff_221.txt
+      h5diff_222.txt
+      h5diff_223.txt
+      h5diff_224.txt
+      h5diff_21.txt
+      h5diff_22.txt
+      h5diff_23.txt
+      h5diff_24.txt
+      h5diff_25.txt
+      h5diff_26.txt
+      h5diff_27.txt
+      h5diff_28.txt
+      h5diff_30.txt
+      h5diff_300.txt
+      h5diff_400.txt
+      h5diff_401.txt
+      h5diff_402.txt
+      h5diff_403.txt
+      h5diff_404.txt
+      h5diff_405.txt
+      h5diff_406.txt
+      h5diff_407.txt
+      h5diff_408.txt
+      h5diff_409.txt
+      h5diff_410.txt
+      h5diff_411.txt
+      h5diff_412.txt
+      h5diff_413.txt
+      h5diff_414.txt
+      h5diff_415.txt
+      h5diff_416.txt
+      h5diff_417.txt
+      h5diff_418.txt
+      h5diff_419.txt
+      h5diff_420.txt
+      h5diff_421.txt
+      h5diff_422.txt
+      h5diff_423.txt
+      h5diff_424.txt
+      h5diff_425.txt
+      h5diff_450.txt
+      h5diff_451.txt
+      h5diff_452.txt
+      h5diff_453.txt
+      h5diff_454.txt
+      dangling_link.err
+      h5diff_455.txt
+      h5diff_456.txt
+      h5diff_457.txt
+      h5diff_458.txt
+      h5diff_459.txt
+      h5diff_465.txt
+      h5diff_466.txt
+      h5diff_467.txt
+      h5diff_468.txt
+      h5diff_469.txt
+      h5diff_471.txt
+      h5diff_472.txt
+      h5diff_473.txt
+      h5diff_474.txt
+      h5diff_475.txt
+      h5diff_480.txt
+      h5diff_481.txt
+      h5diff_482.txt
+      h5diff_483.txt
+      h5diff_484.txt
+      h5diff_485.txt
+      h5diff_486.txt
+      h5diff_487.txt
+      h5diff_50.txt
+      h5diff_51.txt
+      h5diff_52.txt
+      h5diff_53.txt
+      h5diff_54.txt
+      h5diff_55.txt
+      h5diff_56.txt
+      h5diff_57.txt
+      h5diff_58.txt
+      h5diff_58_ref.txt
+      h5diff_59.txt
+      h5diff_500.txt
+      h5diff_501.txt
+      h5diff_502.txt
+      h5diff_503.txt
+      h5diff_504.txt
+      h5diff_505.txt
+      h5diff_506.txt
+      h5diff_507.txt
+      h5diff_508.txt
+      h5diff_509.txt
+      h5diff_510.txt
+      h5diff_511.txt
+      h5diff_512.txt
+      h5diff_513.txt
+      h5diff_514.txt
+      h5diff_515.txt
+      h5diff_516.txt
+      h5diff_517.txt
+      h5diff_518.txt
+      h5diff_530.txt
+      h5diff_540.txt
+      h5diff_60.txt
+      h5diff_61.txt
+      h5diff_62.txt
+      h5diff_63.txt
+      h5diff_600.txt
+      h5diff_601.txt
+      h5diff_601_ERR.err
+      h5diff_603.txt
+      h5diff_604.txt
+      h5diff_605.txt
+      h5diff_606.txt
+      h5diff_607.txt
+      h5diff_608.txt
+      h5diff_609.txt
+      h5diff_610.txt
+      h5diff_612.txt
+      h5diff_613.txt
+      h5diff_614.txt
+      h5diff_615.txt
+      h5diff_616.txt
+      h5diff_617.txt
+      h5diff_618.txt
+      h5diff_619.txt
+      h5diff_621.txt
+      h5diff_622.txt
+      h5diff_623.txt
+      h5diff_624.txt
+      h5diff_625.txt
+      h5diff_626.txt
+      h5diff_627.txt
+      h5diff_628.txt
+      h5diff_629.txt
+      h5diff_630.txt
+      h5diff_631.txt
+      h5diff_640.txt
+      h5diff_641.txt
+      h5diff_642.txt
+      h5diff_643.txt
+      h5diff_644.txt
+      h5diff_645.txt
+      h5diff_646.txt
+      h5diff_70.txt
+      h5diff_700.txt
+      h5diff_701.txt
+      h5diff_702.txt
+      h5diff_703.txt
+      h5diff_704.txt
+      h5diff_705.txt
+      h5diff_706.txt
+      h5diff_707.txt
+      h5diff_708.txt
+      h5diff_709.txt
+      h5diff_710.txt
+      h5diff_80.txt
+      h5diff_800.txt
+      h5diff_801.txt
+      h5diff_830.txt
+      h5diff_90.txt
+      h5diff_900.txt
+      h5diff_901.txt
+      h5diff_902.txt
+      h5diff_8625.txt
+      h5diff_8639.txt
+      h5diff_reg.txt
+      h5diff_ud.txt
+      h5diff_udfail.err
+      h5diff_udfail.txt
+      h5diff_v1.txt
+      h5diff_v2.txt
+      h5diff_v3.txt
+      h5diff_vlstr.txt
+      h5diff_eps.txt
   )
 
   set (LIST_WIN_TEST_FILES
@@ -334,17 +338,34 @@
   #
   # copy test files from source to build dir
   #
-  foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${h5_tstfiles}" NAME)
-    HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5diff_files")
+  foreach (h5_tstfiles ${LIST_DIFF_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_VDS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
+    if (H5_HAVE_PARALLEL)
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
+    endif ()
+  endforeach ()
+  foreach (h5_tstfiles ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}" "h5diff_files")
     if (H5_HAVE_PARALLEL)
-      HDFTEST_COPY_FILE("${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}" "h5diff_files")
     endif ()
   endforeach ()
   # copy second version of tvlstr.h5
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
+  HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/testfiles/tvlstr2.h5" "h5diff_files")
   if (H5_HAVE_PARALLEL)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
+      HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tvlstr.h5" "${PROJECT_BINARY_DIR}/PAR/testfiles/tvlstr2.h5" "h5diff_files")
   endif ()
 
 
@@ -361,18 +382,16 @@
   endif ()
   if (COPY_WINDOWS_FILES)
     foreach (h5_tstfiles ${LIST_WIN_TEST_FILES})
-      get_filename_component(fname "${h5_tstfiles}" NAME)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       if (H5_HAVE_PARALLEL)
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files")
+        HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}w.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       endif ()
     endforeach ()
   else ()
     foreach (h5_tstfiles ${LIST_WIN_TEST_FILES})
-      get_filename_component(fname "${h5_tstfiles}" NAME)
-      HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${fname}.txt" "h5diff_files")
+      HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       if (H5_HAVE_PARALLEL)
-        HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${fname}.txt" "h5diff_files")
+        HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tstfiles}.txt" "${PROJECT_BINARY_DIR}/PAR/testfiles/${h5_tstfiles}.txt" "h5diff_files")
       endif ()
     endforeach ()
   endif ()
diff --git a/tools/test/h5diff/testfiles/dangling_link.err b/tools/test/h5diff/expected/dangling_link.err
index 82802a1..82802a1 100644
--- a/tools/test/h5diff/testfiles/dangling_link.err
+++ b/tools/test/h5diff/expected/dangling_link.err
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/expected/h5diff_10.txt
index dbd5418..dbd5418 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/expected/h5diff_10.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_100.txt b/tools/test/h5diff/expected/h5diff_100.txt
index 363daa3..363daa3 100644
--- a/tools/test/h5diff/testfiles/h5diff_100.txt
+++ b/tools/test/h5diff/expected/h5diff_100.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_101.txt b/tools/test/h5diff/expected/h5diff_101.txt
index f915439..f915439 100644
--- a/tools/test/h5diff/testfiles/h5diff_101.txt
+++ b/tools/test/h5diff/expected/h5diff_101.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_101w.txt b/tools/test/h5diff/expected/h5diff_101w.txt
index 71f4e87..71f4e87 100644
--- a/tools/test/h5diff/testfiles/h5diff_101w.txt
+++ b/tools/test/h5diff/expected/h5diff_101w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_102.txt b/tools/test/h5diff/expected/h5diff_102.txt
index 476067b..476067b 100644
--- a/tools/test/h5diff/testfiles/h5diff_102.txt
+++ b/tools/test/h5diff/expected/h5diff_102.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_102w.txt b/tools/test/h5diff/expected/h5diff_102w.txt
index 19a097c..19a097c 100644
--- a/tools/test/h5diff/testfiles/h5diff_102w.txt
+++ b/tools/test/h5diff/expected/h5diff_102w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_103.txt b/tools/test/h5diff/expected/h5diff_103.txt
index 5700459..5700459 100644
--- a/tools/test/h5diff/testfiles/h5diff_103.txt
+++ b/tools/test/h5diff/expected/h5diff_103.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_103w.txt b/tools/test/h5diff/expected/h5diff_103w.txt
index b1abea2..b1abea2 100644
--- a/tools/test/h5diff/testfiles/h5diff_103w.txt
+++ b/tools/test/h5diff/expected/h5diff_103w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_104.txt b/tools/test/h5diff/expected/h5diff_104.txt
index 2997f10..2997f10 100644
--- a/tools/test/h5diff/testfiles/h5diff_104.txt
+++ b/tools/test/h5diff/expected/h5diff_104.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_104w.txt b/tools/test/h5diff/expected/h5diff_104w.txt
index 28ef705..28ef705 100644
--- a/tools/test/h5diff/testfiles/h5diff_104w.txt
+++ b/tools/test/h5diff/expected/h5diff_104w.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_11.txt b/tools/test/h5diff/expected/h5diff_11.txt
index c06305c..c06305c 100644
--- a/tools/test/h5diff/testfiles/h5diff_11.txt
+++ b/tools/test/h5diff/expected/h5diff_11.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_12.txt b/tools/test/h5diff/expected/h5diff_12.txt
index 371df79..371df79 100644
--- a/tools/test/h5diff/testfiles/h5diff_12.txt
+++ b/tools/test/h5diff/expected/h5diff_12.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_13.txt b/tools/test/h5diff/expected/h5diff_13.txt
index 729859b..729859b 100644
--- a/tools/test/h5diff/testfiles/h5diff_13.txt
+++ b/tools/test/h5diff/expected/h5diff_13.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_14.txt b/tools/test/h5diff/expected/h5diff_14.txt
index 454463a..454463a 100644
--- a/tools/test/h5diff/testfiles/h5diff_14.txt
+++ b/tools/test/h5diff/expected/h5diff_14.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_15.txt b/tools/test/h5diff/expected/h5diff_15.txt
index 7685f75..7685f75 100644
--- a/tools/test/h5diff/testfiles/h5diff_15.txt
+++ b/tools/test/h5diff/expected/h5diff_15.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_1.txt b/tools/test/h5diff/expected/h5diff_16_1.txt
index 482a42f..482a42f 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_1.txt
+++ b/tools/test/h5diff/expected/h5diff_16_1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_2.txt b/tools/test/h5diff/expected/h5diff_16_2.txt
index 34c1afb..34c1afb 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_2.txt
+++ b/tools/test/h5diff/expected/h5diff_16_2.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_16_3.txt b/tools/test/h5diff/expected/h5diff_16_3.txt
index 173a39b..173a39b 100644
--- a/tools/test/h5diff/testfiles/h5diff_16_3.txt
+++ b/tools/test/h5diff/expected/h5diff_16_3.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_17.txt b/tools/test/h5diff/expected/h5diff_17.txt
index 4906a2a..4906a2a 100644
--- a/tools/test/h5diff/testfiles/h5diff_17.txt
+++ b/tools/test/h5diff/expected/h5diff_17.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_171.txt b/tools/test/h5diff/expected/h5diff_171.txt
index aabe16a..aabe16a 100644
--- a/tools/test/h5diff/testfiles/h5diff_171.txt
+++ b/tools/test/h5diff/expected/h5diff_171.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_172.txt b/tools/test/h5diff/expected/h5diff_172.txt
index 852f7b5..852f7b5 100644
--- a/tools/test/h5diff/testfiles/h5diff_172.txt
+++ b/tools/test/h5diff/expected/h5diff_172.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_18.txt b/tools/test/h5diff/expected/h5diff_18.txt
index 1255241..1255241 100644
--- a/tools/test/h5diff/testfiles/h5diff_18.txt
+++ b/tools/test/h5diff/expected/h5diff_18.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_18_1.txt b/tools/test/h5diff/expected/h5diff_18_1.txt
index 0067075..0067075 100644
--- a/tools/test/h5diff/testfiles/h5diff_18_1.txt
+++ b/tools/test/h5diff/expected/h5diff_18_1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_19.txt b/tools/test/h5diff/expected/h5diff_19.txt
index 1155d55..1155d55 100644
--- a/tools/test/h5diff/testfiles/h5diff_19.txt
+++ b/tools/test/h5diff/expected/h5diff_19.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_20.txt b/tools/test/h5diff/expected/h5diff_20.txt
index 09c20cb..09c20cb 100644
--- a/tools/test/h5diff/testfiles/h5diff_20.txt
+++ b/tools/test/h5diff/expected/h5diff_20.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_200.txt b/tools/test/h5diff/expected/h5diff_200.txt
index 40e3fb6..40e3fb6 100644
--- a/tools/test/h5diff/testfiles/h5diff_200.txt
+++ b/tools/test/h5diff/expected/h5diff_200.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_201.txt b/tools/test/h5diff/expected/h5diff_201.txt
index ede94e1..ede94e1 100644
--- a/tools/test/h5diff/testfiles/h5diff_201.txt
+++ b/tools/test/h5diff/expected/h5diff_201.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_202.txt b/tools/test/h5diff/expected/h5diff_202.txt
index 95ef1da..95ef1da 100644
--- a/tools/test/h5diff/testfiles/h5diff_202.txt
+++ b/tools/test/h5diff/expected/h5diff_202.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_203.txt b/tools/test/h5diff/expected/h5diff_203.txt
index 61a773a..61a773a 100644
--- a/tools/test/h5diff/testfiles/h5diff_203.txt
+++ b/tools/test/h5diff/expected/h5diff_203.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_204.txt b/tools/test/h5diff/expected/h5diff_204.txt
index e02e831..e02e831 100644
--- a/tools/test/h5diff/testfiles/h5diff_204.txt
+++ b/tools/test/h5diff/expected/h5diff_204.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_205.txt b/tools/test/h5diff/expected/h5diff_205.txt
index bf5650f..bf5650f 100644
--- a/tools/test/h5diff/testfiles/h5diff_205.txt
+++ b/tools/test/h5diff/expected/h5diff_205.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_206.txt b/tools/test/h5diff/expected/h5diff_206.txt
index 659321f..659321f 100644
--- a/tools/test/h5diff/testfiles/h5diff_206.txt
+++ b/tools/test/h5diff/expected/h5diff_206.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_207.txt b/tools/test/h5diff/expected/h5diff_207.txt
index 1ef3dbe..1ef3dbe 100644
--- a/tools/test/h5diff/testfiles/h5diff_207.txt
+++ b/tools/test/h5diff/expected/h5diff_207.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_208.txt b/tools/test/h5diff/expected/h5diff_208.txt
index 783be90..783be90 100644
--- a/tools/test/h5diff/testfiles/h5diff_208.txt
+++ b/tools/test/h5diff/expected/h5diff_208.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_21.txt b/tools/test/h5diff/expected/h5diff_21.txt
index 1c625fe..1c625fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_21.txt
+++ b/tools/test/h5diff/expected/h5diff_21.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_22.txt b/tools/test/h5diff/expected/h5diff_22.txt
index 2ef22d0..2ef22d0 100644
--- a/tools/test/h5diff/testfiles/h5diff_22.txt
+++ b/tools/test/h5diff/expected/h5diff_22.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_220.txt b/tools/test/h5diff/expected/h5diff_220.txt
index 0092fc1..0092fc1 100644
--- a/tools/test/h5diff/testfiles/h5diff_220.txt
+++ b/tools/test/h5diff/expected/h5diff_220.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_221.txt b/tools/test/h5diff/expected/h5diff_221.txt
index 5f10860..5f10860 100644
--- a/tools/test/h5diff/testfiles/h5diff_221.txt
+++ b/tools/test/h5diff/expected/h5diff_221.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_222.txt b/tools/test/h5diff/expected/h5diff_222.txt
index 77447da..77447da 100644
--- a/tools/test/h5diff/testfiles/h5diff_222.txt
+++ b/tools/test/h5diff/expected/h5diff_222.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_223.txt b/tools/test/h5diff/expected/h5diff_223.txt
index c8e0f65..c8e0f65 100644
--- a/tools/test/h5diff/testfiles/h5diff_223.txt
+++ b/tools/test/h5diff/expected/h5diff_223.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_224.txt b/tools/test/h5diff/expected/h5diff_224.txt
index a4ebedb..a4ebedb 100644
--- a/tools/test/h5diff/testfiles/h5diff_224.txt
+++ b/tools/test/h5diff/expected/h5diff_224.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_23.txt b/tools/test/h5diff/expected/h5diff_23.txt
index bd1cadb..bd1cadb 100644
--- a/tools/test/h5diff/testfiles/h5diff_23.txt
+++ b/tools/test/h5diff/expected/h5diff_23.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_24.txt b/tools/test/h5diff/expected/h5diff_24.txt
index fa5723a..fa5723a 100644
--- a/tools/test/h5diff/testfiles/h5diff_24.txt
+++ b/tools/test/h5diff/expected/h5diff_24.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_25.txt b/tools/test/h5diff/expected/h5diff_25.txt
index e463ba1..e463ba1 100644
--- a/tools/test/h5diff/testfiles/h5diff_25.txt
+++ b/tools/test/h5diff/expected/h5diff_25.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_26.txt b/tools/test/h5diff/expected/h5diff_26.txt
index 54a5121..54a5121 100644
--- a/tools/test/h5diff/testfiles/h5diff_26.txt
+++ b/tools/test/h5diff/expected/h5diff_26.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_27.txt b/tools/test/h5diff/expected/h5diff_27.txt
index cbc128e..cbc128e 100644
--- a/tools/test/h5diff/testfiles/h5diff_27.txt
+++ b/tools/test/h5diff/expected/h5diff_27.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_28.txt b/tools/test/h5diff/expected/h5diff_28.txt
index 07d01fe..07d01fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_28.txt
+++ b/tools/test/h5diff/expected/h5diff_28.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_30.txt b/tools/test/h5diff/expected/h5diff_30.txt
index 187589a..187589a 100644
--- a/tools/test/h5diff/testfiles/h5diff_30.txt
+++ b/tools/test/h5diff/expected/h5diff_30.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_300.txt b/tools/test/h5diff/expected/h5diff_300.txt
index e51643f..e51643f 100644
--- a/tools/test/h5diff/testfiles/h5diff_300.txt
+++ b/tools/test/h5diff/expected/h5diff_300.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_400.txt b/tools/test/h5diff/expected/h5diff_400.txt
index 8b3c03c..8b3c03c 100644
--- a/tools/test/h5diff/testfiles/h5diff_400.txt
+++ b/tools/test/h5diff/expected/h5diff_400.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_401.txt b/tools/test/h5diff/expected/h5diff_401.txt
index 278729e..278729e 100644
--- a/tools/test/h5diff/testfiles/h5diff_401.txt
+++ b/tools/test/h5diff/expected/h5diff_401.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_402.txt b/tools/test/h5diff/expected/h5diff_402.txt
index b0f30ca..b0f30ca 100644
--- a/tools/test/h5diff/testfiles/h5diff_402.txt
+++ b/tools/test/h5diff/expected/h5diff_402.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_403.txt b/tools/test/h5diff/expected/h5diff_403.txt
index 068d01d..068d01d 100644
--- a/tools/test/h5diff/testfiles/h5diff_403.txt
+++ b/tools/test/h5diff/expected/h5diff_403.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_404.txt b/tools/test/h5diff/expected/h5diff_404.txt
index db317d1..db317d1 100644
--- a/tools/test/h5diff/testfiles/h5diff_404.txt
+++ b/tools/test/h5diff/expected/h5diff_404.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_405.txt b/tools/test/h5diff/expected/h5diff_405.txt
index 890dd33..890dd33 100644
--- a/tools/test/h5diff/testfiles/h5diff_405.txt
+++ b/tools/test/h5diff/expected/h5diff_405.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_406.txt b/tools/test/h5diff/expected/h5diff_406.txt
index 7fa442a..7fa442a 100644
--- a/tools/test/h5diff/testfiles/h5diff_406.txt
+++ b/tools/test/h5diff/expected/h5diff_406.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_407.txt b/tools/test/h5diff/expected/h5diff_407.txt
index 3693ab9..3693ab9 100644
--- a/tools/test/h5diff/testfiles/h5diff_407.txt
+++ b/tools/test/h5diff/expected/h5diff_407.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_408.txt b/tools/test/h5diff/expected/h5diff_408.txt
index e941f9b..e941f9b 100644
--- a/tools/test/h5diff/testfiles/h5diff_408.txt
+++ b/tools/test/h5diff/expected/h5diff_408.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_409.txt b/tools/test/h5diff/expected/h5diff_409.txt
index 007da7d..007da7d 100644
--- a/tools/test/h5diff/testfiles/h5diff_409.txt
+++ b/tools/test/h5diff/expected/h5diff_409.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_410.txt b/tools/test/h5diff/expected/h5diff_410.txt
index 6087bb8..6087bb8 100644
--- a/tools/test/h5diff/testfiles/h5diff_410.txt
+++ b/tools/test/h5diff/expected/h5diff_410.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_411.txt b/tools/test/h5diff/expected/h5diff_411.txt
index 161ab34..161ab34 100644
--- a/tools/test/h5diff/testfiles/h5diff_411.txt
+++ b/tools/test/h5diff/expected/h5diff_411.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_412.txt b/tools/test/h5diff/expected/h5diff_412.txt
index bb8209c..bb8209c 100644
--- a/tools/test/h5diff/testfiles/h5diff_412.txt
+++ b/tools/test/h5diff/expected/h5diff_412.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_413.txt b/tools/test/h5diff/expected/h5diff_413.txt
index 8df3d51..8df3d51 100644
--- a/tools/test/h5diff/testfiles/h5diff_413.txt
+++ b/tools/test/h5diff/expected/h5diff_413.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_414.txt b/tools/test/h5diff/expected/h5diff_414.txt
index a47349e..a47349e 100644
--- a/tools/test/h5diff/testfiles/h5diff_414.txt
+++ b/tools/test/h5diff/expected/h5diff_414.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_415.txt b/tools/test/h5diff/expected/h5diff_415.txt
index 30cc947..30cc947 100644
--- a/tools/test/h5diff/testfiles/h5diff_415.txt
+++ b/tools/test/h5diff/expected/h5diff_415.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_416.txt b/tools/test/h5diff/expected/h5diff_416.txt
index 551a6c3..551a6c3 100644
--- a/tools/test/h5diff/testfiles/h5diff_416.txt
+++ b/tools/test/h5diff/expected/h5diff_416.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_417.txt b/tools/test/h5diff/expected/h5diff_417.txt
index 0ea2542..0ea2542 100644
--- a/tools/test/h5diff/testfiles/h5diff_417.txt
+++ b/tools/test/h5diff/expected/h5diff_417.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_418.txt b/tools/test/h5diff/expected/h5diff_418.txt
index 46222bb..46222bb 100644
--- a/tools/test/h5diff/testfiles/h5diff_418.txt
+++ b/tools/test/h5diff/expected/h5diff_418.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_419.txt b/tools/test/h5diff/expected/h5diff_419.txt
index 387c600..387c600 100644
--- a/tools/test/h5diff/testfiles/h5diff_419.txt
+++ b/tools/test/h5diff/expected/h5diff_419.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_420.txt b/tools/test/h5diff/expected/h5diff_420.txt
index f3e65d9..f3e65d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_420.txt
+++ b/tools/test/h5diff/expected/h5diff_420.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_421.txt b/tools/test/h5diff/expected/h5diff_421.txt
index 833c60c..833c60c 100644
--- a/tools/test/h5diff/testfiles/h5diff_421.txt
+++ b/tools/test/h5diff/expected/h5diff_421.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_422.txt b/tools/test/h5diff/expected/h5diff_422.txt
index 3e675d5..3e675d5 100644
--- a/tools/test/h5diff/testfiles/h5diff_422.txt
+++ b/tools/test/h5diff/expected/h5diff_422.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_423.txt b/tools/test/h5diff/expected/h5diff_423.txt
index 1ebc157..1ebc157 100644
--- a/tools/test/h5diff/testfiles/h5diff_423.txt
+++ b/tools/test/h5diff/expected/h5diff_423.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_424.txt b/tools/test/h5diff/expected/h5diff_424.txt
index 9099c41..9099c41 100644
--- a/tools/test/h5diff/testfiles/h5diff_424.txt
+++ b/tools/test/h5diff/expected/h5diff_424.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_425.txt b/tools/test/h5diff/expected/h5diff_425.txt
index 03ceb78..03ceb78 100644
--- a/tools/test/h5diff/testfiles/h5diff_425.txt
+++ b/tools/test/h5diff/expected/h5diff_425.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_450.txt b/tools/test/h5diff/expected/h5diff_450.txt
index a63d78f..a63d78f 100644
--- a/tools/test/h5diff/testfiles/h5diff_450.txt
+++ b/tools/test/h5diff/expected/h5diff_450.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_451.txt b/tools/test/h5diff/expected/h5diff_451.txt
index fd0691f..fd0691f 100644
--- a/tools/test/h5diff/testfiles/h5diff_451.txt
+++ b/tools/test/h5diff/expected/h5diff_451.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_452.txt b/tools/test/h5diff/expected/h5diff_452.txt
index 05403af..05403af 100644
--- a/tools/test/h5diff/testfiles/h5diff_452.txt
+++ b/tools/test/h5diff/expected/h5diff_452.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_453.txt b/tools/test/h5diff/expected/h5diff_453.txt
index 8a5ca52..8a5ca52 100644
--- a/tools/test/h5diff/testfiles/h5diff_453.txt
+++ b/tools/test/h5diff/expected/h5diff_453.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_454.txt b/tools/test/h5diff/expected/h5diff_454.txt
index dcc2e9c..dcc2e9c 100644
--- a/tools/test/h5diff/testfiles/h5diff_454.txt
+++ b/tools/test/h5diff/expected/h5diff_454.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_455.txt b/tools/test/h5diff/expected/h5diff_455.txt
index dcc2e9c..dcc2e9c 100644
--- a/tools/test/h5diff/testfiles/h5diff_455.txt
+++ b/tools/test/h5diff/expected/h5diff_455.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_456.txt b/tools/test/h5diff/expected/h5diff_456.txt
index 9317988..9317988 100644
--- a/tools/test/h5diff/testfiles/h5diff_456.txt
+++ b/tools/test/h5diff/expected/h5diff_456.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_457.txt b/tools/test/h5diff/expected/h5diff_457.txt
index 762ccdc..762ccdc 100644
--- a/tools/test/h5diff/testfiles/h5diff_457.txt
+++ b/tools/test/h5diff/expected/h5diff_457.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_458.txt b/tools/test/h5diff/expected/h5diff_458.txt
index 067d665..067d665 100644
--- a/tools/test/h5diff/testfiles/h5diff_458.txt
+++ b/tools/test/h5diff/expected/h5diff_458.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_459.txt b/tools/test/h5diff/expected/h5diff_459.txt
index 762ccdc..762ccdc 100644
--- a/tools/test/h5diff/testfiles/h5diff_459.txt
+++ b/tools/test/h5diff/expected/h5diff_459.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_465.txt b/tools/test/h5diff/expected/h5diff_465.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_465.txt
+++ b/tools/test/h5diff/expected/h5diff_465.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_466.txt b/tools/test/h5diff/expected/h5diff_466.txt
index 3e00ca3..3e00ca3 100644
--- a/tools/test/h5diff/testfiles/h5diff_466.txt
+++ b/tools/test/h5diff/expected/h5diff_466.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_467.txt b/tools/test/h5diff/expected/h5diff_467.txt
index f5195c0..f5195c0 100644
--- a/tools/test/h5diff/testfiles/h5diff_467.txt
+++ b/tools/test/h5diff/expected/h5diff_467.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_468.txt b/tools/test/h5diff/expected/h5diff_468.txt
index 75b16c6..75b16c6 100644
--- a/tools/test/h5diff/testfiles/h5diff_468.txt
+++ b/tools/test/h5diff/expected/h5diff_468.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_469.txt b/tools/test/h5diff/expected/h5diff_469.txt
index 594fd80..594fd80 100644
--- a/tools/test/h5diff/testfiles/h5diff_469.txt
+++ b/tools/test/h5diff/expected/h5diff_469.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_471.txt b/tools/test/h5diff/expected/h5diff_471.txt
index 124cdd7..124cdd7 100644
--- a/tools/test/h5diff/testfiles/h5diff_471.txt
+++ b/tools/test/h5diff/expected/h5diff_471.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_472.txt b/tools/test/h5diff/expected/h5diff_472.txt
index 57a8af4..57a8af4 100644
--- a/tools/test/h5diff/testfiles/h5diff_472.txt
+++ b/tools/test/h5diff/expected/h5diff_472.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_473.txt b/tools/test/h5diff/expected/h5diff_473.txt
index 4c1855d..4c1855d 100644
--- a/tools/test/h5diff/testfiles/h5diff_473.txt
+++ b/tools/test/h5diff/expected/h5diff_473.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_474.txt b/tools/test/h5diff/expected/h5diff_474.txt
index 7807551..7807551 100644
--- a/tools/test/h5diff/testfiles/h5diff_474.txt
+++ b/tools/test/h5diff/expected/h5diff_474.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_475.txt b/tools/test/h5diff/expected/h5diff_475.txt
index be6110e..be6110e 100644
--- a/tools/test/h5diff/testfiles/h5diff_475.txt
+++ b/tools/test/h5diff/expected/h5diff_475.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_480.txt b/tools/test/h5diff/expected/h5diff_480.txt
index 3e1f900..3e1f900 100644
--- a/tools/test/h5diff/testfiles/h5diff_480.txt
+++ b/tools/test/h5diff/expected/h5diff_480.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_481.txt b/tools/test/h5diff/expected/h5diff_481.txt
index c4f2448..c4f2448 100644
--- a/tools/test/h5diff/testfiles/h5diff_481.txt
+++ b/tools/test/h5diff/expected/h5diff_481.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_482.txt b/tools/test/h5diff/expected/h5diff_482.txt
index 5b3c8c1..5b3c8c1 100644
--- a/tools/test/h5diff/testfiles/h5diff_482.txt
+++ b/tools/test/h5diff/expected/h5diff_482.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_483.txt b/tools/test/h5diff/expected/h5diff_483.txt
index a45e928..a45e928 100644
--- a/tools/test/h5diff/testfiles/h5diff_483.txt
+++ b/tools/test/h5diff/expected/h5diff_483.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_484.txt b/tools/test/h5diff/expected/h5diff_484.txt
index 87d9c7c..87d9c7c 100644
--- a/tools/test/h5diff/testfiles/h5diff_484.txt
+++ b/tools/test/h5diff/expected/h5diff_484.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_485.txt b/tools/test/h5diff/expected/h5diff_485.txt
index 4175809..4175809 100644
--- a/tools/test/h5diff/testfiles/h5diff_485.txt
+++ b/tools/test/h5diff/expected/h5diff_485.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_486.txt b/tools/test/h5diff/expected/h5diff_486.txt
index 4175809..4175809 100644
--- a/tools/test/h5diff/testfiles/h5diff_486.txt
+++ b/tools/test/h5diff/expected/h5diff_486.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_487.txt b/tools/test/h5diff/expected/h5diff_487.txt
index 8555a71..8555a71 100644
--- a/tools/test/h5diff/testfiles/h5diff_487.txt
+++ b/tools/test/h5diff/expected/h5diff_487.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_50.txt b/tools/test/h5diff/expected/h5diff_50.txt
index 434b458..434b458 100644
--- a/tools/test/h5diff/testfiles/h5diff_50.txt
+++ b/tools/test/h5diff/expected/h5diff_50.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_500.txt b/tools/test/h5diff/expected/h5diff_500.txt
index 7d688d2..7d688d2 100644
--- a/tools/test/h5diff/testfiles/h5diff_500.txt
+++ b/tools/test/h5diff/expected/h5diff_500.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_501.txt b/tools/test/h5diff/expected/h5diff_501.txt
index 75e91da..75e91da 100644
--- a/tools/test/h5diff/testfiles/h5diff_501.txt
+++ b/tools/test/h5diff/expected/h5diff_501.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_502.txt b/tools/test/h5diff/expected/h5diff_502.txt
index d3de6e5..d3de6e5 100644
--- a/tools/test/h5diff/testfiles/h5diff_502.txt
+++ b/tools/test/h5diff/expected/h5diff_502.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_503.txt b/tools/test/h5diff/expected/h5diff_503.txt
index cf01598..cf01598 100644
--- a/tools/test/h5diff/testfiles/h5diff_503.txt
+++ b/tools/test/h5diff/expected/h5diff_503.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_504.txt b/tools/test/h5diff/expected/h5diff_504.txt
index 6cf43b3..6cf43b3 100644
--- a/tools/test/h5diff/testfiles/h5diff_504.txt
+++ b/tools/test/h5diff/expected/h5diff_504.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_505.txt b/tools/test/h5diff/expected/h5diff_505.txt
index 607b99b..607b99b 100644
--- a/tools/test/h5diff/testfiles/h5diff_505.txt
+++ b/tools/test/h5diff/expected/h5diff_505.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_506.txt b/tools/test/h5diff/expected/h5diff_506.txt
index efef9a7..efef9a7 100644
--- a/tools/test/h5diff/testfiles/h5diff_506.txt
+++ b/tools/test/h5diff/expected/h5diff_506.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_507.txt b/tools/test/h5diff/expected/h5diff_507.txt
index 06b7fe6..06b7fe6 100644
--- a/tools/test/h5diff/testfiles/h5diff_507.txt
+++ b/tools/test/h5diff/expected/h5diff_507.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_508.txt b/tools/test/h5diff/expected/h5diff_508.txt
index 9796345..9796345 100644
--- a/tools/test/h5diff/testfiles/h5diff_508.txt
+++ b/tools/test/h5diff/expected/h5diff_508.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_509.txt b/tools/test/h5diff/expected/h5diff_509.txt
index 2e3e87a..2e3e87a 100644
--- a/tools/test/h5diff/testfiles/h5diff_509.txt
+++ b/tools/test/h5diff/expected/h5diff_509.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_51.txt b/tools/test/h5diff/expected/h5diff_51.txt
index 621ba2a..621ba2a 100644
--- a/tools/test/h5diff/testfiles/h5diff_51.txt
+++ b/tools/test/h5diff/expected/h5diff_51.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_510.txt b/tools/test/h5diff/expected/h5diff_510.txt
index 9d92768..9d92768 100644
--- a/tools/test/h5diff/testfiles/h5diff_510.txt
+++ b/tools/test/h5diff/expected/h5diff_510.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_511.txt b/tools/test/h5diff/expected/h5diff_511.txt
index 4bac100..4bac100 100644
--- a/tools/test/h5diff/testfiles/h5diff_511.txt
+++ b/tools/test/h5diff/expected/h5diff_511.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_512.txt b/tools/test/h5diff/expected/h5diff_512.txt
index 23fbc12..23fbc12 100644
--- a/tools/test/h5diff/testfiles/h5diff_512.txt
+++ b/tools/test/h5diff/expected/h5diff_512.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_513.txt b/tools/test/h5diff/expected/h5diff_513.txt
index b0af15d..b0af15d 100644
--- a/tools/test/h5diff/testfiles/h5diff_513.txt
+++ b/tools/test/h5diff/expected/h5diff_513.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_514.txt b/tools/test/h5diff/expected/h5diff_514.txt
index f8e16e9..f8e16e9 100644
--- a/tools/test/h5diff/testfiles/h5diff_514.txt
+++ b/tools/test/h5diff/expected/h5diff_514.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_515.txt b/tools/test/h5diff/expected/h5diff_515.txt
index 263441d..263441d 100644
--- a/tools/test/h5diff/testfiles/h5diff_515.txt
+++ b/tools/test/h5diff/expected/h5diff_515.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_516.txt b/tools/test/h5diff/expected/h5diff_516.txt
index 32f4bd5..32f4bd5 100644
--- a/tools/test/h5diff/testfiles/h5diff_516.txt
+++ b/tools/test/h5diff/expected/h5diff_516.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_517.txt b/tools/test/h5diff/expected/h5diff_517.txt
index 91c69fb..91c69fb 100644
--- a/tools/test/h5diff/testfiles/h5diff_517.txt
+++ b/tools/test/h5diff/expected/h5diff_517.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_518.txt b/tools/test/h5diff/expected/h5diff_518.txt
index f4761ad..f4761ad 100644
--- a/tools/test/h5diff/testfiles/h5diff_518.txt
+++ b/tools/test/h5diff/expected/h5diff_518.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_52.txt b/tools/test/h5diff/expected/h5diff_52.txt
index 6667659..6667659 100644
--- a/tools/test/h5diff/testfiles/h5diff_52.txt
+++ b/tools/test/h5diff/expected/h5diff_52.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_53.txt b/tools/test/h5diff/expected/h5diff_53.txt
index 458d166..458d166 100644
--- a/tools/test/h5diff/testfiles/h5diff_53.txt
+++ b/tools/test/h5diff/expected/h5diff_53.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_530.txt b/tools/test/h5diff/expected/h5diff_530.txt
index 73d736e..73d736e 100644
--- a/tools/test/h5diff/testfiles/h5diff_530.txt
+++ b/tools/test/h5diff/expected/h5diff_530.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_54.txt b/tools/test/h5diff/expected/h5diff_54.txt
index 2ca60f8..2ca60f8 100644
--- a/tools/test/h5diff/testfiles/h5diff_54.txt
+++ b/tools/test/h5diff/expected/h5diff_54.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_540.txt b/tools/test/h5diff/expected/h5diff_540.txt
index a6903c8..a6903c8 100644
--- a/tools/test/h5diff/testfiles/h5diff_540.txt
+++ b/tools/test/h5diff/expected/h5diff_540.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_55.txt b/tools/test/h5diff/expected/h5diff_55.txt
index 1288887..1288887 100644
--- a/tools/test/h5diff/testfiles/h5diff_55.txt
+++ b/tools/test/h5diff/expected/h5diff_55.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_56.txt b/tools/test/h5diff/expected/h5diff_56.txt
index 0e82860..0e82860 100644
--- a/tools/test/h5diff/testfiles/h5diff_56.txt
+++ b/tools/test/h5diff/expected/h5diff_56.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_57.txt b/tools/test/h5diff/expected/h5diff_57.txt
index d5125fe..d5125fe 100644
--- a/tools/test/h5diff/testfiles/h5diff_57.txt
+++ b/tools/test/h5diff/expected/h5diff_57.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_58.txt b/tools/test/h5diff/expected/h5diff_58.txt
index da147bc..da147bc 100644
--- a/tools/test/h5diff/testfiles/h5diff_58.txt
+++ b/tools/test/h5diff/expected/h5diff_58.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_58_ref.txt b/tools/test/h5diff/expected/h5diff_58_ref.txt
index 48a4b33..48a4b33 100644
--- a/tools/test/h5diff/testfiles/h5diff_58_ref.txt
+++ b/tools/test/h5diff/expected/h5diff_58_ref.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_59.txt b/tools/test/h5diff/expected/h5diff_59.txt
index 996a7b2..996a7b2 100644
--- a/tools/test/h5diff/testfiles/h5diff_59.txt
+++ b/tools/test/h5diff/expected/h5diff_59.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_60.txt b/tools/test/h5diff/expected/h5diff_60.txt
index dde17f6..dde17f6 100644
--- a/tools/test/h5diff/testfiles/h5diff_60.txt
+++ b/tools/test/h5diff/expected/h5diff_60.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/expected/h5diff_600.txt
index 46a1c45..46a1c45 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/expected/h5diff_600.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_601.txt b/tools/test/h5diff/expected/h5diff_601.txt
index eb12f38..eb12f38 100644
--- a/tools/test/h5diff/testfiles/h5diff_601.txt
+++ b/tools/test/h5diff/expected/h5diff_601.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_601_ERR.err b/tools/test/h5diff/expected/h5diff_601_ERR.err
index f9a7212..f9a7212 100644
--- a/tools/test/h5diff/testfiles/h5diff_601_ERR.err
+++ b/tools/test/h5diff/expected/h5diff_601_ERR.err
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/expected/h5diff_603.txt
index e930dbe..e930dbe 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/expected/h5diff_603.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_604.txt b/tools/test/h5diff/expected/h5diff_604.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_604.txt
+++ b/tools/test/h5diff/expected/h5diff_604.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_605.txt b/tools/test/h5diff/expected/h5diff_605.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_605.txt
+++ b/tools/test/h5diff/expected/h5diff_605.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/expected/h5diff_606.txt
index 02b80eb..02b80eb 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/expected/h5diff_606.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_607.txt b/tools/test/h5diff/expected/h5diff_607.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_607.txt
+++ b/tools/test/h5diff/expected/h5diff_607.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_608.txt b/tools/test/h5diff/expected/h5diff_608.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_608.txt
+++ b/tools/test/h5diff/expected/h5diff_608.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_609.txt b/tools/test/h5diff/expected/h5diff_609.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_609.txt
+++ b/tools/test/h5diff/expected/h5diff_609.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_61.txt b/tools/test/h5diff/expected/h5diff_61.txt
index 5553d63..5553d63 100644
--- a/tools/test/h5diff/testfiles/h5diff_61.txt
+++ b/tools/test/h5diff/expected/h5diff_61.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_610.txt b/tools/test/h5diff/expected/h5diff_610.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_610.txt
+++ b/tools/test/h5diff/expected/h5diff_610.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/expected/h5diff_612.txt
index 4cccece..4cccece 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/expected/h5diff_612.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_613.txt b/tools/test/h5diff/expected/h5diff_613.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_613.txt
+++ b/tools/test/h5diff/expected/h5diff_613.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_614.txt b/tools/test/h5diff/expected/h5diff_614.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_614.txt
+++ b/tools/test/h5diff/expected/h5diff_614.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/expected/h5diff_615.txt
index 3641164..3641164 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/expected/h5diff_615.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_616.txt b/tools/test/h5diff/expected/h5diff_616.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_616.txt
+++ b/tools/test/h5diff/expected/h5diff_616.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_617.txt b/tools/test/h5diff/expected/h5diff_617.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_617.txt
+++ b/tools/test/h5diff/expected/h5diff_617.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_618.txt b/tools/test/h5diff/expected/h5diff_618.txt
index eca5994..eca5994 100644
--- a/tools/test/h5diff/testfiles/h5diff_618.txt
+++ b/tools/test/h5diff/expected/h5diff_618.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_619.txt b/tools/test/h5diff/expected/h5diff_619.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_619.txt
+++ b/tools/test/h5diff/expected/h5diff_619.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_62.txt b/tools/test/h5diff/expected/h5diff_62.txt
index 934f61e..934f61e 100644
--- a/tools/test/h5diff/testfiles/h5diff_62.txt
+++ b/tools/test/h5diff/expected/h5diff_62.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/expected/h5diff_621.txt
index 05b952c..05b952c 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/expected/h5diff_621.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/expected/h5diff_622.txt
index 4d3e945..4d3e945 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/expected/h5diff_622.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/expected/h5diff_623.txt
index fd992ef..fd992ef 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/expected/h5diff_623.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/expected/h5diff_624.txt
index cc9578f..cc9578f 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/expected/h5diff_624.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_625.txt b/tools/test/h5diff/expected/h5diff_625.txt
index 3bc194a..3bc194a 100644
--- a/tools/test/h5diff/testfiles/h5diff_625.txt
+++ b/tools/test/h5diff/expected/h5diff_625.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_626.txt b/tools/test/h5diff/expected/h5diff_626.txt
index 6494066..6494066 100644
--- a/tools/test/h5diff/testfiles/h5diff_626.txt
+++ b/tools/test/h5diff/expected/h5diff_626.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_627.txt b/tools/test/h5diff/expected/h5diff_627.txt
index db14532..db14532 100644
--- a/tools/test/h5diff/testfiles/h5diff_627.txt
+++ b/tools/test/h5diff/expected/h5diff_627.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_628.txt b/tools/test/h5diff/expected/h5diff_628.txt
index e11d8ee..e11d8ee 100644
--- a/tools/test/h5diff/testfiles/h5diff_628.txt
+++ b/tools/test/h5diff/expected/h5diff_628.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_629.txt b/tools/test/h5diff/expected/h5diff_629.txt
index 962c2b0..962c2b0 100644
--- a/tools/test/h5diff/testfiles/h5diff_629.txt
+++ b/tools/test/h5diff/expected/h5diff_629.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_63.txt b/tools/test/h5diff/expected/h5diff_63.txt
index 6b46c18..6b46c18 100644
--- a/tools/test/h5diff/testfiles/h5diff_63.txt
+++ b/tools/test/h5diff/expected/h5diff_63.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_630.txt b/tools/test/h5diff/expected/h5diff_630.txt
index aaf0148..aaf0148 100644
--- a/tools/test/h5diff/testfiles/h5diff_630.txt
+++ b/tools/test/h5diff/expected/h5diff_630.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_631.txt b/tools/test/h5diff/expected/h5diff_631.txt
index aaf0148..aaf0148 100644
--- a/tools/test/h5diff/testfiles/h5diff_631.txt
+++ b/tools/test/h5diff/expected/h5diff_631.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_640.txt b/tools/test/h5diff/expected/h5diff_640.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_640.txt
+++ b/tools/test/h5diff/expected/h5diff_640.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_641.txt b/tools/test/h5diff/expected/h5diff_641.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_641.txt
+++ b/tools/test/h5diff/expected/h5diff_641.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_642.txt b/tools/test/h5diff/expected/h5diff_642.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_642.txt
+++ b/tools/test/h5diff/expected/h5diff_642.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_643.txt b/tools/test/h5diff/expected/h5diff_643.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_643.txt
+++ b/tools/test/h5diff/expected/h5diff_643.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_644.txt b/tools/test/h5diff/expected/h5diff_644.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_644.txt
+++ b/tools/test/h5diff/expected/h5diff_644.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_645.txt b/tools/test/h5diff/expected/h5diff_645.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_645.txt
+++ b/tools/test/h5diff/expected/h5diff_645.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_646.txt b/tools/test/h5diff/expected/h5diff_646.txt
index 4c956a6..4c956a6 100644
--- a/tools/test/h5diff/testfiles/h5diff_646.txt
+++ b/tools/test/h5diff/expected/h5diff_646.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_70.txt b/tools/test/h5diff/expected/h5diff_70.txt
index b0b8bf6..b0b8bf6 100644
--- a/tools/test/h5diff/testfiles/h5diff_70.txt
+++ b/tools/test/h5diff/expected/h5diff_70.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_700.txt b/tools/test/h5diff/expected/h5diff_700.txt
index 6cf9893..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_700.txt
+++ b/tools/test/h5diff/expected/h5diff_700.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_701.txt b/tools/test/h5diff/expected/h5diff_701.txt
index 4187754..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_701.txt
+++ b/tools/test/h5diff/expected/h5diff_701.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_702.txt b/tools/test/h5diff/expected/h5diff_702.txt
index 6cf9893..6cf9893 100644
--- a/tools/test/h5diff/testfiles/h5diff_702.txt
+++ b/tools/test/h5diff/expected/h5diff_702.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_703.txt b/tools/test/h5diff/expected/h5diff_703.txt
index 4187754..4187754 100644
--- a/tools/test/h5diff/testfiles/h5diff_703.txt
+++ b/tools/test/h5diff/expected/h5diff_703.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_704.txt b/tools/test/h5diff/expected/h5diff_704.txt
index e752a01..e752a01 100644
--- a/tools/test/h5diff/testfiles/h5diff_704.txt
+++ b/tools/test/h5diff/expected/h5diff_704.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_705.txt b/tools/test/h5diff/expected/h5diff_705.txt
index 2e52f18..2e52f18 100644
--- a/tools/test/h5diff/testfiles/h5diff_705.txt
+++ b/tools/test/h5diff/expected/h5diff_705.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_706.txt b/tools/test/h5diff/expected/h5diff_706.txt
index 5825150..5825150 100644
--- a/tools/test/h5diff/testfiles/h5diff_706.txt
+++ b/tools/test/h5diff/expected/h5diff_706.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_707.txt b/tools/test/h5diff/expected/h5diff_707.txt
index 4d6378b..4d6378b 100644
--- a/tools/test/h5diff/testfiles/h5diff_707.txt
+++ b/tools/test/h5diff/expected/h5diff_707.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_708.txt b/tools/test/h5diff/expected/h5diff_708.txt
index a10a8b7..a10a8b7 100644
--- a/tools/test/h5diff/testfiles/h5diff_708.txt
+++ b/tools/test/h5diff/expected/h5diff_708.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_709.txt b/tools/test/h5diff/expected/h5diff_709.txt
index d0e68bf..d0e68bf 100644
--- a/tools/test/h5diff/testfiles/h5diff_709.txt
+++ b/tools/test/h5diff/expected/h5diff_709.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_710.txt b/tools/test/h5diff/expected/h5diff_710.txt
index 10a8501..10a8501 100644
--- a/tools/test/h5diff/testfiles/h5diff_710.txt
+++ b/tools/test/h5diff/expected/h5diff_710.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_80.txt b/tools/test/h5diff/expected/h5diff_80.txt
index 11dccd8..11dccd8 100644
--- a/tools/test/h5diff/testfiles/h5diff_80.txt
+++ b/tools/test/h5diff/expected/h5diff_80.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_800.txt b/tools/test/h5diff/expected/h5diff_800.txt
index e43e7b4..e43e7b4 100644
--- a/tools/test/h5diff/testfiles/h5diff_800.txt
+++ b/tools/test/h5diff/expected/h5diff_800.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_801.txt b/tools/test/h5diff/expected/h5diff_801.txt
index 043e7e3..043e7e3 100644
--- a/tools/test/h5diff/testfiles/h5diff_801.txt
+++ b/tools/test/h5diff/expected/h5diff_801.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_830.txt b/tools/test/h5diff/expected/h5diff_830.txt
index 8f00d8b..8f00d8b 100644
--- a/tools/test/h5diff/testfiles/h5diff_830.txt
+++ b/tools/test/h5diff/expected/h5diff_830.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_8625.txt b/tools/test/h5diff/expected/h5diff_8625.txt
index a7ddb86..a7ddb86 100644
--- a/tools/test/h5diff/testfiles/h5diff_8625.txt
+++ b/tools/test/h5diff/expected/h5diff_8625.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_8639.txt b/tools/test/h5diff/expected/h5diff_8639.txt
index 4022e06..4022e06 100644
--- a/tools/test/h5diff/testfiles/h5diff_8639.txt
+++ b/tools/test/h5diff/expected/h5diff_8639.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_90.txt b/tools/test/h5diff/expected/h5diff_90.txt
index 9965ab0..9965ab0 100644
--- a/tools/test/h5diff/testfiles/h5diff_90.txt
+++ b/tools/test/h5diff/expected/h5diff_90.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_900.txt b/tools/test/h5diff/expected/h5diff_900.txt
index eca7872..eca7872 100644
--- a/tools/test/h5diff/testfiles/h5diff_900.txt
+++ b/tools/test/h5diff/expected/h5diff_900.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_901.txt b/tools/test/h5diff/expected/h5diff_901.txt
index eb1f7d9..eb1f7d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_901.txt
+++ b/tools/test/h5diff/expected/h5diff_901.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_902.txt b/tools/test/h5diff/expected/h5diff_902.txt
index 3863e16..3863e16 100644
--- a/tools/test/h5diff/testfiles/h5diff_902.txt
+++ b/tools/test/h5diff/expected/h5diff_902.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_eps.txt b/tools/test/h5diff/expected/h5diff_eps.txt
index 3a71366..3a71366 100644
--- a/tools/test/h5diff/testfiles/h5diff_eps.txt
+++ b/tools/test/h5diff/expected/h5diff_eps.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_reg.txt b/tools/test/h5diff/expected/h5diff_reg.txt
index ecb6275..ecb6275 100644
--- a/tools/test/h5diff/testfiles/h5diff_reg.txt
+++ b/tools/test/h5diff/expected/h5diff_reg.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_ud.txt b/tools/test/h5diff/expected/h5diff_ud.txt
index ddda3ff..ddda3ff 100644
--- a/tools/test/h5diff/testfiles/h5diff_ud.txt
+++ b/tools/test/h5diff/expected/h5diff_ud.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.err b/tools/test/h5diff/expected/h5diff_udfail.err
index d51de38..d51de38 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.err
+++ b/tools/test/h5diff/expected/h5diff_udfail.err
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/expected/h5diff_udfail.txt
index e6000fc..e6000fc 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.txt
+++ b/tools/test/h5diff/expected/h5diff_udfail.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v1.txt b/tools/test/h5diff/expected/h5diff_v1.txt
index 8210cf9..8210cf9 100644
--- a/tools/test/h5diff/testfiles/h5diff_v1.txt
+++ b/tools/test/h5diff/expected/h5diff_v1.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v2.txt b/tools/test/h5diff/expected/h5diff_v2.txt
index aa327b1..aa327b1 100644
--- a/tools/test/h5diff/testfiles/h5diff_v2.txt
+++ b/tools/test/h5diff/expected/h5diff_v2.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_v3.txt b/tools/test/h5diff/expected/h5diff_v3.txt
index 57af303..57af303 100644
--- a/tools/test/h5diff/testfiles/h5diff_v3.txt
+++ b/tools/test/h5diff/expected/h5diff_v3.txt
diff --git a/tools/test/h5diff/testfiles/h5diff_vlstr.txt b/tools/test/h5diff/expected/h5diff_vlstr.txt
index 67141f1..67141f1 100644
--- a/tools/test/h5diff/testfiles/h5diff_vlstr.txt
+++ b/tools/test/h5diff/expected/h5diff_vlstr.txt
diff --git a/tools/test/h5diff/h5diff_plugin.sh.in b/tools/test/h5diff/h5diff_plugin.sh.in
index e3f0f01..525503d 100644
--- a/tools/test/h5diff/h5diff_plugin.sh.in
+++ b/tools/test/h5diff/h5diff_plugin.sh.in
@@ -45,6 +45,7 @@ SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
+SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -61,9 +62,9 @@ test -d $TESTDIR || mkdir $TESTDIR
 LIST_HDF5_TEST_FILES="
 $SRC_H5DIFF_TESTFILES/tudfilter.h5
 $SRC_H5DIFF_TESTFILES/tudfilter2.h5
-$SRC_H5DIFF_TESTFILES/h5diff_ud.txt
-$SRC_H5DIFF_TESTFILES/h5diff_udfail.err
-$SRC_H5DIFF_TESTFILES/h5diff_udfail.txt
+$SRC_H5DIFF_OUTFILES/h5diff_ud.txt
+$SRC_H5DIFF_OUTFILES/h5diff_udfail.err
+$SRC_H5DIFF_OUTFILES/h5diff_udfail.txt
 "
 
 # Main Body
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 37c2cc3..e595dd3 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -333,16 +333,16 @@ onion_filepaths_init(const char *basename)
     if (NULL == (paths = calloc(1, sizeof(struct onion_filepaths))))
         goto error;
 
-    if (NULL == (paths->canon = HDstrdup(basename)))
+    if (NULL == (paths->canon = strdup(basename)))
         goto error;
 
     if (NULL == (paths->onion = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
         goto error;
-    HDsnprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
+    snprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
 
     if (NULL == (paths->recovery = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
         goto error;
-    HDsnprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
+    snprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
 
     return paths;
 
@@ -1139,15 +1139,15 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         float data15[6];
         float data16[6];
 
-        data15[0] = (float)HDsqrt(-1.0);
+        data15[0] = (float)sqrt(-1.0);
         data15[1] = 1.0;
-        data15[2] = (float)HDsqrt(-1.0);
+        data15[2] = (float)sqrt(-1.0);
         data15[3] = 1.0;
         data15[4] = 1.0;
         data15[5] = 1.0;
 
-        data16[0] = (float)HDsqrt(-1.0);
-        data16[1] = (float)HDsqrt(-1.0);
+        data16[0] = (float)sqrt(-1.0);
+        data16[1] = (float)sqrt(-1.0);
         data16[2] = 1.0;
         data16[3] = 1.0;
         data16[4] = 1.0;
@@ -1166,15 +1166,15 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         double data17[6];
         double data18[6];
 
-        data17[0] = HDsqrt(-1.0);
+        data17[0] = sqrt(-1.0);
         data17[1] = 1.0;
-        data17[2] = HDsqrt(-1.0);
+        data17[2] = sqrt(-1.0);
         data17[3] = 1.0;
         data17[4] = 1.0;
         data17[5] = 1.0;
 
-        data18[0] = HDsqrt(-1.0);
-        data18[1] = HDsqrt(-10000.0);
+        data18[0] = sqrt(-1.0);
+        data18[1] = sqrt(-10000.0);
         data18[2] = 1.0;
         data18[3] = 1.0;
         data18[4] = 1.0;
@@ -1193,11 +1193,11 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         float  data19[6];
         double data20[6];
 
-        data19[0] = data19[1] = data19[2] = (float)HDlog(0.0);
-        data19[3] = data19[4] = data19[5] = (float)-HDlog(0.0);
+        data19[0] = data19[1] = data19[2] = (float)log(0.0);
+        data19[3] = data19[4] = data19[5] = (float)-log(0.0);
 
-        data20[0] = data20[1] = data20[2] = HDlog(0.0);
-        data20[3] = data20[4] = data20[5] = -HDlog(0.0);
+        data20[0] = data20[1] = data20[2] = log(0.0);
+        data20[3] = data20[4] = data20[5] = -log(0.0);
 
         write_dset(gid1, 1, dims1, "fp19", H5T_NATIVE_FLOAT, data19);
         write_dset(gid1, 1, dims1, "fp19_COPY", H5T_NATIVE_FLOAT, data19);
@@ -1221,13 +1221,13 @@ test_basic(const char *fname1, const char *fname2, const char *fname3)
         size_t  type_size;
         hid_t   tid;
 
-        buf1[0].d = HDsqrt(-1.0);
-        buf1[0].f = (float)HDsqrt(-1.0);
-        buf2[0].d = HDsqrt(-1.0);
-        buf2[0].f = (float)HDsqrt(-1.0);
+        buf1[0].d = sqrt(-1.0);
+        buf1[0].f = (float)sqrt(-1.0);
+        buf2[0].d = sqrt(-1.0);
+        buf2[0].f = (float)sqrt(-1.0);
 
-        buf1[1].d = HDsqrt(-1.0);
-        buf1[1].f = (float)HDsqrt(-1.0);
+        buf1[1].d = sqrt(-1.0);
+        buf1[1].f = (float)sqrt(-1.0);
         buf2[1].d = 0.0;
         buf2[1].f = 0.0;
 
@@ -4262,35 +4262,35 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
     comp9_buf.str_vlen = comp9_buf.str_vlen_repeat = vlen_str_buf;
 
     /* copy fixlen string data to compound buffers */
-    HDstrcpy(comp1_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp1_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp1_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp1_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp2_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp2_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp2_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp2_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp3_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp3_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp3_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp3_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp3_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp4_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp4_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp4_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp4_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp5_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp5_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp5_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp5_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp6_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp6_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp6_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp6_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp7_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp7_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp7_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp7_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp8_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp8_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp8_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp8_buf.str_fixlen_repeat, fixlen_str_buf);
 
-    HDstrcpy(comp9_buf.str_fixlen, fixlen_str_buf);
-    HDstrcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
+    strcpy(comp9_buf.str_fixlen, fixlen_str_buf);
+    strcpy(comp9_buf.str_fixlen_repeat, fixlen_str_buf);
 
     /* copy vlen string array data to compound buffers */
     for (i = 0; i < VLEN_STR_ARRY_DIM; i++) {
@@ -4307,32 +4307,32 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new
 
     /* copy fixlen string attay data to compound buffers */
     for (i = 0; i < FIXLEN_STR_ARRY_DIM; i++) {
-        HDstrcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp1_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp1_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp2_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp2_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp2_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp2_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp3_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp3_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp3_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp3_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp4_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp4_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp4_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp4_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp5_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp5_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp5_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp5_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp6_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp6_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp6_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp6_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp7_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp7_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp7_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp7_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp8_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp8_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp8_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp8_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
 
-        HDstrcpy(comp9_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
-        HDstrcpy(comp9_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
+        strcpy(comp9_buf.str_array_fixlen[i], fixlen_str_array_buf[i]);
+        strcpy(comp9_buf.str_fixlen_array_again[i], fixlen_str_array_buf[i]);
     }
 
     /* int data */
diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in
index 7cc82a1..efaac2e 100644
--- a/tools/test/h5diff/testh5diff.sh.in
+++ b/tools/test/h5diff/testh5diff.sh.in
@@ -38,16 +38,16 @@ mydomainname=`domainname 2>/dev/null`
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5DIFF_OUTFILES="$SRC_TOOLS/test/h5diff/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -116,249 +116,249 @@ $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_ext.h5.onion
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5
 $SRC_H5DIFF_TESTFILES/h5diff_onion_dset_1d.h5.onion
-$SRC_TOOLS_TESTFILES/tvlstr.h5
 "
 
 LIST_HDF5_VDS_TEST_FILES="
-$SRC_TOOLS_TESTFILES/vds/1_a.h5
-$SRC_TOOLS_TESTFILES/vds/1_b.h5
-$SRC_TOOLS_TESTFILES/vds/1_c.h5
-$SRC_TOOLS_TESTFILES/vds/1_d.h5
-$SRC_TOOLS_TESTFILES/vds/1_e.h5
-$SRC_TOOLS_TESTFILES/vds/1_f.h5
-$SRC_TOOLS_TESTFILES/vds/1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/2_a.h5
-$SRC_TOOLS_TESTFILES/vds/2_b.h5
-$SRC_TOOLS_TESTFILES/vds/2_c.h5
-$SRC_TOOLS_TESTFILES/vds/2_d.h5
-$SRC_TOOLS_TESTFILES/vds/2_e.h5
-$SRC_TOOLS_TESTFILES/vds/2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/4_0.h5
-$SRC_TOOLS_TESTFILES/vds/4_1.h5
-$SRC_TOOLS_TESTFILES/vds/4_2.h5
-$SRC_TOOLS_TESTFILES/vds/4_vds.h5
-$SRC_TOOLS_TESTFILES/vds/5_a.h5
-$SRC_TOOLS_TESTFILES/vds/5_b.h5
-$SRC_TOOLS_TESTFILES/vds/5_c.h5
-$SRC_TOOLS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 "
 
 LIST_HDF5_STD_REF_OBJ_TEST_FILES="
-$SRC_TOOLS_TESTFILES/trefer_attr.h5
-$SRC_TOOLS_TESTFILES/trefer_compat.h5
-$SRC_TOOLS_TESTFILES/trefer_ext1.h5
-$SRC_TOOLS_TESTFILES/trefer_ext2.h5
-$SRC_TOOLS_TESTFILES/trefer_grp.h5
-$SRC_TOOLS_TESTFILES/trefer_obj_del.h5
-$SRC_TOOLS_TESTFILES/trefer_obj.h5
-$SRC_TOOLS_TESTFILES/trefer_param.h5
-$SRC_TOOLS_TESTFILES/trefer_reg_1d.h5
-$SRC_TOOLS_TESTFILES/trefer_reg.h5
+$SRC_H5DUMP_TESTFILES/tvlstr.h5
+$SRC_H5DUMP_TESTFILES/trefer_attr.h5
+$SRC_H5DUMP_TESTFILES/trefer_compat.h5
+$SRC_H5DUMP_TESTFILES/trefer_ext1.h5
+$SRC_H5DUMP_TESTFILES/trefer_ext2.h5
+$SRC_H5DUMP_TESTFILES/trefer_grp.h5
+$SRC_H5DUMP_TESTFILES/trefer_obj_del.h5
+$SRC_H5DUMP_TESTFILES/trefer_obj.h5
+$SRC_H5DUMP_TESTFILES/trefer_param.h5
+$SRC_H5DUMP_TESTFILES/trefer_reg_1d.h5
+$SRC_H5DUMP_TESTFILES/trefer_reg.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DIFF_TESTFILES/h5diff_10.txt
-$SRC_H5DIFF_TESTFILES/h5diff_100.txt
-$SRC_H5DIFF_TESTFILES/h5diff_101.txt
-$SRC_H5DIFF_TESTFILES/h5diff_102.txt
-$SRC_H5DIFF_TESTFILES/h5diff_103.txt
-$SRC_H5DIFF_TESTFILES/h5diff_104.txt
-$SRC_H5DIFF_TESTFILES/h5diff_11.txt
-$SRC_H5DIFF_TESTFILES/h5diff_12.txt
-$SRC_H5DIFF_TESTFILES/h5diff_13.txt
-$SRC_H5DIFF_TESTFILES/h5diff_14.txt
-$SRC_H5DIFF_TESTFILES/h5diff_15.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_2.txt
-$SRC_H5DIFF_TESTFILES/h5diff_16_3.txt
-$SRC_H5DIFF_TESTFILES/h5diff_17.txt
-$SRC_H5DIFF_TESTFILES/h5diff_171.txt
-$SRC_H5DIFF_TESTFILES/h5diff_172.txt
-$SRC_H5DIFF_TESTFILES/h5diff_18_1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_18.txt
-$SRC_H5DIFF_TESTFILES/h5diff_20.txt
-$SRC_H5DIFF_TESTFILES/h5diff_200.txt
-$SRC_H5DIFF_TESTFILES/h5diff_201.txt
-$SRC_H5DIFF_TESTFILES/h5diff_202.txt
-$SRC_H5DIFF_TESTFILES/h5diff_203.txt
-$SRC_H5DIFF_TESTFILES/h5diff_204.txt
-$SRC_H5DIFF_TESTFILES/h5diff_205.txt
-$SRC_H5DIFF_TESTFILES/h5diff_206.txt
-$SRC_H5DIFF_TESTFILES/h5diff_207.txt
-$SRC_H5DIFF_TESTFILES/h5diff_208.txt
-$SRC_H5DIFF_TESTFILES/h5diff_220.txt
-$SRC_H5DIFF_TESTFILES/h5diff_221.txt
-$SRC_H5DIFF_TESTFILES/h5diff_222.txt
-$SRC_H5DIFF_TESTFILES/h5diff_223.txt
-$SRC_H5DIFF_TESTFILES/h5diff_224.txt
-$SRC_H5DIFF_TESTFILES/h5diff_21.txt
-$SRC_H5DIFF_TESTFILES/h5diff_22.txt
-$SRC_H5DIFF_TESTFILES/h5diff_23.txt
-$SRC_H5DIFF_TESTFILES/h5diff_24.txt
-$SRC_H5DIFF_TESTFILES/h5diff_25.txt
-$SRC_H5DIFF_TESTFILES/h5diff_26.txt
-$SRC_H5DIFF_TESTFILES/h5diff_27.txt
-$SRC_H5DIFF_TESTFILES/h5diff_28.txt
-$SRC_H5DIFF_TESTFILES/h5diff_30.txt
-$SRC_H5DIFF_TESTFILES/h5diff_300.txt
-$SRC_H5DIFF_TESTFILES/h5diff_400.txt
-$SRC_H5DIFF_TESTFILES/h5diff_401.txt
-$SRC_H5DIFF_TESTFILES/h5diff_402.txt
-$SRC_H5DIFF_TESTFILES/h5diff_403.txt
-$SRC_H5DIFF_TESTFILES/h5diff_404.txt
-$SRC_H5DIFF_TESTFILES/h5diff_405.txt
-$SRC_H5DIFF_TESTFILES/h5diff_406.txt
-$SRC_H5DIFF_TESTFILES/h5diff_407.txt
-$SRC_H5DIFF_TESTFILES/h5diff_408.txt
-$SRC_H5DIFF_TESTFILES/h5diff_409.txt
-$SRC_H5DIFF_TESTFILES/h5diff_410.txt
-$SRC_H5DIFF_TESTFILES/h5diff_411.txt
-$SRC_H5DIFF_TESTFILES/h5diff_412.txt
-$SRC_H5DIFF_TESTFILES/h5diff_413.txt
-$SRC_H5DIFF_TESTFILES/h5diff_414.txt
-$SRC_H5DIFF_TESTFILES/h5diff_415.txt
-$SRC_H5DIFF_TESTFILES/h5diff_416.txt
-$SRC_H5DIFF_TESTFILES/h5diff_417.txt
-$SRC_H5DIFF_TESTFILES/h5diff_418.txt
-$SRC_H5DIFF_TESTFILES/h5diff_419.txt
-$SRC_H5DIFF_TESTFILES/h5diff_420.txt
-$SRC_H5DIFF_TESTFILES/h5diff_421.txt
-$SRC_H5DIFF_TESTFILES/h5diff_422.txt
-$SRC_H5DIFF_TESTFILES/h5diff_423.txt
-$SRC_H5DIFF_TESTFILES/h5diff_424.txt
-$SRC_H5DIFF_TESTFILES/h5diff_425.txt
-$SRC_H5DIFF_TESTFILES/h5diff_450.txt
-$SRC_H5DIFF_TESTFILES/h5diff_451.txt
-$SRC_H5DIFF_TESTFILES/h5diff_452.txt
-$SRC_H5DIFF_TESTFILES/h5diff_453.txt
-$SRC_H5DIFF_TESTFILES/h5diff_454.txt
-$SRC_H5DIFF_TESTFILES/dangling_link.err
-$SRC_H5DIFF_TESTFILES/h5diff_455.txt
-$SRC_H5DIFF_TESTFILES/h5diff_456.txt
-$SRC_H5DIFF_TESTFILES/h5diff_457.txt
-$SRC_H5DIFF_TESTFILES/h5diff_458.txt
-$SRC_H5DIFF_TESTFILES/h5diff_459.txt
-$SRC_H5DIFF_TESTFILES/h5diff_465.txt
-$SRC_H5DIFF_TESTFILES/h5diff_466.txt
-$SRC_H5DIFF_TESTFILES/h5diff_467.txt
-$SRC_H5DIFF_TESTFILES/h5diff_468.txt
-$SRC_H5DIFF_TESTFILES/h5diff_469.txt
-$SRC_H5DIFF_TESTFILES/h5diff_471.txt
-$SRC_H5DIFF_TESTFILES/h5diff_472.txt
-$SRC_H5DIFF_TESTFILES/h5diff_473.txt
-$SRC_H5DIFF_TESTFILES/h5diff_474.txt
-$SRC_H5DIFF_TESTFILES/h5diff_475.txt
-$SRC_H5DIFF_TESTFILES/h5diff_480.txt
-$SRC_H5DIFF_TESTFILES/h5diff_481.txt
-$SRC_H5DIFF_TESTFILES/h5diff_482.txt
-$SRC_H5DIFF_TESTFILES/h5diff_483.txt
-$SRC_H5DIFF_TESTFILES/h5diff_484.txt
-$SRC_H5DIFF_TESTFILES/h5diff_485.txt
-$SRC_H5DIFF_TESTFILES/h5diff_486.txt
-$SRC_H5DIFF_TESTFILES/h5diff_487.txt
-$SRC_H5DIFF_TESTFILES/h5diff_50.txt
-$SRC_H5DIFF_TESTFILES/h5diff_51.txt
-$SRC_H5DIFF_TESTFILES/h5diff_52.txt
-$SRC_H5DIFF_TESTFILES/h5diff_53.txt
-$SRC_H5DIFF_TESTFILES/h5diff_54.txt
-$SRC_H5DIFF_TESTFILES/h5diff_55.txt
-$SRC_H5DIFF_TESTFILES/h5diff_56.txt
-$SRC_H5DIFF_TESTFILES/h5diff_57.txt
-$SRC_H5DIFF_TESTFILES/h5diff_58.txt
-$SRC_H5DIFF_TESTFILES/h5diff_58_ref.txt
-$SRC_H5DIFF_TESTFILES/h5diff_59.txt
-$SRC_H5DIFF_TESTFILES/h5diff_500.txt
-$SRC_H5DIFF_TESTFILES/h5diff_501.txt
-$SRC_H5DIFF_TESTFILES/h5diff_502.txt
-$SRC_H5DIFF_TESTFILES/h5diff_503.txt
-$SRC_H5DIFF_TESTFILES/h5diff_504.txt
-$SRC_H5DIFF_TESTFILES/h5diff_505.txt
-$SRC_H5DIFF_TESTFILES/h5diff_506.txt
-$SRC_H5DIFF_TESTFILES/h5diff_507.txt
-$SRC_H5DIFF_TESTFILES/h5diff_508.txt
-$SRC_H5DIFF_TESTFILES/h5diff_509.txt
-$SRC_H5DIFF_TESTFILES/h5diff_510.txt
-$SRC_H5DIFF_TESTFILES/h5diff_511.txt
-$SRC_H5DIFF_TESTFILES/h5diff_512.txt
-$SRC_H5DIFF_TESTFILES/h5diff_513.txt
-$SRC_H5DIFF_TESTFILES/h5diff_514.txt
-$SRC_H5DIFF_TESTFILES/h5diff_515.txt
-$SRC_H5DIFF_TESTFILES/h5diff_516.txt
-$SRC_H5DIFF_TESTFILES/h5diff_517.txt
-$SRC_H5DIFF_TESTFILES/h5diff_518.txt
-$SRC_H5DIFF_TESTFILES/h5diff_530.txt
-$SRC_H5DIFF_TESTFILES/h5diff_540.txt
-$SRC_H5DIFF_TESTFILES/h5diff_60.txt
-$SRC_H5DIFF_TESTFILES/h5diff_61.txt
-$SRC_H5DIFF_TESTFILES/h5diff_62.txt
-$SRC_H5DIFF_TESTFILES/h5diff_63.txt
-$SRC_H5DIFF_TESTFILES/h5diff_600.txt
-$SRC_H5DIFF_TESTFILES/h5diff_601.txt
-$SRC_H5DIFF_TESTFILES/h5diff_601_ERR.err
-$SRC_H5DIFF_TESTFILES/h5diff_603.txt
-$SRC_H5DIFF_TESTFILES/h5diff_604.txt
-$SRC_H5DIFF_TESTFILES/h5diff_605.txt
-$SRC_H5DIFF_TESTFILES/h5diff_606.txt
-$SRC_H5DIFF_TESTFILES/h5diff_607.txt
-$SRC_H5DIFF_TESTFILES/h5diff_608.txt
-$SRC_H5DIFF_TESTFILES/h5diff_609.txt
-$SRC_H5DIFF_TESTFILES/h5diff_610.txt
-$SRC_H5DIFF_TESTFILES/h5diff_612.txt
-$SRC_H5DIFF_TESTFILES/h5diff_613.txt
-$SRC_H5DIFF_TESTFILES/h5diff_614.txt
-$SRC_H5DIFF_TESTFILES/h5diff_615.txt
-$SRC_H5DIFF_TESTFILES/h5diff_616.txt
-$SRC_H5DIFF_TESTFILES/h5diff_617.txt
-$SRC_H5DIFF_TESTFILES/h5diff_618.txt
-$SRC_H5DIFF_TESTFILES/h5diff_619.txt
-$SRC_H5DIFF_TESTFILES/h5diff_621.txt
-$SRC_H5DIFF_TESTFILES/h5diff_622.txt
-$SRC_H5DIFF_TESTFILES/h5diff_623.txt
-$SRC_H5DIFF_TESTFILES/h5diff_624.txt
-$SRC_H5DIFF_TESTFILES/h5diff_625.txt
-$SRC_H5DIFF_TESTFILES/h5diff_626.txt
-$SRC_H5DIFF_TESTFILES/h5diff_627.txt
-$SRC_H5DIFF_TESTFILES/h5diff_628.txt
-$SRC_H5DIFF_TESTFILES/h5diff_629.txt
-$SRC_H5DIFF_TESTFILES/h5diff_630.txt
-$SRC_H5DIFF_TESTFILES/h5diff_631.txt
-$SRC_H5DIFF_TESTFILES/h5diff_640.txt
-$SRC_H5DIFF_TESTFILES/h5diff_641.txt
-$SRC_H5DIFF_TESTFILES/h5diff_642.txt
-$SRC_H5DIFF_TESTFILES/h5diff_643.txt
-$SRC_H5DIFF_TESTFILES/h5diff_644.txt
-$SRC_H5DIFF_TESTFILES/h5diff_645.txt
-$SRC_H5DIFF_TESTFILES/h5diff_646.txt
-$SRC_H5DIFF_TESTFILES/h5diff_70.txt
-$SRC_H5DIFF_TESTFILES/h5diff_700.txt
-$SRC_H5DIFF_TESTFILES/h5diff_701.txt
-$SRC_H5DIFF_TESTFILES/h5diff_702.txt
-$SRC_H5DIFF_TESTFILES/h5diff_703.txt
-$SRC_H5DIFF_TESTFILES/h5diff_704.txt
-$SRC_H5DIFF_TESTFILES/h5diff_705.txt
-$SRC_H5DIFF_TESTFILES/h5diff_706.txt
-$SRC_H5DIFF_TESTFILES/h5diff_707.txt
-$SRC_H5DIFF_TESTFILES/h5diff_708.txt
-$SRC_H5DIFF_TESTFILES/h5diff_709.txt
-$SRC_H5DIFF_TESTFILES/h5diff_710.txt
-$SRC_H5DIFF_TESTFILES/h5diff_80.txt
-$SRC_H5DIFF_TESTFILES/h5diff_800.txt
-$SRC_H5DIFF_TESTFILES/h5diff_801.txt
-$SRC_H5DIFF_TESTFILES/h5diff_830.txt
-$SRC_H5DIFF_TESTFILES/h5diff_90.txt
-$SRC_H5DIFF_TESTFILES/h5diff_900.txt
-$SRC_H5DIFF_TESTFILES/h5diff_901.txt
-$SRC_H5DIFF_TESTFILES/h5diff_902.txt
-$SRC_H5DIFF_TESTFILES/h5diff_8625.txt
-$SRC_H5DIFF_TESTFILES/h5diff_8639.txt
-$SRC_H5DIFF_TESTFILES/h5diff_reg.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v1.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v2.txt
-$SRC_H5DIFF_TESTFILES/h5diff_v3.txt
-$SRC_H5DIFF_TESTFILES/h5diff_vlstr.txt
-$SRC_H5DIFF_TESTFILES/h5diff_eps.txt
+$SRC_H5DIFF_OUTFILES/h5diff_10.txt
+$SRC_H5DIFF_OUTFILES/h5diff_100.txt
+$SRC_H5DIFF_OUTFILES/h5diff_101.txt
+$SRC_H5DIFF_OUTFILES/h5diff_102.txt
+$SRC_H5DIFF_OUTFILES/h5diff_103.txt
+$SRC_H5DIFF_OUTFILES/h5diff_104.txt
+$SRC_H5DIFF_OUTFILES/h5diff_11.txt
+$SRC_H5DIFF_OUTFILES/h5diff_12.txt
+$SRC_H5DIFF_OUTFILES/h5diff_13.txt
+$SRC_H5DIFF_OUTFILES/h5diff_14.txt
+$SRC_H5DIFF_OUTFILES/h5diff_15.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_2.txt
+$SRC_H5DIFF_OUTFILES/h5diff_16_3.txt
+$SRC_H5DIFF_OUTFILES/h5diff_17.txt
+$SRC_H5DIFF_OUTFILES/h5diff_171.txt
+$SRC_H5DIFF_OUTFILES/h5diff_172.txt
+$SRC_H5DIFF_OUTFILES/h5diff_18_1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_18.txt
+$SRC_H5DIFF_OUTFILES/h5diff_20.txt
+$SRC_H5DIFF_OUTFILES/h5diff_200.txt
+$SRC_H5DIFF_OUTFILES/h5diff_201.txt
+$SRC_H5DIFF_OUTFILES/h5diff_202.txt
+$SRC_H5DIFF_OUTFILES/h5diff_203.txt
+$SRC_H5DIFF_OUTFILES/h5diff_204.txt
+$SRC_H5DIFF_OUTFILES/h5diff_205.txt
+$SRC_H5DIFF_OUTFILES/h5diff_206.txt
+$SRC_H5DIFF_OUTFILES/h5diff_207.txt
+$SRC_H5DIFF_OUTFILES/h5diff_208.txt
+$SRC_H5DIFF_OUTFILES/h5diff_220.txt
+$SRC_H5DIFF_OUTFILES/h5diff_221.txt
+$SRC_H5DIFF_OUTFILES/h5diff_222.txt
+$SRC_H5DIFF_OUTFILES/h5diff_223.txt
+$SRC_H5DIFF_OUTFILES/h5diff_224.txt
+$SRC_H5DIFF_OUTFILES/h5diff_21.txt
+$SRC_H5DIFF_OUTFILES/h5diff_22.txt
+$SRC_H5DIFF_OUTFILES/h5diff_23.txt
+$SRC_H5DIFF_OUTFILES/h5diff_24.txt
+$SRC_H5DIFF_OUTFILES/h5diff_25.txt
+$SRC_H5DIFF_OUTFILES/h5diff_26.txt
+$SRC_H5DIFF_OUTFILES/h5diff_27.txt
+$SRC_H5DIFF_OUTFILES/h5diff_28.txt
+$SRC_H5DIFF_OUTFILES/h5diff_30.txt
+$SRC_H5DIFF_OUTFILES/h5diff_300.txt
+$SRC_H5DIFF_OUTFILES/h5diff_400.txt
+$SRC_H5DIFF_OUTFILES/h5diff_401.txt
+$SRC_H5DIFF_OUTFILES/h5diff_402.txt
+$SRC_H5DIFF_OUTFILES/h5diff_403.txt
+$SRC_H5DIFF_OUTFILES/h5diff_404.txt
+$SRC_H5DIFF_OUTFILES/h5diff_405.txt
+$SRC_H5DIFF_OUTFILES/h5diff_406.txt
+$SRC_H5DIFF_OUTFILES/h5diff_407.txt
+$SRC_H5DIFF_OUTFILES/h5diff_408.txt
+$SRC_H5DIFF_OUTFILES/h5diff_409.txt
+$SRC_H5DIFF_OUTFILES/h5diff_410.txt
+$SRC_H5DIFF_OUTFILES/h5diff_411.txt
+$SRC_H5DIFF_OUTFILES/h5diff_412.txt
+$SRC_H5DIFF_OUTFILES/h5diff_413.txt
+$SRC_H5DIFF_OUTFILES/h5diff_414.txt
+$SRC_H5DIFF_OUTFILES/h5diff_415.txt
+$SRC_H5DIFF_OUTFILES/h5diff_416.txt
+$SRC_H5DIFF_OUTFILES/h5diff_417.txt
+$SRC_H5DIFF_OUTFILES/h5diff_418.txt
+$SRC_H5DIFF_OUTFILES/h5diff_419.txt
+$SRC_H5DIFF_OUTFILES/h5diff_420.txt
+$SRC_H5DIFF_OUTFILES/h5diff_421.txt
+$SRC_H5DIFF_OUTFILES/h5diff_422.txt
+$SRC_H5DIFF_OUTFILES/h5diff_423.txt
+$SRC_H5DIFF_OUTFILES/h5diff_424.txt
+$SRC_H5DIFF_OUTFILES/h5diff_425.txt
+$SRC_H5DIFF_OUTFILES/h5diff_450.txt
+$SRC_H5DIFF_OUTFILES/h5diff_451.txt
+$SRC_H5DIFF_OUTFILES/h5diff_452.txt
+$SRC_H5DIFF_OUTFILES/h5diff_453.txt
+$SRC_H5DIFF_OUTFILES/h5diff_454.txt
+$SRC_H5DIFF_OUTFILES/dangling_link.err
+$SRC_H5DIFF_OUTFILES/h5diff_455.txt
+$SRC_H5DIFF_OUTFILES/h5diff_456.txt
+$SRC_H5DIFF_OUTFILES/h5diff_457.txt
+$SRC_H5DIFF_OUTFILES/h5diff_458.txt
+$SRC_H5DIFF_OUTFILES/h5diff_459.txt
+$SRC_H5DIFF_OUTFILES/h5diff_465.txt
+$SRC_H5DIFF_OUTFILES/h5diff_466.txt
+$SRC_H5DIFF_OUTFILES/h5diff_467.txt
+$SRC_H5DIFF_OUTFILES/h5diff_468.txt
+$SRC_H5DIFF_OUTFILES/h5diff_469.txt
+$SRC_H5DIFF_OUTFILES/h5diff_471.txt
+$SRC_H5DIFF_OUTFILES/h5diff_472.txt
+$SRC_H5DIFF_OUTFILES/h5diff_473.txt
+$SRC_H5DIFF_OUTFILES/h5diff_474.txt
+$SRC_H5DIFF_OUTFILES/h5diff_475.txt
+$SRC_H5DIFF_OUTFILES/h5diff_480.txt
+$SRC_H5DIFF_OUTFILES/h5diff_481.txt
+$SRC_H5DIFF_OUTFILES/h5diff_482.txt
+$SRC_H5DIFF_OUTFILES/h5diff_483.txt
+$SRC_H5DIFF_OUTFILES/h5diff_484.txt
+$SRC_H5DIFF_OUTFILES/h5diff_485.txt
+$SRC_H5DIFF_OUTFILES/h5diff_486.txt
+$SRC_H5DIFF_OUTFILES/h5diff_487.txt
+$SRC_H5DIFF_OUTFILES/h5diff_50.txt
+$SRC_H5DIFF_OUTFILES/h5diff_51.txt
+$SRC_H5DIFF_OUTFILES/h5diff_52.txt
+$SRC_H5DIFF_OUTFILES/h5diff_53.txt
+$SRC_H5DIFF_OUTFILES/h5diff_54.txt
+$SRC_H5DIFF_OUTFILES/h5diff_55.txt
+$SRC_H5DIFF_OUTFILES/h5diff_56.txt
+$SRC_H5DIFF_OUTFILES/h5diff_57.txt
+$SRC_H5DIFF_OUTFILES/h5diff_58.txt
+$SRC_H5DIFF_OUTFILES/h5diff_58_ref.txt
+$SRC_H5DIFF_OUTFILES/h5diff_59.txt
+$SRC_H5DIFF_OUTFILES/h5diff_500.txt
+$SRC_H5DIFF_OUTFILES/h5diff_501.txt
+$SRC_H5DIFF_OUTFILES/h5diff_502.txt
+$SRC_H5DIFF_OUTFILES/h5diff_503.txt
+$SRC_H5DIFF_OUTFILES/h5diff_504.txt
+$SRC_H5DIFF_OUTFILES/h5diff_505.txt
+$SRC_H5DIFF_OUTFILES/h5diff_506.txt
+$SRC_H5DIFF_OUTFILES/h5diff_507.txt
+$SRC_H5DIFF_OUTFILES/h5diff_508.txt
+$SRC_H5DIFF_OUTFILES/h5diff_509.txt
+$SRC_H5DIFF_OUTFILES/h5diff_510.txt
+$SRC_H5DIFF_OUTFILES/h5diff_511.txt
+$SRC_H5DIFF_OUTFILES/h5diff_512.txt
+$SRC_H5DIFF_OUTFILES/h5diff_513.txt
+$SRC_H5DIFF_OUTFILES/h5diff_514.txt
+$SRC_H5DIFF_OUTFILES/h5diff_515.txt
+$SRC_H5DIFF_OUTFILES/h5diff_516.txt
+$SRC_H5DIFF_OUTFILES/h5diff_517.txt
+$SRC_H5DIFF_OUTFILES/h5diff_518.txt
+$SRC_H5DIFF_OUTFILES/h5diff_530.txt
+$SRC_H5DIFF_OUTFILES/h5diff_540.txt
+$SRC_H5DIFF_OUTFILES/h5diff_60.txt
+$SRC_H5DIFF_OUTFILES/h5diff_61.txt
+$SRC_H5DIFF_OUTFILES/h5diff_62.txt
+$SRC_H5DIFF_OUTFILES/h5diff_63.txt
+$SRC_H5DIFF_OUTFILES/h5diff_600.txt
+$SRC_H5DIFF_OUTFILES/h5diff_601.txt
+$SRC_H5DIFF_OUTFILES/h5diff_601_ERR.err
+$SRC_H5DIFF_OUTFILES/h5diff_603.txt
+$SRC_H5DIFF_OUTFILES/h5diff_604.txt
+$SRC_H5DIFF_OUTFILES/h5diff_605.txt
+$SRC_H5DIFF_OUTFILES/h5diff_606.txt
+$SRC_H5DIFF_OUTFILES/h5diff_607.txt
+$SRC_H5DIFF_OUTFILES/h5diff_608.txt
+$SRC_H5DIFF_OUTFILES/h5diff_609.txt
+$SRC_H5DIFF_OUTFILES/h5diff_610.txt
+$SRC_H5DIFF_OUTFILES/h5diff_612.txt
+$SRC_H5DIFF_OUTFILES/h5diff_613.txt
+$SRC_H5DIFF_OUTFILES/h5diff_614.txt
+$SRC_H5DIFF_OUTFILES/h5diff_615.txt
+$SRC_H5DIFF_OUTFILES/h5diff_616.txt
+$SRC_H5DIFF_OUTFILES/h5diff_617.txt
+$SRC_H5DIFF_OUTFILES/h5diff_618.txt
+$SRC_H5DIFF_OUTFILES/h5diff_619.txt
+$SRC_H5DIFF_OUTFILES/h5diff_621.txt
+$SRC_H5DIFF_OUTFILES/h5diff_622.txt
+$SRC_H5DIFF_OUTFILES/h5diff_623.txt
+$SRC_H5DIFF_OUTFILES/h5diff_624.txt
+$SRC_H5DIFF_OUTFILES/h5diff_625.txt
+$SRC_H5DIFF_OUTFILES/h5diff_626.txt
+$SRC_H5DIFF_OUTFILES/h5diff_627.txt
+$SRC_H5DIFF_OUTFILES/h5diff_628.txt
+$SRC_H5DIFF_OUTFILES/h5diff_629.txt
+$SRC_H5DIFF_OUTFILES/h5diff_630.txt
+$SRC_H5DIFF_OUTFILES/h5diff_631.txt
+$SRC_H5DIFF_OUTFILES/h5diff_640.txt
+$SRC_H5DIFF_OUTFILES/h5diff_641.txt
+$SRC_H5DIFF_OUTFILES/h5diff_642.txt
+$SRC_H5DIFF_OUTFILES/h5diff_643.txt
+$SRC_H5DIFF_OUTFILES/h5diff_644.txt
+$SRC_H5DIFF_OUTFILES/h5diff_645.txt
+$SRC_H5DIFF_OUTFILES/h5diff_646.txt
+$SRC_H5DIFF_OUTFILES/h5diff_70.txt
+$SRC_H5DIFF_OUTFILES/h5diff_700.txt
+$SRC_H5DIFF_OUTFILES/h5diff_701.txt
+$SRC_H5DIFF_OUTFILES/h5diff_702.txt
+$SRC_H5DIFF_OUTFILES/h5diff_703.txt
+$SRC_H5DIFF_OUTFILES/h5diff_704.txt
+$SRC_H5DIFF_OUTFILES/h5diff_705.txt
+$SRC_H5DIFF_OUTFILES/h5diff_706.txt
+$SRC_H5DIFF_OUTFILES/h5diff_707.txt
+$SRC_H5DIFF_OUTFILES/h5diff_708.txt
+$SRC_H5DIFF_OUTFILES/h5diff_709.txt
+$SRC_H5DIFF_OUTFILES/h5diff_710.txt
+$SRC_H5DIFF_OUTFILES/h5diff_80.txt
+$SRC_H5DIFF_OUTFILES/h5diff_800.txt
+$SRC_H5DIFF_OUTFILES/h5diff_801.txt
+$SRC_H5DIFF_OUTFILES/h5diff_830.txt
+$SRC_H5DIFF_OUTFILES/h5diff_90.txt
+$SRC_H5DIFF_OUTFILES/h5diff_900.txt
+$SRC_H5DIFF_OUTFILES/h5diff_901.txt
+$SRC_H5DIFF_OUTFILES/h5diff_902.txt
+$SRC_H5DIFF_OUTFILES/h5diff_8625.txt
+$SRC_H5DIFF_OUTFILES/h5diff_8639.txt
+$SRC_H5DIFF_OUTFILES/h5diff_reg.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v1.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v2.txt
+$SRC_H5DIFF_OUTFILES/h5diff_v3.txt
+$SRC_H5DIFF_OUTFILES/h5diff_vlstr.txt
+$SRC_H5DIFF_OUTFILES/h5diff_eps.txt
 "
 
 #
@@ -588,7 +588,7 @@ SKIP() {
 # prepare for test
 COPY_TESTFILES_TO_TESTDIR
 # second copy of tvlstr.h5
-$CP -f $SRC_TOOLS_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
+$CP -f $SRC_H5DUMP_TESTFILES/tvlstr.h5 $TESTDIR/tvlstr2.h5
 
 # ############################################################################
 # # Common usage
diff --git a/tools/test/h5dump/CMakeTests.cmake b/tools/test/h5dump/CMakeTests.cmake
index c328ef1..7ed021f 100644
--- a/tools/test/h5dump/CMakeTests.cmake
+++ b/tools/test/h5dump/CMakeTests.cmake
@@ -20,210 +20,210 @@
   # Copy all the HDF5 files from the test directory into the source directory
   # --------------------------------------------------------------------
   set (HDF5_REFERENCE_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/charsets.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/file_space.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/non_existing.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A0.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2B.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-4s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-5s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-6.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-7.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tall-7N.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tallfilters.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tarray8.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattr-4_be.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrcontents2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tattrregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbin4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbinregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_be.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque_le.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2A.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tboot2B.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tchar1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tchunked.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcompact.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcontents.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tcontiguos.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdeflate.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-3s.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstart.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubcount.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubstride.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texceedsubblock.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/texternal.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfill.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tfletcher32.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl #native
-      #${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl #special for windows
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicesno.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicessub4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tindicesyes.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlock2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsBlockEq.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCount2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsCountEq.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dimsStride2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tqmarkfile.ddl
-      #${HDF5_TOOLS_DIR}/testfiles/tstarfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnbit.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoattrdata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoattrddl.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoddl.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnoddlfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordercontents1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tordercontents2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderlinks1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/torderlinks2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tperror.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trawdatafile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trawssetfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treadfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treadintfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/treference.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tscaleoffset.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tshuffle.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-D.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstring2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tstringe.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tszip.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tuserfilter.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tvms.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/twidedisplay.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/twithddlfile.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/h5dump-help.txt
-      ${HDF5_TOOLS_DIR}/testfiles/out3.h5import
-      ${HDF5_TOOLS_DIR}/testfiles/zerodim.ddl
+      charsets.ddl
+      err_attr_dspace.ddl
+      file_space.ddl
+      filter_fail.ddl
+      non_existing.ddl
+      packedbits.ddl
+      tall-1.ddl
+      tall-2.ddl
+      tall-2A.ddl
+      tall-2A0.ddl
+      tall-2B.ddl
+      tall-3.ddl
+      tall-4s.ddl
+      tall-5s.ddl
+      tall-6.ddl
+      tall-7.ddl
+      tall-7N.ddl
+      tallfilters.ddl
+      tarray1.ddl
+      tarray1_big.ddl
+      tarray2.ddl
+      tarray3.ddl
+      tarray4.ddl
+      tarray5.ddl
+      tarray6.ddl
+      tarray7.ddl
+      tarray8.ddl
+      tattr-1.ddl
+      tattr-2.ddl
+      tattr-3.ddl
+      tattr-4_be.ddl
+      tattrcontents1.ddl
+      tattrcontents2.ddl
+      tattrintsize.ddl
+      tattrreg.ddl
+      tattrregR.ddl
+      tbin1.ddl
+      tbin1.ddl
+      tbin2.ddl
+      tbin3.ddl
+      tbin4.ddl
+      tbinregR.ddl
+      tbigdims.ddl
+      tbitnopaque_be.ddl
+      tbitnopaque_le.ddl
+      tboot1.ddl
+      tboot2.ddl
+      tboot2A.ddl
+      tboot2B.ddl
+      tchar1.ddl
+      tchunked.ddl
+      tcmpdattrintsize.ddl
+      tcmpdintarray.ddl
+      tcmpdints.ddl
+      tcmpdintsize.ddl
+      tcompound_complex2.ddl
+      tcomp-1.ddl
+      tcomp-2.ddl
+      tcomp-3.ddl
+      tcomp-4.ddl
+      tcompact.ddl
+      tcontents.ddl
+      tcontiguos.ddl
+      tdatareg.ddl
+      tdataregR.ddl
+      tdeflate.ddl
+      tdset-1.ddl
+      tdset-2.ddl
+      tdset-3s.ddl
+      tempty.ddl
+      texceedsubstart.ddl
+      texceedsubcount.ddl
+      texceedsubstride.ddl
+      texceedsubblock.ddl
+      texternal.ddl
+      textlinksrc.ddl
+      textlinkfar.ddl
+      textlink.ddl
+      tfamily.ddl
+      tfill.ddl
+      tfletcher32.ddl
+      #tfloatsattrs.ddl #native
+      #tfloatsattrs.wddl #special for windows
+      tfpformat.ddl
+      tgroup-1.ddl
+      tgroup-2.ddl
+      tgrp_comments.ddl
+      tgrpnullspace.ddl
+      thlink-1.ddl
+      thlink-2.ddl
+      thlink-3.ddl
+      thlink-4.ddl
+      thlink-5.ddl
+      thyperslab.ddl
+      tindicesno.ddl
+      tindicessub1.ddl
+      tindicessub2.ddl
+      tindicessub3.ddl
+      tindicessub4.ddl
+      tindicesyes.ddl
+      tints4dims.ddl
+      tints4dimsBlock2.ddl
+      tints4dimsBlockEq.ddl
+      tints4dimsCount2.ddl
+      tints4dimsCountEq.ddl
+      tints4dimsStride2.ddl
+      tintsattrs.ddl
+      tintsnodata.ddl
+      tlarge_objname.ddl
+      tldouble.ddl
+      tldouble_scalar.ddl
+      tlonglinks.ddl
+      tloop-1.ddl
+      tmulti.ddl
+      tmultifile.ddl
+      #tqmarkfile.ddl
+      #tstarfile.ddl
+      tnamed_dtype_attr.ddl
+      tnestcomp-1.ddl
+      tnestedcmpddt.ddl
+      tnbit.ddl
+      tnoattrdata.ddl
+      tnoattrddl.ddl
+      tnodata.ddl
+      tnoddl.ddl
+      tnoddlfile.ddl
+      tno-subset.ddl
+      tnullspace.ddl
+      tordergr1.ddl
+      tordergr2.ddl
+      tordergr3.ddl
+      tordergr4.ddl
+      tordergr5.ddl
+      torderattr1.ddl
+      torderattr2.ddl
+      torderattr3.ddl
+      torderattr4.ddl
+      tordercontents1.ddl
+      tordercontents2.ddl
+      torderlinks1.ddl
+      torderlinks2.ddl
+      tperror.ddl
+      trawdatafile.ddl
+      trawssetfile.ddl
+      treadfilter.ddl
+      treadintfilter.ddl
+      treference.ddl
+      tsaf.ddl
+      tscalarattrintsize.ddl
+      tscalarintattrsize.ddl
+      tscalarintsize.ddl
+      tscalarstring.ddl
+      tscaleoffset.ddl
+      tshuffle.ddl
+      tslink-1.ddl
+      tslink-2.ddl
+      tslink-D.ddl
+      tsplit_file.ddl
+      tstr-1.ddl
+      tstr-2.ddl
+      tstring.ddl
+      tstring2.ddl
+      tstringe.ddl
+      tszip.ddl
+      tudfilter.ddl
+      tudlink-1.ddl
+      tudlink-2.ddl
+      tuserfilter.ddl
+      tvldtypes1.ddl
+      tvldtypes2.ddl
+      tvldtypes3.ddl
+      tvldtypes4.ddl
+      tvldtypes5.ddl
+      tvlenstr_array.ddl
+      tvlstr.ddl
+      tvms.ddl
+      twidedisplay.ddl
+      twithddlfile.ddl
+      h5dump-help.txt
+      out3.h5import
+      zerodim.ddl
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attrR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compatR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_extR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grpR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_delR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_objR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_paramR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1dR.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_regR.ddl
+      trefer_attrR.ddl
+      trefer_compatR.ddl
+      trefer_extR.ddl
+      trefer_grpR.ddl
+      trefer_obj_delR.ddl
+      trefer_objR.ddl
+      trefer_paramR.ddl
+      trefer_reg_1dR.ddl
+      trefer_regR.ddl
       # Onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.ddl
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_revision_count.ddl
+      tst_onion_objs.ddl
+      tst_onion_dset_ext.ddl
+      tst_onion_dset_1d.ddl
+      tst_onion_revision_count.ddl
   )
   set (HDF5_N_REFERENCE_FILES
-      tall-3
-      tattr-2
-      tcomp-2
-      thlink-4
-      thlink-5
-      tslink-2
+      tall-3.ddl
+      tattr-2.ddl
+      tcomp-2.ddl
+      thlink-4.ddl
+      thlink-5.ddl
+      tslink-2.ddl
   )
   set (HDF5_REFERENCE_EXP_FILES
       tall-6.exp
@@ -236,159 +236,159 @@
       twithddlfile.exp
   )
   set (HDF5_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/charsets.h5
-      ${HDF5_TOOLS_DIR}/testfiles/err_attr_dspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/file_space.h5
-      ${HDF5_TOOLS_DIR}/testfiles/filter_fail.h5
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_DIR}/testfiles/taindices.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1_big.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray8.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr4_be.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbigdims.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbinary.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbitnopaque.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tchar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintarray.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdints.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcmpdintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfcontents1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfcontents2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfilters.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfvalues.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thyperslab.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tints4dims.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tintsattrs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tintsnodata.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tlarge_objname.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tldouble_scalar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tlonglinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-g.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-l.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-o.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-r.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmulti-s.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcmpddt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tno-subset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarattrintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintattrsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarintsize.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tscalarstring.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-m.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsplit_file-r.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlenstr_array.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvms.h5
-      ${HDF5_TOOLS_DIR}/testfiles/t128bit_float.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_old.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE_2018_11206_fill_new.h5
-      ${HDF5_TOOLS_DIR}/testfiles/zerodim.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tCVE-2021-37501_attr_decode.h5
+      charsets.h5
+      err_attr_dspace.h5
+      file_space.h5
+      filter_fail.h5
+      packedbits.h5
+      taindices.h5
+      tall.h5
+      tarray1.h5
+      tarray1_big.h5
+      tarray2.h5
+      tarray3.h5
+      tarray4.h5
+      tarray5.h5
+      tarray6.h5
+      tarray7.h5
+      tarray8.h5
+      tattr.h5
+      tattr2.h5
+      tattr4_be.h5
+      tattrintsize.h5
+      tattrreg.h5
+      tbigdims.h5
+      tbinary.h5
+      tbitnopaque.h5
+      tchar.h5
+      tcmpdattrintsize.h5
+      tcmpdintarray.h5
+      tcmpdints.h5
+      tcmpdintsize.h5
+      tcompound.h5
+      tcompound_complex.h5
+      tcompound_complex2.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      tsoftlinks.h5
+      textlinkfar.h5
+      textlinksrc.h5
+      textlinktar.h5
+      textlink.h5
+      tfamily00000.h5
+      tfamily00001.h5
+      tfamily00002.h5
+      tfamily00003.h5
+      tfamily00004.h5
+      tfamily00005.h5
+      tfamily00006.h5
+      tfamily00007.h5
+      tfamily00008.h5
+      tfamily00009.h5
+      tfamily00010.h5
+      tfcontents1.h5
+      tfcontents2.h5
+      tfilters.h5
+      tfloatsattrs.h5
+      tfpformat.h5
+      tfvalues.h5
+      tgroup.h5
+      tgrp_comments.h5
+      tgrpnullspace.h5
+      thlink.h5
+      thyperslab.h5
+      tints4dims.h5
+      tintsattrs.h5
+      tintsnodata.h5
+      tlarge_objname.h5
+      tldouble.h5
+      tldouble_scalar.h5
+      tlonglinks.h5
+      tloop.h5
+      tmulti-b.h5
+      tmulti-g.h5
+      tmulti-l.h5
+      tmulti-o.h5
+      tmulti-r.h5
+      tmulti-s.h5
+      tnamed_dtype_attr.h5
+      tnestedcomp.h5
+      tnestedcmpddt.h5
+      tno-subset.h5
+      tnullspace.h5
+      torderattr.h5
+      tordergr.h5
+      tsaf.h5
+      tscalarattrintsize.h5
+      tscalarintattrsize.h5
+      tscalarintsize.h5
+      tscalarstring.h5
+      tslink.h5
+      tsplit_file-m.h5
+      tsplit_file-r.h5
+      tstr.h5
+      tstr2.h5
+      tstr3.h5
+      tudfilter.h5
+      tudlink.h5
+      tvldtypes1.h5
+      tvldtypes2.h5
+      tvldtypes3.h5
+      tvldtypes4.h5
+      tvldtypes5.h5
+      tvlenstr_array.h5
+      tvlstr.h5
+      tvms.h5
+      t128bit_float.h5
+      tCVE_2018_11206_fill_old.h5
+      tCVE_2018_11206_fill_new.h5
+      zerodim.h5
+      tCVE-2021-37501_attr_decode.h5
       #STD_REF_OBJ files
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_compat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_ext2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_grp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj_del.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_obj.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_param.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/trefer_reg.h5
+      trefer_attr.h5
+      trefer_compat.h5
+      trefer_ext1.h5
+      trefer_ext2.h5
+      trefer_grp.h5
+      trefer_obj_del.h5
+      trefer_obj.h5
+      trefer_param.h5
+      trefer_reg_1d.h5
+      trefer_reg.h5
       # Onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion
+      tst_onion_objs.h5
+      tst_onion_objs.h5.onion
+      tst_onion_dset_ext.h5
+      tst_onion_dset_ext.h5.onion
+      tst_onion_dset_1d.h5
+      tst_onion_dset_1d.h5.onion
   )
   set (HDF5_ERROR_REFERENCE_TEST_FILES
-      ${PROJECT_SOURCE_DIR}/errfiles/filter_fail.err
-      ${PROJECT_SOURCE_DIR}/errfiles/non_existing.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-1.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2A.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2A0.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tall-2B.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tarray1_big.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tattrregR.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tattr-3.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tcomp-3.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tdataregR.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tdset-2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubblock.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubcount.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstart.err
-      ${PROJECT_SOURCE_DIR}/errfiles/texceedsubstride.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlink.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlinkfar.err
-      ${PROJECT_SOURCE_DIR}/errfiles/textlinksrc.err
-      ${PROJECT_SOURCE_DIR}/errfiles/torderlinks1.err
-      ${PROJECT_SOURCE_DIR}/errfiles/torderlinks2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tgroup-2.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tperror.err
-      ${PROJECT_SOURCE_DIR}/errfiles/tslink-D.err
+      filter_fail.err
+      non_existing.err
+      tall-1.err
+      tall-2A.err
+      tall-2A0.err
+      tall-2B.err
+      tarray1_big.err
+      tattrregR.err
+      tattr-3.err
+      tcomp-3.err
+      tdataregR.err
+      tdset-2.err
+      texceedsubblock.err
+      texceedsubcount.err
+      texceedsubstart.err
+      texceedsubstride.err
+      textlink.err
+      textlinkfar.err
+      textlinksrc.err
+      torderlinks1.err
+      torderlinks2.err
+      tgroup-2.err
+      tperror.err
+      tslink-D.err
   )
 
   # make test dir
@@ -398,40 +398,38 @@
   # copy test files from source dir to test dir
   #
   foreach (tst_h5_file ${HDF5_REFERENCE_TEST_FILES})
-    get_filename_component (fname "${tst_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5_file}" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_exp_file ${HDF5_REFERENCE_EXP_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/${tst_exp_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_exp_file}" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_other_file ${HDF5_REFERENCE_FILES})
-    get_filename_component (fname "${tst_other_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_other_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_other_file}" "h5dump_std_files")
   endforeach ()
+  
   foreach (tst_h5N_file ${HDF5_N_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${tst_h5N_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${tst_h5N_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_h5N_file}-N" "h5dump_std_files")
   endforeach ()
 
   foreach (tst_error_file ${HDF5_ERROR_REFERENCE_TEST_FILES})
-    get_filename_component (fname "${tst_error_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${fname}" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${tst_error_file}" "${PROJECT_BINARY_DIR}/testfiles/std/${tst_error_file}" "h5dump_std_files")
   endforeach ()
 
   # --------------------------------------------------------------------
   # Special file handling
   # --------------------------------------------------------------------
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tbin1.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tbin1LE.ddl" "h5dump_std_files")
 
   if (WIN32 AND CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION VERSION_LESS 10.0.18362.0)
-    configure_file(${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
-    #file (READ ${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp TEST_STREAM)
+    configure_file(${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp NEWLINE_STYLE CRLF)
+    #file (READ ${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp TEST_STREAM)
     #file (WRITE ${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp "${TEST_STREAM}")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.wddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
   else ()
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/exportfiles/tbinregR.exp" "${PROJECT_BINARY_DIR}/testfiles/std/tbinregR.exp" "h5dump_std_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/tfloatsattrs.ddl" "${PROJECT_BINARY_DIR}/testfiles/std/tfloatsattrs.ddl" "h5dump_std_files")
   endif ()
   add_custom_target(h5dump_std_files ALL COMMENT "Copying files needed by h5dump_std tests" DEPENDS ${h5dump_std_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsPBITS.cmake b/tools/test/h5dump/CMakeTestsPBITS.cmake
index caca4b7..118b314 100644
--- a/tools/test/h5dump/CMakeTestsPBITS.cmake
+++ b/tools/test/h5dump/CMakeTestsPBITS.cmake
@@ -76,9 +76,9 @@
       tpbitsUnsignedLongLong16.ddl
   )
   set (HDF5_REFERENCE_TEST_PBITS
-      ${HDF5_TOOLS_DIR}/testfiles/packedbits.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
+      packedbits.h5
+      tarray1.h5
+      tcompound.h5
   )
   set (HDF5_ERROR_REFERENCE_PBITS
       tnofilename-with-packed-bits.err
@@ -97,19 +97,15 @@
   )
 
   foreach (pbits_h5_file ${HDF5_REFERENCE_TEST_PBITS})
-    get_filename_component(fname "${pbits_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${pbits_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${pbits_h5_file}" "h5dump_pbits_files")
   endforeach ()
 
-
   foreach (ddl_pbits ${HDF5_REFERENCE_PBITS})
-    get_filename_component(fname "${ddl_pbits}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/pbits/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_pbits}" "h5dump_pbits_files")
   endforeach ()
 
-  foreach (ddl_pbits ${HDF5_ERROR_REFERENCE_PBITS})
-    get_filename_component(fname "${ddl_pbits}" NAME)
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${fname}" "h5dump_pbits_files")
+  foreach (ddl_err_pbits ${HDF5_ERROR_REFERENCE_PBITS})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/pbits/${ddl_err_pbits}" "${PROJECT_BINARY_DIR}/testfiles/pbits/${ddl_err_pbits}" "h5dump_pbits_files")
   endforeach ()
   add_custom_target(h5dump_pbits_files ALL COMMENT "Copying files needed by h5dump_pbits tests" DEPENDS ${h5dump_pbits_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsVDS.cmake b/tools/test/h5dump/CMakeTestsVDS.cmake
index 42f08c9..c910acd 100644
--- a/tools/test/h5dump/CMakeTestsVDS.cmake
+++ b/tools/test/h5dump/CMakeTestsVDS.cmake
@@ -84,28 +84,19 @@
   )
 
   foreach (vds_h5_file ${HDF5_REFERENCE_TEST_VDS})
-    get_filename_component(fname "${vds_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/${vds_h5_file}" "h5dump_vds_files")
   endforeach ()
 
   foreach (vds_h5_file ${HDF5_REFERENCE_PREFIX_VDS})
-    get_filename_component(fname "${vds_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/vds/${vds_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${vds_h5_file}" "h5dump_vds_files")
   endforeach ()
 
   foreach (ddl_vds ${HDF5_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
-  endforeach ()
-
-  foreach (ddl_vds ${HDF5_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${ddl_vds}" "h5dump_vds_files")
   endforeach ()
 
   foreach (ddl_vds ${HDF5_ERROR_REFERENCE_VDS})
-    get_filename_component(fname "${ddl_vds}" NAME)
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5dump_vds_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${ddl_vds}" "${PROJECT_BINARY_DIR}/testfiles/vds/${ddl_vds}" "h5dump_vds_files")
   endforeach ()
   add_custom_target(h5dump_vds_files ALL COMMENT "Copying files needed by h5dump_vds tests" DEPENDS ${h5dump_vds_files_list})
 
diff --git a/tools/test/h5dump/CMakeTestsXML.cmake b/tools/test/h5dump/CMakeTestsXML.cmake
index 833a616..d78e738 100644
--- a/tools/test/h5dump/CMakeTestsXML.cmake
+++ b/tools/test/h5dump/CMakeTestsXML.cmake
@@ -19,138 +19,143 @@
   #
   # copy XML test files from source dir to test dir
   #
+  set (HDF5_XML_REFERENCE_ONLY_FILES
+      tbitfields.h5
+      tcompound2.h5
+      tdset2.h5
+      tenum.h5
+      test35.nc
+      tloop2.h5
+      tmany.h5
+      tname-amp.h5
+      tname-apos.h5
+      tname-gt.h5
+      tname-lt.h5
+      tname-quot.h5
+      tname-sp.h5
+      tnodata.h5
+      tobjref.h5
+      topaque.h5
+      tref.h5
+      tref-escapes.h5
+      tref-escapes-at.h5
+      tstring.h5
+      tstring-at.h5
+  )
+
   set (HDF5_XML_REFERENCE_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/test35.nc
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5
-      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5
+      tall.h5
+      tarray1.h5
+      tarray2.h5
+      tarray3.h5
+      tarray6.h5
+      tarray7.h5
+      tattr.h5
+      tcompound.h5
+      tcompound_complex.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      textlink.h5
+      tfpformat.h5
+      tgroup.h5
+      thlink.h5
+      tloop.h5
+      tnamed_dtype_attr.h5
+      tnestedcomp.h5
+      tnullspace.h5
+      torderattr.h5
+      tsaf.h5
+      tslink.h5
+      tstr.h5
+      tstr2.h5
+      tudlink.h5
+      tvldtypes1.h5
+      tvldtypes2.h5
+      tvldtypes3.h5
+      tvldtypes4.h5
+      tvldtypes5.h5
+      tvlstr.h5
   )
   set (HDF5_XML_REFERENCE_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2A.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray6.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tarray7.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tattr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_be.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tbitfields_le.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound_complex.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tdset2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-dtd-uri.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-nons-uri.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tempty-ns-2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tenum.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/test35.nc.xml
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tfpformat.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tloop2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tmany.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-amp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-apos.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnamed_dtype_attr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-gt.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-lt.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-quot.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tname-sp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnodata.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tnullspace.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tobjref.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/topaque.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/torderattr4.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tref-escapes-at.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstr2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstring.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tstring-at.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes3.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes4.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes5.h5.xml
-      ${HDF5_TOOLS_DIR}/testfiles/tvlstr.h5.xml
+      tall.h5.xml
+      tall-2A.h5.xml
+      tarray1.h5.xml
+      tarray2.h5.xml
+      tarray3.h5.xml
+      tarray6.h5.xml
+      tarray7.h5.xml
+      tattr.h5.xml
+      tbitfields_be.h5.xml
+      tbitfields_le.h5.xml
+      tcompound_complex.h5.xml
+      tcompound.h5.xml
+      tcompound2.h5.xml
+      tdatareg.h5.xml
+      tdset.h5.xml
+      tdset2.h5.xml
+      tempty.h5.xml
+      tempty-dtd.h5.xml
+      tempty-dtd-2.h5.xml
+      tempty-dtd-uri.h5.xml
+      tempty-nons.h5.xml
+      tempty-nons-2.h5.xml
+      tempty-nons-uri.h5.xml
+      tempty-ns.h5.xml
+      tempty-ns-2.h5.xml
+      tenum.h5.xml
+      test35.nc.xml
+      textlink.h5.xml
+      tfpformat.h5.xml
+      tgroup.h5.xml
+      thlink.h5.xml
+      tloop.h5.xml
+      tloop2.h5.xml
+      tmany.h5.xml
+      tname-amp.h5.xml
+      tname-apos.h5.xml
+      tnamed_dtype_attr.h5.xml
+      tname-gt.h5.xml
+      tname-lt.h5.xml
+      tname-quot.h5.xml
+      tname-sp.h5.xml
+      tnestedcomp.h5.xml
+      tnodata.h5.xml
+      tnullspace.h5.xml
+      tobjref.h5.xml
+      topaque.h5.xml
+      torderattr1.h5.xml
+      torderattr2.h5.xml
+      torderattr3.h5.xml
+      torderattr4.h5.xml
+      tref.h5.xml
+      tref-escapes.h5.xml
+      tref-escapes-at.h5.xml
+      tsaf.h5.xml
+      tslink.h5.xml
+      tstr.h5.xml
+      tstr2.h5.xml
+      tstring.h5.xml
+      tstring-at.h5.xml
+      tudlink.h5.xml
+      tvldtypes1.h5.xml
+      tvldtypes2.h5.xml
+      tvldtypes3.h5.xml
+      tvldtypes4.h5.xml
+      tvldtypes5.h5.xml
+      tvlstr.h5.xml
   )
 
   foreach (tst_xml_h5_file ${HDF5_XML_REFERENCE_TEST_FILES})
-    get_filename_component(fname "${tst_xml_h5_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${tst_xml_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_h5_file}" "h5dump_xml_files")
+  endforeach ()
+
+  foreach (tst_xmlonly_h5_file ${HDF5_XML_REFERENCE_ONLY_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xmlonly_h5_file}" "h5dump_xml_files")
   endforeach ()
 
   foreach (tst_xml_other_file ${HDF5_XML_REFERENCE_FILES})
-    get_filename_component(fname "${tst_xml_other_file}" NAME)
-    HDFTEST_COPY_FILE("${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${fname}" "h5dump_xml_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/xml/${tst_xml_other_file}" "${PROJECT_BINARY_DIR}/testfiles/xml/${tst_xml_other_file}" "h5dump_xml_files")
   endforeach ()
   add_custom_target(h5dump_xml_files ALL COMMENT "Copying files needed by h5dump_xml tests" DEPENDS ${h5dump_xml_files_list})
 
diff --git a/tools/test/h5dump/CMakeVFDTests.cmake b/tools/test/h5dump/CMakeVFDTests.cmake
index 7ab8c1f..b303032 100644
--- a/tools/test/h5dump/CMakeVFDTests.cmake
+++ b/tools/test/h5dump/CMakeVFDTests.cmake
@@ -26,8 +26,8 @@ set (HDF5_VFD_H5DUMP_FILES
 
 foreach (vfdtest ${VFD_LIST})
   foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files")
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files")
   endforeach ()
 endforeach ()
 
diff --git a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err
index 84a7011..84a7011 100644
--- a/tools/test/h5dump/errfiles/tnofilename-with-packed-bits.err
+++ b/tools/test/h5dump/errfiles/pbits/tnofilename-with-packed-bits.err
diff --git a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err
index e5854ea..e5854ea 100644
--- a/tools/test/h5dump/errfiles/tpbitsCharLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsCharLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err
index e5854ea..e5854ea 100644
--- a/tools/test/h5dump/errfiles/tpbitsCharOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsCharOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIncomplete.err b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err
index e0abee5..e0abee5 100644
--- a/tools/test/h5dump/errfiles/tpbitsIncomplete.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIncomplete.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err
index 7dd88ed..7dd88ed 100644
--- a/tools/test/h5dump/errfiles/tpbitsIntLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIntLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err
index 7dd88ed..7dd88ed 100644
--- a/tools/test/h5dump/errfiles/tpbitsIntOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsIntOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err
index d4673f2..d4673f2 100644
--- a/tools/test/h5dump/errfiles/tpbitsLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err
index 4928007..4928007 100644
--- a/tools/test/h5dump/errfiles/tpbitsLengthPositive.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLengthPositive.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err
index 0318f79..0318f79 100644
--- a/tools/test/h5dump/errfiles/tpbitsLongLengthExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLongLengthExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err
index 0318f79..0318f79 100644
--- a/tools/test/h5dump/errfiles/tpbitsLongOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsLongOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err
index a8d12fc..a8d12fc 100644
--- a/tools/test/h5dump/errfiles/tpbitsMaxExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsMaxExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err
index b7d6dad..b7d6dad 100644
--- a/tools/test/h5dump/errfiles/tpbitsOffsetExceeded.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetExceeded.err
diff --git a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err
index 8a027c1..8a027c1 100644
--- a/tools/test/h5dump/errfiles/tpbitsOffsetNegative.err
+++ b/tools/test/h5dump/errfiles/pbits/tpbitsOffsetNegative.err
diff --git a/tools/testfiles/charsets.ddl b/tools/test/h5dump/expected/charsets.ddl
index c2301fb..c2301fb 100644
--- a/tools/testfiles/charsets.ddl
+++ b/tools/test/h5dump/expected/charsets.ddl
diff --git a/tools/testfiles/err_attr_dspace.ddl b/tools/test/h5dump/expected/err_attr_dspace.ddl
index 48ef659..48ef659 100644
--- a/tools/testfiles/err_attr_dspace.ddl
+++ b/tools/test/h5dump/expected/err_attr_dspace.ddl
diff --git a/tools/testfiles/file_space.ddl b/tools/test/h5dump/expected/file_space.ddl
index 6b8aa47..6b8aa47 100644
--- a/tools/testfiles/file_space.ddl
+++ b/tools/test/h5dump/expected/file_space.ddl
diff --git a/tools/testfiles/filter_fail.ddl b/tools/test/h5dump/expected/filter_fail.ddl
index 3a456f5..3a456f5 100644
--- a/tools/testfiles/filter_fail.ddl
+++ b/tools/test/h5dump/expected/filter_fail.ddl
diff --git a/tools/testfiles/h5dump-help.txt b/tools/test/h5dump/expected/h5dump-help.txt
index 9274600..9274600 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/test/h5dump/expected/h5dump-help.txt
diff --git a/tools/testfiles/non_existing.ddl b/tools/test/h5dump/expected/non_existing.ddl
index 4407eae..4407eae 100644
--- a/tools/testfiles/non_existing.ddl
+++ b/tools/test/h5dump/expected/non_existing.ddl
diff --git a/tools/testfiles/out3.h5import b/tools/test/h5dump/expected/out3.h5import
index 29346e1..29346e1 100644
--- a/tools/testfiles/out3.h5import
+++ b/tools/test/h5dump/expected/out3.h5import
diff --git a/tools/testfiles/packedbits.ddl b/tools/test/h5dump/expected/packedbits.ddl
index 1bca459..1bca459 100644
--- a/tools/testfiles/packedbits.ddl
+++ b/tools/test/h5dump/expected/packedbits.ddl
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/test/h5dump/expected/pbits/tnofilename-with-packed-bits.ddl
diff --git a/tools/testfiles/pbits/tpbitsArray.ddl b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl
index 125abb8..125abb8 100644
--- a/tools/testfiles/pbits/tpbitsArray.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsArray.ddl
diff --git a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl
index b281827..b281827 100644
--- a/tools/testfiles/pbits/tpbitsCharLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCharLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl
index ee56a5c..ee56a5c 100644
--- a/tools/testfiles/pbits/tpbitsCharOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCharOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsCompound.ddl b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl
index c84272a..c84272a 100644
--- a/tools/testfiles/pbits/tpbitsCompound.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsCompound.ddl
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIncomplete.ddl
diff --git a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl
index 1cba6d5..1cba6d5 100644
--- a/tools/testfiles/pbits/tpbitsIntLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIntLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl
index 330d61f..330d61f 100644
--- a/tools/testfiles/pbits/tpbitsIntOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsIntOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLengthPositive.ddl
diff --git a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl
index 44ec077..44ec077 100644
--- a/tools/testfiles/pbits/tpbitsLongLengthExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLongLengthExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl
index c775557..c775557 100644
--- a/tools/testfiles/pbits/tpbitsLongOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsLongOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsMax.ddl b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl
index e569488..e569488 100644
--- a/tools/testfiles/pbits/tpbitsMax.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsMax.ddl
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsMaxExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOffsetExceeded.ddl
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl
index 9274600..9274600 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOffsetNegative.ddl
diff --git a/tools/testfiles/pbits/tpbitsOverlapped.ddl b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl
index 9dcc9d2..9dcc9d2 100644
--- a/tools/testfiles/pbits/tpbitsOverlapped.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsOverlapped.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl
index b843388..b843388 100644
--- a/tools/testfiles/pbits/tpbitsSigned.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl
index 932b5fd..932b5fd 100644
--- a/tools/testfiles/pbits/tpbitsSigned2.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned2.ddl
diff --git a/tools/testfiles/pbits/tpbitsSigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl
index 9eacd83..9eacd83 100644
--- a/tools/testfiles/pbits/tpbitsSigned4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSigned4.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl
index 5c37e77..5c37e77 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl
index 4e9f0f6..4e9f0f6 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt4.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl
index f2d6069..f2d6069 100644
--- a/tools/testfiles/pbits/tpbitsSignedInt8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedInt8.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl
index 598c446..598c446 100644
--- a/tools/testfiles/pbits/tpbitsSignedIntWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedIntWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl
index b3eba61..b3eba61 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl
index 83fa889..83fa889 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl
index e99b1d0..e99b1d0 100644
--- a/tools/testfiles/pbits/tpbitsSignedLong8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLong8.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl
index 2be8a55..2be8a55 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl
index 44e336d..44e336d 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl
index 6ab4ac4..6ab4ac4 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLong32.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLong32.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl
index 134f3be..134f3be 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl
index 7431670..7431670 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole1.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole1.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl
index c7cc65f..c7cc65f 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongLongWhole63.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongLongWhole63.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl
index e583f1d..e583f1d 100644
--- a/tools/testfiles/pbits/tpbitsSignedLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsSignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl
index f044e23..f044e23 100644
--- a/tools/testfiles/pbits/tpbitsSignedWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsSignedWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl
index 9e7ac50..9e7ac50 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned2.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl
index b7e6f79..b7e6f79 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned2.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned2.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsigned4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl
index d25d838..d25d838 100644
--- a/tools/testfiles/pbits/tpbitsUnsigned4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsigned4.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl
index 5e0fefe..5e0fefe 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl
index 0d3e38f..0d3e38f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt4.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt4.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl
index 861ed3e..861ed3e 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedInt8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedInt8.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl
index c054011..c054011 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedIntWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedIntWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl
index 9f8bcb4..9f8bcb4 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl
index 7a1984f..7a1984f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl
index 17b896c..17b896c 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLong8.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLong8.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl
index 1cd9a6c..1cd9a6c 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl
index f8b0189..f8b0189 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong16.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong16.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl
index befaf5b..befaf5b 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLong32.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLong32.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl
index 27c8879..27c8879 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl
index 0302105..0302105 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole1.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole1.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl
index 6a9b503..6a9b503 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongLongWhole63.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongLongWhole63.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl
index 50ad02f..50ad02f 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedLongWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedLongWhole.ddl
diff --git a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl
index 7c9e736..7c9e736 100644
--- a/tools/testfiles/pbits/tpbitsUnsignedWhole.ddl
+++ b/tools/test/h5dump/expected/pbits/tpbitsUnsignedWhole.ddl
diff --git a/tools/testfiles/tall-1.ddl b/tools/test/h5dump/expected/tall-1.ddl
index ae375c4..ae375c4 100644
--- a/tools/testfiles/tall-1.ddl
+++ b/tools/test/h5dump/expected/tall-1.ddl
diff --git a/tools/testfiles/tall-2.ddl b/tools/test/h5dump/expected/tall-2.ddl
index d669639..d669639 100644
--- a/tools/testfiles/tall-2.ddl
+++ b/tools/test/h5dump/expected/tall-2.ddl
diff --git a/tools/testfiles/tall-2A.ddl b/tools/test/h5dump/expected/tall-2A.ddl
index 0ae5210..0ae5210 100644
--- a/tools/testfiles/tall-2A.ddl
+++ b/tools/test/h5dump/expected/tall-2A.ddl
diff --git a/tools/testfiles/tall-2A0.ddl b/tools/test/h5dump/expected/tall-2A0.ddl
index e0955f3..e0955f3 100644
--- a/tools/testfiles/tall-2A0.ddl
+++ b/tools/test/h5dump/expected/tall-2A0.ddl
diff --git a/tools/testfiles/tall-2B.ddl b/tools/test/h5dump/expected/tall-2B.ddl
index dc8aab7..dc8aab7 100644
--- a/tools/testfiles/tall-2B.ddl
+++ b/tools/test/h5dump/expected/tall-2B.ddl
diff --git a/tools/testfiles/tall-3.ddl b/tools/test/h5dump/expected/tall-3.ddl
index 1c54e6d..1c54e6d 100644
--- a/tools/testfiles/tall-3.ddl
+++ b/tools/test/h5dump/expected/tall-3.ddl
diff --git a/tools/testfiles/tall-4s.ddl b/tools/test/h5dump/expected/tall-4s.ddl
index 36cb659..36cb659 100644
--- a/tools/testfiles/tall-4s.ddl
+++ b/tools/test/h5dump/expected/tall-4s.ddl
diff --git a/tools/testfiles/tall-5s.ddl b/tools/test/h5dump/expected/tall-5s.ddl
index b35be18..b35be18 100644
--- a/tools/testfiles/tall-5s.ddl
+++ b/tools/test/h5dump/expected/tall-5s.ddl
diff --git a/tools/testfiles/tall-6.ddl b/tools/test/h5dump/expected/tall-6.ddl
index a408608..a408608 100644
--- a/tools/testfiles/tall-6.ddl
+++ b/tools/test/h5dump/expected/tall-6.ddl
diff --git a/tools/testfiles/tall-7.ddl b/tools/test/h5dump/expected/tall-7.ddl
index f0ad5ea..f0ad5ea 100644
--- a/tools/testfiles/tall-7.ddl
+++ b/tools/test/h5dump/expected/tall-7.ddl
diff --git a/tools/testfiles/tall-7N.ddl b/tools/test/h5dump/expected/tall-7N.ddl
index cba5774..cba5774 100644
--- a/tools/testfiles/tall-7N.ddl
+++ b/tools/test/h5dump/expected/tall-7N.ddl
diff --git a/tools/testfiles/tallfilters.ddl b/tools/test/h5dump/expected/tallfilters.ddl
index ff2454c..ff2454c 100644
--- a/tools/testfiles/tallfilters.ddl
+++ b/tools/test/h5dump/expected/tallfilters.ddl
diff --git a/tools/testfiles/tarray1.ddl b/tools/test/h5dump/expected/tarray1.ddl
index 8ff01e1..8ff01e1 100644
--- a/tools/testfiles/tarray1.ddl
+++ b/tools/test/h5dump/expected/tarray1.ddl
diff --git a/tools/testfiles/tarray1_big.ddl b/tools/test/h5dump/expected/tarray1_big.ddl
index 102847a..102847a 100644
--- a/tools/testfiles/tarray1_big.ddl
+++ b/tools/test/h5dump/expected/tarray1_big.ddl
diff --git a/tools/testfiles/tarray2.ddl b/tools/test/h5dump/expected/tarray2.ddl
index 5a8460a..5a8460a 100644
--- a/tools/testfiles/tarray2.ddl
+++ b/tools/test/h5dump/expected/tarray2.ddl
diff --git a/tools/testfiles/tarray3.ddl b/tools/test/h5dump/expected/tarray3.ddl
index 63f6d32..63f6d32 100644
--- a/tools/testfiles/tarray3.ddl
+++ b/tools/test/h5dump/expected/tarray3.ddl
diff --git a/tools/testfiles/tarray4.ddl b/tools/test/h5dump/expected/tarray4.ddl
index 7fb310b..7fb310b 100644
--- a/tools/testfiles/tarray4.ddl
+++ b/tools/test/h5dump/expected/tarray4.ddl
diff --git a/tools/testfiles/tarray5.ddl b/tools/test/h5dump/expected/tarray5.ddl
index 883ee09..883ee09 100644
--- a/tools/testfiles/tarray5.ddl
+++ b/tools/test/h5dump/expected/tarray5.ddl
diff --git a/tools/testfiles/tarray6.ddl b/tools/test/h5dump/expected/tarray6.ddl
index 343002b..343002b 100644
--- a/tools/testfiles/tarray6.ddl
+++ b/tools/test/h5dump/expected/tarray6.ddl
diff --git a/tools/testfiles/tarray7.ddl b/tools/test/h5dump/expected/tarray7.ddl
index cc537d7..cc537d7 100644
--- a/tools/testfiles/tarray7.ddl
+++ b/tools/test/h5dump/expected/tarray7.ddl
diff --git a/tools/testfiles/tarray8.ddl b/tools/test/h5dump/expected/tarray8.ddl
index f482901..f482901 100644
--- a/tools/testfiles/tarray8.ddl
+++ b/tools/test/h5dump/expected/tarray8.ddl
diff --git a/tools/testfiles/tattr-1.ddl b/tools/test/h5dump/expected/tattr-1.ddl
index b58731b..b58731b 100644
--- a/tools/testfiles/tattr-1.ddl
+++ b/tools/test/h5dump/expected/tattr-1.ddl
diff --git a/tools/testfiles/tattr-2.ddl b/tools/test/h5dump/expected/tattr-2.ddl
index 328b54f..328b54f 100644
--- a/tools/testfiles/tattr-2.ddl
+++ b/tools/test/h5dump/expected/tattr-2.ddl
diff --git a/tools/testfiles/tattr-3.ddl b/tools/test/h5dump/expected/tattr-3.ddl
index 943dc0d..943dc0d 100644
--- a/tools/testfiles/tattr-3.ddl
+++ b/tools/test/h5dump/expected/tattr-3.ddl
diff --git a/tools/testfiles/tattr-4_be.ddl b/tools/test/h5dump/expected/tattr-4_be.ddl
index 8b8076e..8b8076e 100644
--- a/tools/testfiles/tattr-4_be.ddl
+++ b/tools/test/h5dump/expected/tattr-4_be.ddl
diff --git a/tools/testfiles/tattrcontents1.ddl b/tools/test/h5dump/expected/tattrcontents1.ddl
index e118d89..e118d89 100644
--- a/tools/testfiles/tattrcontents1.ddl
+++ b/tools/test/h5dump/expected/tattrcontents1.ddl
diff --git a/tools/testfiles/tattrcontents2.ddl b/tools/test/h5dump/expected/tattrcontents2.ddl
index 4076385..4076385 100644
--- a/tools/testfiles/tattrcontents2.ddl
+++ b/tools/test/h5dump/expected/tattrcontents2.ddl
diff --git a/tools/testfiles/tattrintsize.ddl b/tools/test/h5dump/expected/tattrintsize.ddl
index 638384e..638384e 100644
--- a/tools/testfiles/tattrintsize.ddl
+++ b/tools/test/h5dump/expected/tattrintsize.ddl
diff --git a/tools/testfiles/tattrreg.ddl b/tools/test/h5dump/expected/tattrreg.ddl
index 9d9753c..9d9753c 100644
--- a/tools/testfiles/tattrreg.ddl
+++ b/tools/test/h5dump/expected/tattrreg.ddl
diff --git a/tools/testfiles/tattrregR.ddl b/tools/test/h5dump/expected/tattrregR.ddl
index c4323b1..c4323b1 100644
--- a/tools/testfiles/tattrregR.ddl
+++ b/tools/test/h5dump/expected/tattrregR.ddl
diff --git a/tools/testfiles/tbigdims.ddl b/tools/test/h5dump/expected/tbigdims.ddl
index 13f2052..13f2052 100644
--- a/tools/testfiles/tbigdims.ddl
+++ b/tools/test/h5dump/expected/tbigdims.ddl
diff --git a/tools/testfiles/tbin1.ddl b/tools/test/h5dump/expected/tbin1.ddl
index ed43e69..ed43e69 100644
--- a/tools/testfiles/tbin1.ddl
+++ b/tools/test/h5dump/expected/tbin1.ddl
diff --git a/tools/testfiles/tbin2.ddl b/tools/test/h5dump/expected/tbin2.ddl
index 4cc33c6..4cc33c6 100644
--- a/tools/testfiles/tbin2.ddl
+++ b/tools/test/h5dump/expected/tbin2.ddl
diff --git a/tools/testfiles/tbin3.ddl b/tools/test/h5dump/expected/tbin3.ddl
index ed43e69..ed43e69 100644
--- a/tools/testfiles/tbin3.ddl
+++ b/tools/test/h5dump/expected/tbin3.ddl
diff --git a/tools/testfiles/tbin4.ddl b/tools/test/h5dump/expected/tbin4.ddl
index 78a6cd2..78a6cd2 100644
--- a/tools/testfiles/tbin4.ddl
+++ b/tools/test/h5dump/expected/tbin4.ddl
diff --git a/tools/testfiles/tbinregR.ddl b/tools/test/h5dump/expected/tbinregR.ddl
index a44daa0..a44daa0 100644
--- a/tools/testfiles/tbinregR.ddl
+++ b/tools/test/h5dump/expected/tbinregR.ddl
diff --git a/tools/testfiles/tbitnopaque_be.ddl b/tools/test/h5dump/expected/tbitnopaque_be.ddl
index b0de7c4..b0de7c4 100644
--- a/tools/testfiles/tbitnopaque_be.ddl
+++ b/tools/test/h5dump/expected/tbitnopaque_be.ddl
diff --git a/tools/testfiles/tbitnopaque_le.ddl b/tools/test/h5dump/expected/tbitnopaque_le.ddl
index 0c59c0b..0c59c0b 100644
--- a/tools/testfiles/tbitnopaque_le.ddl
+++ b/tools/test/h5dump/expected/tbitnopaque_le.ddl
diff --git a/tools/testfiles/tboot1.ddl b/tools/test/h5dump/expected/tboot1.ddl
index 73ae4e5..73ae4e5 100644
--- a/tools/testfiles/tboot1.ddl
+++ b/tools/test/h5dump/expected/tboot1.ddl
diff --git a/tools/testfiles/tboot2.ddl b/tools/test/h5dump/expected/tboot2.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2.ddl
+++ b/tools/test/h5dump/expected/tboot2.ddl
diff --git a/tools/testfiles/tboot2A.ddl b/tools/test/h5dump/expected/tboot2A.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2A.ddl
+++ b/tools/test/h5dump/expected/tboot2A.ddl
diff --git a/tools/testfiles/tboot2B.ddl b/tools/test/h5dump/expected/tboot2B.ddl
index 504a634..504a634 100644
--- a/tools/testfiles/tboot2B.ddl
+++ b/tools/test/h5dump/expected/tboot2B.ddl
diff --git a/tools/testfiles/tchar1.ddl b/tools/test/h5dump/expected/tchar1.ddl
index 78acaf0..78acaf0 100644
--- a/tools/testfiles/tchar1.ddl
+++ b/tools/test/h5dump/expected/tchar1.ddl
diff --git a/tools/testfiles/tchunked.ddl b/tools/test/h5dump/expected/tchunked.ddl
index bf620fe..bf620fe 100644
--- a/tools/testfiles/tchunked.ddl
+++ b/tools/test/h5dump/expected/tchunked.ddl
diff --git a/tools/testfiles/tcmpdattrintsize.ddl b/tools/test/h5dump/expected/tcmpdattrintsize.ddl
index 17b5b77..17b5b77 100644
--- a/tools/testfiles/tcmpdattrintsize.ddl
+++ b/tools/test/h5dump/expected/tcmpdattrintsize.ddl
diff --git a/tools/testfiles/tcmpdintarray.ddl b/tools/test/h5dump/expected/tcmpdintarray.ddl
index ef21cd2..ef21cd2 100644
--- a/tools/testfiles/tcmpdintarray.ddl
+++ b/tools/test/h5dump/expected/tcmpdintarray.ddl
diff --git a/tools/testfiles/tcmpdints.ddl b/tools/test/h5dump/expected/tcmpdints.ddl
index f2986f3..f2986f3 100644
--- a/tools/testfiles/tcmpdints.ddl
+++ b/tools/test/h5dump/expected/tcmpdints.ddl
diff --git a/tools/testfiles/tcmpdintsize.ddl b/tools/test/h5dump/expected/tcmpdintsize.ddl
index ba296e1..ba296e1 100644
--- a/tools/testfiles/tcmpdintsize.ddl
+++ b/tools/test/h5dump/expected/tcmpdintsize.ddl
diff --git a/tools/testfiles/tcomp-1.ddl b/tools/test/h5dump/expected/tcomp-1.ddl
index f86ed16..f86ed16 100644
--- a/tools/testfiles/tcomp-1.ddl
+++ b/tools/test/h5dump/expected/tcomp-1.ddl
diff --git a/tools/testfiles/tcomp-2.ddl b/tools/test/h5dump/expected/tcomp-2.ddl
index a733a3c..a733a3c 100644
--- a/tools/testfiles/tcomp-2.ddl
+++ b/tools/test/h5dump/expected/tcomp-2.ddl
diff --git a/tools/testfiles/tcomp-3.ddl b/tools/test/h5dump/expected/tcomp-3.ddl
index 0294220..0294220 100644
--- a/tools/testfiles/tcomp-3.ddl
+++ b/tools/test/h5dump/expected/tcomp-3.ddl
diff --git a/tools/testfiles/tcomp-4.ddl b/tools/test/h5dump/expected/tcomp-4.ddl
index 4ab5191..4ab5191 100644
--- a/tools/testfiles/tcomp-4.ddl
+++ b/tools/test/h5dump/expected/tcomp-4.ddl
diff --git a/tools/testfiles/tcompact.ddl b/tools/test/h5dump/expected/tcompact.ddl
index 977f959..977f959 100644
--- a/tools/testfiles/tcompact.ddl
+++ b/tools/test/h5dump/expected/tcompact.ddl
diff --git a/tools/testfiles/tcompound_complex2.ddl b/tools/test/h5dump/expected/tcompound_complex2.ddl
index 562235d..562235d 100644
--- a/tools/testfiles/tcompound_complex2.ddl
+++ b/tools/test/h5dump/expected/tcompound_complex2.ddl
diff --git a/tools/testfiles/tcontents.ddl b/tools/test/h5dump/expected/tcontents.ddl
index 14e12d6..14e12d6 100644
--- a/tools/testfiles/tcontents.ddl
+++ b/tools/test/h5dump/expected/tcontents.ddl
diff --git a/tools/testfiles/tcontiguos.ddl b/tools/test/h5dump/expected/tcontiguos.ddl
index 3f045e5..3f045e5 100644
--- a/tools/testfiles/tcontiguos.ddl
+++ b/tools/test/h5dump/expected/tcontiguos.ddl
diff --git a/tools/testfiles/tdatareg.ddl b/tools/test/h5dump/expected/tdatareg.ddl
index ad1f64e..ad1f64e 100644
--- a/tools/testfiles/tdatareg.ddl
+++ b/tools/test/h5dump/expected/tdatareg.ddl
diff --git a/tools/testfiles/tdataregR.ddl b/tools/test/h5dump/expected/tdataregR.ddl
index 3945735..3945735 100644
--- a/tools/testfiles/tdataregR.ddl
+++ b/tools/test/h5dump/expected/tdataregR.ddl
diff --git a/tools/testfiles/tdeflate.ddl b/tools/test/h5dump/expected/tdeflate.ddl
index 9b92d0e..9b92d0e 100644
--- a/tools/testfiles/tdeflate.ddl
+++ b/tools/test/h5dump/expected/tdeflate.ddl
diff --git a/tools/testfiles/tdset-1.ddl b/tools/test/h5dump/expected/tdset-1.ddl
index 6b9b608..6b9b608 100644
--- a/tools/testfiles/tdset-1.ddl
+++ b/tools/test/h5dump/expected/tdset-1.ddl
diff --git a/tools/testfiles/tdset-2.ddl b/tools/test/h5dump/expected/tdset-2.ddl
index dfda95e..dfda95e 100644
--- a/tools/testfiles/tdset-2.ddl
+++ b/tools/test/h5dump/expected/tdset-2.ddl
diff --git a/tools/testfiles/tdset-3s.ddl b/tools/test/h5dump/expected/tdset-3s.ddl
index 93bdac8..93bdac8 100644
--- a/tools/testfiles/tdset-3s.ddl
+++ b/tools/test/h5dump/expected/tdset-3s.ddl
diff --git a/tools/testfiles/tempty.ddl b/tools/test/h5dump/expected/tempty.ddl
index 5797d48..5797d48 100644
--- a/tools/testfiles/tempty.ddl
+++ b/tools/test/h5dump/expected/tempty.ddl
diff --git a/tools/testfiles/texceedsubblock.ddl b/tools/test/h5dump/expected/texceedsubblock.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubblock.ddl
+++ b/tools/test/h5dump/expected/texceedsubblock.ddl
diff --git a/tools/testfiles/texceedsubcount.ddl b/tools/test/h5dump/expected/texceedsubcount.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubcount.ddl
+++ b/tools/test/h5dump/expected/texceedsubcount.ddl
diff --git a/tools/testfiles/texceedsubstart.ddl b/tools/test/h5dump/expected/texceedsubstart.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubstart.ddl
+++ b/tools/test/h5dump/expected/texceedsubstart.ddl
diff --git a/tools/testfiles/texceedsubstride.ddl b/tools/test/h5dump/expected/texceedsubstride.ddl
index 69ec706..69ec706 100644
--- a/tools/testfiles/texceedsubstride.ddl
+++ b/tools/test/h5dump/expected/texceedsubstride.ddl
diff --git a/tools/testfiles/texternal.ddl b/tools/test/h5dump/expected/texternal.ddl
index 59cd22c..59cd22c 100644
--- a/tools/testfiles/texternal.ddl
+++ b/tools/test/h5dump/expected/texternal.ddl
diff --git a/tools/testfiles/textlink.ddl b/tools/test/h5dump/expected/textlink.ddl
index 5459b30..5459b30 100644
--- a/tools/testfiles/textlink.ddl
+++ b/tools/test/h5dump/expected/textlink.ddl
diff --git a/tools/testfiles/textlinkfar.ddl b/tools/test/h5dump/expected/textlinkfar.ddl
index 32b2b49..32b2b49 100644
--- a/tools/testfiles/textlinkfar.ddl
+++ b/tools/test/h5dump/expected/textlinkfar.ddl
diff --git a/tools/testfiles/textlinksrc.ddl b/tools/test/h5dump/expected/textlinksrc.ddl
index 6ef0b44..6ef0b44 100644
--- a/tools/testfiles/textlinksrc.ddl
+++ b/tools/test/h5dump/expected/textlinksrc.ddl
diff --git a/tools/testfiles/tfamily.ddl b/tools/test/h5dump/expected/tfamily.ddl
index 489d8a8..489d8a8 100644
--- a/tools/testfiles/tfamily.ddl
+++ b/tools/test/h5dump/expected/tfamily.ddl
diff --git a/tools/testfiles/tfill.ddl b/tools/test/h5dump/expected/tfill.ddl
index 627e660..627e660 100644
--- a/tools/testfiles/tfill.ddl
+++ b/tools/test/h5dump/expected/tfill.ddl
diff --git a/tools/testfiles/tfletcher32.ddl b/tools/test/h5dump/expected/tfletcher32.ddl
index 01460e2..01460e2 100644
--- a/tools/testfiles/tfletcher32.ddl
+++ b/tools/test/h5dump/expected/tfletcher32.ddl
diff --git a/tools/testfiles/tfloatsattrs.ddl b/tools/test/h5dump/expected/tfloatsattrs.ddl
index 11c65b8..11c65b8 100644
--- a/tools/testfiles/tfloatsattrs.ddl
+++ b/tools/test/h5dump/expected/tfloatsattrs.ddl
diff --git a/tools/testfiles/tfloatsattrs.wddl b/tools/test/h5dump/expected/tfloatsattrs.wddl
index 38b735f..38b735f 100644
--- a/tools/testfiles/tfloatsattrs.wddl
+++ b/tools/test/h5dump/expected/tfloatsattrs.wddl
diff --git a/tools/testfiles/tfpformat.ddl b/tools/test/h5dump/expected/tfpformat.ddl
index 2830ad5..2830ad5 100644
--- a/tools/testfiles/tfpformat.ddl
+++ b/tools/test/h5dump/expected/tfpformat.ddl
diff --git a/tools/testfiles/tgroup-1.ddl b/tools/test/h5dump/expected/tgroup-1.ddl
index 4407eae..4407eae 100644
--- a/tools/testfiles/tgroup-1.ddl
+++ b/tools/test/h5dump/expected/tgroup-1.ddl
diff --git a/tools/testfiles/tgroup-2.ddl b/tools/test/h5dump/expected/tgroup-2.ddl
index 5374742..5374742 100644
--- a/tools/testfiles/tgroup-2.ddl
+++ b/tools/test/h5dump/expected/tgroup-2.ddl
diff --git a/tools/testfiles/tgrp_comments.ddl b/tools/test/h5dump/expected/tgrp_comments.ddl
index e33f3c2..e33f3c2 100644
--- a/tools/testfiles/tgrp_comments.ddl
+++ b/tools/test/h5dump/expected/tgrp_comments.ddl
diff --git a/tools/testfiles/tgrpnullspace.ddl b/tools/test/h5dump/expected/tgrpnullspace.ddl
index 7c1ef6c..7c1ef6c 100644
--- a/tools/testfiles/tgrpnullspace.ddl
+++ b/tools/test/h5dump/expected/tgrpnullspace.ddl
diff --git a/tools/testfiles/thlink-1.ddl b/tools/test/h5dump/expected/thlink-1.ddl
index 61ac6c2..61ac6c2 100644
--- a/tools/testfiles/thlink-1.ddl
+++ b/tools/test/h5dump/expected/thlink-1.ddl
diff --git a/tools/testfiles/thlink-2.ddl b/tools/test/h5dump/expected/thlink-2.ddl
index c1c6367..c1c6367 100644
--- a/tools/testfiles/thlink-2.ddl
+++ b/tools/test/h5dump/expected/thlink-2.ddl
diff --git a/tools/testfiles/thlink-3.ddl b/tools/test/h5dump/expected/thlink-3.ddl
index 625cf3c..625cf3c 100644
--- a/tools/testfiles/thlink-3.ddl
+++ b/tools/test/h5dump/expected/thlink-3.ddl
diff --git a/tools/testfiles/thlink-4.ddl b/tools/test/h5dump/expected/thlink-4.ddl
index 026f412..026f412 100644
--- a/tools/testfiles/thlink-4.ddl
+++ b/tools/test/h5dump/expected/thlink-4.ddl
diff --git a/tools/testfiles/thlink-5.ddl b/tools/test/h5dump/expected/thlink-5.ddl
index 058e863..058e863 100644
--- a/tools/testfiles/thlink-5.ddl
+++ b/tools/test/h5dump/expected/thlink-5.ddl
diff --git a/tools/testfiles/thyperslab.ddl b/tools/test/h5dump/expected/thyperslab.ddl
index 2f4a118..2f4a118 100644
--- a/tools/testfiles/thyperslab.ddl
+++ b/tools/test/h5dump/expected/thyperslab.ddl
diff --git a/tools/testfiles/tindicesno.ddl b/tools/test/h5dump/expected/tindicesno.ddl
index a7b726e..a7b726e 100644
--- a/tools/testfiles/tindicesno.ddl
+++ b/tools/test/h5dump/expected/tindicesno.ddl
diff --git a/tools/testfiles/tindicessub1.ddl b/tools/test/h5dump/expected/tindicessub1.ddl
index 5cf4058..5cf4058 100644
--- a/tools/testfiles/tindicessub1.ddl
+++ b/tools/test/h5dump/expected/tindicessub1.ddl
diff --git a/tools/testfiles/tindicessub2.ddl b/tools/test/h5dump/expected/tindicessub2.ddl
index 5103b49..5103b49 100644
--- a/tools/testfiles/tindicessub2.ddl
+++ b/tools/test/h5dump/expected/tindicessub2.ddl
diff --git a/tools/testfiles/tindicessub3.ddl b/tools/test/h5dump/expected/tindicessub3.ddl
index f7fb81c..f7fb81c 100644
--- a/tools/testfiles/tindicessub3.ddl
+++ b/tools/test/h5dump/expected/tindicessub3.ddl
diff --git a/tools/testfiles/tindicessub4.ddl b/tools/test/h5dump/expected/tindicessub4.ddl
index 7829875..7829875 100644
--- a/tools/testfiles/tindicessub4.ddl
+++ b/tools/test/h5dump/expected/tindicessub4.ddl
diff --git a/tools/testfiles/tindicesyes.ddl b/tools/test/h5dump/expected/tindicesyes.ddl
index 9440c54..9440c54 100644
--- a/tools/testfiles/tindicesyes.ddl
+++ b/tools/test/h5dump/expected/tindicesyes.ddl
diff --git a/tools/testfiles/tints4dims.ddl b/tools/test/h5dump/expected/tints4dims.ddl
index ba5c852..ba5c852 100644
--- a/tools/testfiles/tints4dims.ddl
+++ b/tools/test/h5dump/expected/tints4dims.ddl
diff --git a/tools/testfiles/tints4dimsBlock2.ddl b/tools/test/h5dump/expected/tints4dimsBlock2.ddl
index f414e10..f414e10 100644
--- a/tools/testfiles/tints4dimsBlock2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsBlock2.ddl
diff --git a/tools/testfiles/tints4dimsBlockEq.ddl b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl
index 6625780..6625780 100644
--- a/tools/testfiles/tints4dimsBlockEq.ddl
+++ b/tools/test/h5dump/expected/tints4dimsBlockEq.ddl
diff --git a/tools/testfiles/tints4dimsCount2.ddl b/tools/test/h5dump/expected/tints4dimsCount2.ddl
index 500e418..500e418 100644
--- a/tools/testfiles/tints4dimsCount2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsCount2.ddl
diff --git a/tools/testfiles/tints4dimsCountEq.ddl b/tools/test/h5dump/expected/tints4dimsCountEq.ddl
index 8b17bfc..8b17bfc 100644
--- a/tools/testfiles/tints4dimsCountEq.ddl
+++ b/tools/test/h5dump/expected/tints4dimsCountEq.ddl
diff --git a/tools/testfiles/tints4dimsStride2.ddl b/tools/test/h5dump/expected/tints4dimsStride2.ddl
index 7ec98fc..7ec98fc 100644
--- a/tools/testfiles/tints4dimsStride2.ddl
+++ b/tools/test/h5dump/expected/tints4dimsStride2.ddl
diff --git a/tools/testfiles/tintsattrs.ddl b/tools/test/h5dump/expected/tintsattrs.ddl
index b1f1cdf..b1f1cdf 100644
--- a/tools/testfiles/tintsattrs.ddl
+++ b/tools/test/h5dump/expected/tintsattrs.ddl
diff --git a/tools/testfiles/tintsnodata.ddl b/tools/test/h5dump/expected/tintsnodata.ddl
index a1516af..a1516af 100644
--- a/tools/testfiles/tintsnodata.ddl
+++ b/tools/test/h5dump/expected/tintsnodata.ddl
diff --git a/tools/testfiles/tlarge_objname.ddl b/tools/test/h5dump/expected/tlarge_objname.ddl
index 0facc43..0facc43 100644
--- a/tools/testfiles/tlarge_objname.ddl
+++ b/tools/test/h5dump/expected/tlarge_objname.ddl
diff --git a/tools/testfiles/tldouble.ddl b/tools/test/h5dump/expected/tldouble.ddl
index 2fed523..2fed523 100644
--- a/tools/testfiles/tldouble.ddl
+++ b/tools/test/h5dump/expected/tldouble.ddl
diff --git a/tools/testfiles/tldouble_scalar.ddl b/tools/test/h5dump/expected/tldouble_scalar.ddl
index 596d8db..596d8db 100755
--- a/tools/testfiles/tldouble_scalar.ddl
+++ b/tools/test/h5dump/expected/tldouble_scalar.ddl
diff --git a/tools/testfiles/tlonglinks.ddl b/tools/test/h5dump/expected/tlonglinks.ddl
index 0e57b3d..0e57b3d 100644
--- a/tools/testfiles/tlonglinks.ddl
+++ b/tools/test/h5dump/expected/tlonglinks.ddl
diff --git a/tools/testfiles/tloop-1.ddl b/tools/test/h5dump/expected/tloop-1.ddl
index 1f3a2fb..1f3a2fb 100644
--- a/tools/testfiles/tloop-1.ddl
+++ b/tools/test/h5dump/expected/tloop-1.ddl
diff --git a/tools/testfiles/tmulti.ddl b/tools/test/h5dump/expected/tmulti.ddl
index b6bf35e..b6bf35e 100644
--- a/tools/testfiles/tmulti.ddl
+++ b/tools/test/h5dump/expected/tmulti.ddl
diff --git a/tools/testfiles/tmultifile.ddl b/tools/test/h5dump/expected/tmultifile.ddl
index ebe1608..ebe1608 100644
--- a/tools/testfiles/tmultifile.ddl
+++ b/tools/test/h5dump/expected/tmultifile.ddl
diff --git a/tools/testfiles/tnamed_dtype_attr.ddl b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl
index 7cd14ef..7cd14ef 100644
--- a/tools/testfiles/tnamed_dtype_attr.ddl
+++ b/tools/test/h5dump/expected/tnamed_dtype_attr.ddl
diff --git a/tools/testfiles/tnbit.ddl b/tools/test/h5dump/expected/tnbit.ddl
index cf2ac1f..cf2ac1f 100644
--- a/tools/testfiles/tnbit.ddl
+++ b/tools/test/h5dump/expected/tnbit.ddl
diff --git a/tools/testfiles/tnestcomp-1.ddl b/tools/test/h5dump/expected/tnestcomp-1.ddl
index fda9c7c..fda9c7c 100644
--- a/tools/testfiles/tnestcomp-1.ddl
+++ b/tools/test/h5dump/expected/tnestcomp-1.ddl
diff --git a/tools/testfiles/tnestedcmpddt.ddl b/tools/test/h5dump/expected/tnestedcmpddt.ddl
index db949f0..db949f0 100644
--- a/tools/testfiles/tnestedcmpddt.ddl
+++ b/tools/test/h5dump/expected/tnestedcmpddt.ddl
diff --git a/tools/testfiles/tno-subset.ddl b/tools/test/h5dump/expected/tno-subset.ddl
index 11aa264..11aa264 100644
--- a/tools/testfiles/tno-subset.ddl
+++ b/tools/test/h5dump/expected/tno-subset.ddl
diff --git a/tools/testfiles/tnoattrdata.ddl b/tools/test/h5dump/expected/tnoattrdata.ddl
index a5d40fe..a5d40fe 100644
--- a/tools/testfiles/tnoattrdata.ddl
+++ b/tools/test/h5dump/expected/tnoattrdata.ddl
diff --git a/tools/testfiles/tnoattrddl.ddl b/tools/test/h5dump/expected/tnoattrddl.ddl
index f7326d0..f7326d0 100644
--- a/tools/testfiles/tnoattrddl.ddl
+++ b/tools/test/h5dump/expected/tnoattrddl.ddl
diff --git a/tools/testfiles/tnodata.ddl b/tools/test/h5dump/expected/tnodata.ddl
index f99d906..f99d906 100644
--- a/tools/testfiles/tnodata.ddl
+++ b/tools/test/h5dump/expected/tnodata.ddl
diff --git a/tools/testfiles/tnoddl.ddl b/tools/test/h5dump/expected/tnoddl.ddl
index 5238777..5238777 100644
--- a/tools/testfiles/tnoddl.ddl
+++ b/tools/test/h5dump/expected/tnoddl.ddl
diff --git a/tools/testfiles/tnoddlfile.ddl b/tools/test/h5dump/expected/tnoddlfile.ddl
index e69de29..e69de29 100644
--- a/tools/testfiles/tnoddlfile.ddl
+++ b/tools/test/h5dump/expected/tnoddlfile.ddl
diff --git a/tools/testfiles/tnullspace.ddl b/tools/test/h5dump/expected/tnullspace.ddl
index 32e208f..32e208f 100644
--- a/tools/testfiles/tnullspace.ddl
+++ b/tools/test/h5dump/expected/tnullspace.ddl
diff --git a/tools/testfiles/torderattr1.ddl b/tools/test/h5dump/expected/torderattr1.ddl
index fb7fd70..fb7fd70 100644
--- a/tools/testfiles/torderattr1.ddl
+++ b/tools/test/h5dump/expected/torderattr1.ddl
diff --git a/tools/testfiles/torderattr2.ddl b/tools/test/h5dump/expected/torderattr2.ddl
index dbf615b..dbf615b 100644
--- a/tools/testfiles/torderattr2.ddl
+++ b/tools/test/h5dump/expected/torderattr2.ddl
diff --git a/tools/testfiles/torderattr3.ddl b/tools/test/h5dump/expected/torderattr3.ddl
index a2990f7..a2990f7 100644
--- a/tools/testfiles/torderattr3.ddl
+++ b/tools/test/h5dump/expected/torderattr3.ddl
diff --git a/tools/testfiles/torderattr4.ddl b/tools/test/h5dump/expected/torderattr4.ddl
index 000a852..000a852 100644
--- a/tools/testfiles/torderattr4.ddl
+++ b/tools/test/h5dump/expected/torderattr4.ddl
diff --git a/tools/testfiles/tordercontents1.ddl b/tools/test/h5dump/expected/tordercontents1.ddl
index 14e12d6..14e12d6 100644
--- a/tools/testfiles/tordercontents1.ddl
+++ b/tools/test/h5dump/expected/tordercontents1.ddl
diff --git a/tools/testfiles/tordercontents2.ddl b/tools/test/h5dump/expected/tordercontents2.ddl
index 6757338..6757338 100644
--- a/tools/testfiles/tordercontents2.ddl
+++ b/tools/test/h5dump/expected/tordercontents2.ddl
diff --git a/tools/testfiles/tordergr1.ddl b/tools/test/h5dump/expected/tordergr1.ddl
index 0fa74d9..0fa74d9 100644
--- a/tools/testfiles/tordergr1.ddl
+++ b/tools/test/h5dump/expected/tordergr1.ddl
diff --git a/tools/testfiles/tordergr2.ddl b/tools/test/h5dump/expected/tordergr2.ddl
index 500d99c..500d99c 100644
--- a/tools/testfiles/tordergr2.ddl
+++ b/tools/test/h5dump/expected/tordergr2.ddl
diff --git a/tools/testfiles/tordergr3.ddl b/tools/test/h5dump/expected/tordergr3.ddl
index 99e9a6b..99e9a6b 100644
--- a/tools/testfiles/tordergr3.ddl
+++ b/tools/test/h5dump/expected/tordergr3.ddl
diff --git a/tools/testfiles/tordergr4.ddl b/tools/test/h5dump/expected/tordergr4.ddl
index 1613d9d..1613d9d 100644
--- a/tools/testfiles/tordergr4.ddl
+++ b/tools/test/h5dump/expected/tordergr4.ddl
diff --git a/tools/testfiles/tordergr5.ddl b/tools/test/h5dump/expected/tordergr5.ddl
index 0ede967..0ede967 100644
--- a/tools/testfiles/tordergr5.ddl
+++ b/tools/test/h5dump/expected/tordergr5.ddl
diff --git a/tools/testfiles/torderlinks1.ddl b/tools/test/h5dump/expected/torderlinks1.ddl
index eaf6eea..eaf6eea 100644
--- a/tools/testfiles/torderlinks1.ddl
+++ b/tools/test/h5dump/expected/torderlinks1.ddl
diff --git a/tools/testfiles/torderlinks2.ddl b/tools/test/h5dump/expected/torderlinks2.ddl
index dd68208..dd68208 100644
--- a/tools/testfiles/torderlinks2.ddl
+++ b/tools/test/h5dump/expected/torderlinks2.ddl
diff --git a/tools/testfiles/tperror.ddl b/tools/test/h5dump/expected/tperror.ddl
index 0cb961c..0cb961c 100644
--- a/tools/testfiles/tperror.ddl
+++ b/tools/test/h5dump/expected/tperror.ddl
diff --git a/tools/testfiles/tqmarkfile.ddl b/tools/test/h5dump/expected/tqmarkfile.ddl
index 885be5f..885be5f 100644
--- a/tools/testfiles/tqmarkfile.ddl
+++ b/tools/test/h5dump/expected/tqmarkfile.ddl
diff --git a/tools/testfiles/trawdatafile.ddl b/tools/test/h5dump/expected/trawdatafile.ddl
index f99d906..f99d906 100644
--- a/tools/testfiles/trawdatafile.ddl
+++ b/tools/test/h5dump/expected/trawdatafile.ddl
diff --git a/tools/testfiles/trawssetfile.ddl b/tools/test/h5dump/expected/trawssetfile.ddl
index e8f07f8..e8f07f8 100644
--- a/tools/testfiles/trawssetfile.ddl
+++ b/tools/test/h5dump/expected/trawssetfile.ddl
diff --git a/tools/testfiles/treadfilter.ddl b/tools/test/h5dump/expected/treadfilter.ddl
index 88ca2e9..88ca2e9 100644
--- a/tools/testfiles/treadfilter.ddl
+++ b/tools/test/h5dump/expected/treadfilter.ddl
diff --git a/tools/testfiles/treadintfilter.ddl b/tools/test/h5dump/expected/treadintfilter.ddl
index fbad3f6..fbad3f6 100644
--- a/tools/testfiles/treadintfilter.ddl
+++ b/tools/test/h5dump/expected/treadintfilter.ddl
diff --git a/tools/testfiles/trefer_attrR.ddl b/tools/test/h5dump/expected/trefer_attrR.ddl
index 118e7bf..118e7bf 100644
--- a/tools/testfiles/trefer_attrR.ddl
+++ b/tools/test/h5dump/expected/trefer_attrR.ddl
diff --git a/tools/testfiles/trefer_compatR.ddl b/tools/test/h5dump/expected/trefer_compatR.ddl
index 97c7934..97c7934 100644
--- a/tools/testfiles/trefer_compatR.ddl
+++ b/tools/test/h5dump/expected/trefer_compatR.ddl
diff --git a/tools/testfiles/trefer_extR.ddl b/tools/test/h5dump/expected/trefer_extR.ddl
index a96e5fd..a96e5fd 100644
--- a/tools/testfiles/trefer_extR.ddl
+++ b/tools/test/h5dump/expected/trefer_extR.ddl
diff --git a/tools/testfiles/trefer_grpR.ddl b/tools/test/h5dump/expected/trefer_grpR.ddl
index 298b836..298b836 100644
--- a/tools/testfiles/trefer_grpR.ddl
+++ b/tools/test/h5dump/expected/trefer_grpR.ddl
diff --git a/tools/testfiles/trefer_objR.ddl b/tools/test/h5dump/expected/trefer_objR.ddl
index 0d5af28..0d5af28 100644
--- a/tools/testfiles/trefer_objR.ddl
+++ b/tools/test/h5dump/expected/trefer_objR.ddl
diff --git a/tools/testfiles/trefer_obj_delR.ddl b/tools/test/h5dump/expected/trefer_obj_delR.ddl
index fa238a5..fa238a5 100644
--- a/tools/testfiles/trefer_obj_delR.ddl
+++ b/tools/test/h5dump/expected/trefer_obj_delR.ddl
diff --git a/tools/testfiles/trefer_paramR.ddl b/tools/test/h5dump/expected/trefer_paramR.ddl
index ce9fa86..ce9fa86 100644
--- a/tools/testfiles/trefer_paramR.ddl
+++ b/tools/test/h5dump/expected/trefer_paramR.ddl
diff --git a/tools/testfiles/trefer_regR.ddl b/tools/test/h5dump/expected/trefer_regR.ddl
index 683c196..683c196 100644
--- a/tools/testfiles/trefer_regR.ddl
+++ b/tools/test/h5dump/expected/trefer_regR.ddl
diff --git a/tools/testfiles/trefer_reg_1dR.ddl b/tools/test/h5dump/expected/trefer_reg_1dR.ddl
index 3e5f652..3e5f652 100644
--- a/tools/testfiles/trefer_reg_1dR.ddl
+++ b/tools/test/h5dump/expected/trefer_reg_1dR.ddl
diff --git a/tools/testfiles/treference.ddl b/tools/test/h5dump/expected/treference.ddl
index 1145b25..1145b25 100644
--- a/tools/testfiles/treference.ddl
+++ b/tools/test/h5dump/expected/treference.ddl
diff --git a/tools/testfiles/tsaf.ddl b/tools/test/h5dump/expected/tsaf.ddl
index fe9f864..fe9f864 100644
--- a/tools/testfiles/tsaf.ddl
+++ b/tools/test/h5dump/expected/tsaf.ddl
diff --git a/tools/testfiles/tscalarattrintsize.ddl b/tools/test/h5dump/expected/tscalarattrintsize.ddl
index 46f3cef..46f3cef 100644
--- a/tools/testfiles/tscalarattrintsize.ddl
+++ b/tools/test/h5dump/expected/tscalarattrintsize.ddl
diff --git a/tools/testfiles/tscalarintattrsize.ddl b/tools/test/h5dump/expected/tscalarintattrsize.ddl
index a9de66b..a9de66b 100644
--- a/tools/testfiles/tscalarintattrsize.ddl
+++ b/tools/test/h5dump/expected/tscalarintattrsize.ddl
diff --git a/tools/testfiles/tscalarintsize.ddl b/tools/test/h5dump/expected/tscalarintsize.ddl
index 4b06a74..4b06a74 100644
--- a/tools/testfiles/tscalarintsize.ddl
+++ b/tools/test/h5dump/expected/tscalarintsize.ddl
diff --git a/tools/testfiles/tscalarstring.ddl b/tools/test/h5dump/expected/tscalarstring.ddl
index 4ba7093..4ba7093 100644
--- a/tools/testfiles/tscalarstring.ddl
+++ b/tools/test/h5dump/expected/tscalarstring.ddl
diff --git a/tools/testfiles/tscaleoffset.ddl b/tools/test/h5dump/expected/tscaleoffset.ddl
index a039736..a039736 100644
--- a/tools/testfiles/tscaleoffset.ddl
+++ b/tools/test/h5dump/expected/tscaleoffset.ddl
diff --git a/tools/testfiles/tshuffle.ddl b/tools/test/h5dump/expected/tshuffle.ddl
index b0477db..b0477db 100644
--- a/tools/testfiles/tshuffle.ddl
+++ b/tools/test/h5dump/expected/tshuffle.ddl
diff --git a/tools/testfiles/tslink-1.ddl b/tools/test/h5dump/expected/tslink-1.ddl
index d9df572..d9df572 100644
--- a/tools/testfiles/tslink-1.ddl
+++ b/tools/test/h5dump/expected/tslink-1.ddl
diff --git a/tools/testfiles/tslink-2.ddl b/tools/test/h5dump/expected/tslink-2.ddl
index 853c093..853c093 100644
--- a/tools/testfiles/tslink-2.ddl
+++ b/tools/test/h5dump/expected/tslink-2.ddl
diff --git a/tools/testfiles/tslink-D.ddl b/tools/test/h5dump/expected/tslink-D.ddl
index 9d90262..9d90262 100644
--- a/tools/testfiles/tslink-D.ddl
+++ b/tools/test/h5dump/expected/tslink-D.ddl
diff --git a/tools/testfiles/tsplit_file.ddl b/tools/test/h5dump/expected/tsplit_file.ddl
index 9a1e22d..9a1e22d 100644
--- a/tools/testfiles/tsplit_file.ddl
+++ b/tools/test/h5dump/expected/tsplit_file.ddl
diff --git a/tools/testfiles/tst_onion_dset_1d.ddl b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl
index adca75f..adca75f 100644
--- a/tools/testfiles/tst_onion_dset_1d.ddl
+++ b/tools/test/h5dump/expected/tst_onion_dset_1d.ddl
diff --git a/tools/testfiles/tst_onion_dset_ext.ddl b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl
index 2405774..2405774 100644
--- a/tools/testfiles/tst_onion_dset_ext.ddl
+++ b/tools/test/h5dump/expected/tst_onion_dset_ext.ddl
diff --git a/tools/testfiles/tst_onion_objs.ddl b/tools/test/h5dump/expected/tst_onion_objs.ddl
index c66275b..c66275b 100644
--- a/tools/testfiles/tst_onion_objs.ddl
+++ b/tools/test/h5dump/expected/tst_onion_objs.ddl
diff --git a/tools/testfiles/tst_onion_revision_count.ddl b/tools/test/h5dump/expected/tst_onion_revision_count.ddl
index 4f2e1db..4f2e1db 100644
--- a/tools/testfiles/tst_onion_revision_count.ddl
+++ b/tools/test/h5dump/expected/tst_onion_revision_count.ddl
diff --git a/tools/testfiles/tstarfile.ddl b/tools/test/h5dump/expected/tstarfile.ddl
index 1cd87f7..1cd87f7 100644
--- a/tools/testfiles/tstarfile.ddl
+++ b/tools/test/h5dump/expected/tstarfile.ddl
diff --git a/tools/testfiles/tstr-1.ddl b/tools/test/h5dump/expected/tstr-1.ddl
index e43b732..e43b732 100644
--- a/tools/testfiles/tstr-1.ddl
+++ b/tools/test/h5dump/expected/tstr-1.ddl
diff --git a/tools/testfiles/tstr-2.ddl b/tools/test/h5dump/expected/tstr-2.ddl
index 26425f6..26425f6 100644
--- a/tools/testfiles/tstr-2.ddl
+++ b/tools/test/h5dump/expected/tstr-2.ddl
diff --git a/tools/testfiles/tstring.ddl b/tools/test/h5dump/expected/tstring.ddl
index 398bf33..398bf33 100644
--- a/tools/testfiles/tstring.ddl
+++ b/tools/test/h5dump/expected/tstring.ddl
diff --git a/tools/testfiles/tstring2.ddl b/tools/test/h5dump/expected/tstring2.ddl
index cda2ed5..cda2ed5 100644
--- a/tools/testfiles/tstring2.ddl
+++ b/tools/test/h5dump/expected/tstring2.ddl
diff --git a/tools/testfiles/tstringe.ddl b/tools/test/h5dump/expected/tstringe.ddl
index d3f5181..d3f5181 100644
--- a/tools/testfiles/tstringe.ddl
+++ b/tools/test/h5dump/expected/tstringe.ddl
diff --git a/tools/testfiles/tszip.ddl b/tools/test/h5dump/expected/tszip.ddl
index 06e2259..06e2259 100644
--- a/tools/testfiles/tszip.ddl
+++ b/tools/test/h5dump/expected/tszip.ddl
diff --git a/tools/testfiles/tudfilter.ddl b/tools/test/h5dump/expected/tudfilter.ddl
index b2aa7e6..b2aa7e6 100644
--- a/tools/testfiles/tudfilter.ddl
+++ b/tools/test/h5dump/expected/tudfilter.ddl
diff --git a/tools/testfiles/tudlink-1.ddl b/tools/test/h5dump/expected/tudlink-1.ddl
index 53edf6b..53edf6b 100644
--- a/tools/testfiles/tudlink-1.ddl
+++ b/tools/test/h5dump/expected/tudlink-1.ddl
diff --git a/tools/testfiles/tudlink-2.ddl b/tools/test/h5dump/expected/tudlink-2.ddl
index 82b9f8e..82b9f8e 100644
--- a/tools/testfiles/tudlink-2.ddl
+++ b/tools/test/h5dump/expected/tudlink-2.ddl
diff --git a/tools/testfiles/tuserfilter.ddl b/tools/test/h5dump/expected/tuserfilter.ddl
index f77fb17..f77fb17 100644
--- a/tools/testfiles/tuserfilter.ddl
+++ b/tools/test/h5dump/expected/tuserfilter.ddl
diff --git a/tools/testfiles/tvldtypes1.ddl b/tools/test/h5dump/expected/tvldtypes1.ddl
index bdf9328..bdf9328 100644
--- a/tools/testfiles/tvldtypes1.ddl
+++ b/tools/test/h5dump/expected/tvldtypes1.ddl
diff --git a/tools/testfiles/tvldtypes2.ddl b/tools/test/h5dump/expected/tvldtypes2.ddl
index 5a91187..5a91187 100644
--- a/tools/testfiles/tvldtypes2.ddl
+++ b/tools/test/h5dump/expected/tvldtypes2.ddl
diff --git a/tools/testfiles/tvldtypes3.ddl b/tools/test/h5dump/expected/tvldtypes3.ddl
index b8f53c9..b8f53c9 100644
--- a/tools/testfiles/tvldtypes3.ddl
+++ b/tools/test/h5dump/expected/tvldtypes3.ddl
diff --git a/tools/testfiles/tvldtypes4.ddl b/tools/test/h5dump/expected/tvldtypes4.ddl
index da363fa..da363fa 100644
--- a/tools/testfiles/tvldtypes4.ddl
+++ b/tools/test/h5dump/expected/tvldtypes4.ddl
diff --git a/tools/testfiles/tvldtypes5.ddl b/tools/test/h5dump/expected/tvldtypes5.ddl
index b0f8a2c..b0f8a2c 100644
--- a/tools/testfiles/tvldtypes5.ddl
+++ b/tools/test/h5dump/expected/tvldtypes5.ddl
diff --git a/tools/testfiles/tvlenstr_array.ddl b/tools/test/h5dump/expected/tvlenstr_array.ddl
index 87efbb6..87efbb6 100644
--- a/tools/testfiles/tvlenstr_array.ddl
+++ b/tools/test/h5dump/expected/tvlenstr_array.ddl
diff --git a/tools/testfiles/tvlstr.ddl b/tools/test/h5dump/expected/tvlstr.ddl
index dfce2eb..dfce2eb 100644
--- a/tools/testfiles/tvlstr.ddl
+++ b/tools/test/h5dump/expected/tvlstr.ddl
diff --git a/tools/testfiles/tvms.ddl b/tools/test/h5dump/expected/tvms.ddl
index 49f3881..49f3881 100644
--- a/tools/testfiles/tvms.ddl
+++ b/tools/test/h5dump/expected/tvms.ddl
diff --git a/tools/testfiles/twidedisplay.ddl b/tools/test/h5dump/expected/twidedisplay.ddl
index 1e6ffee..1e6ffee 100644
--- a/tools/testfiles/twidedisplay.ddl
+++ b/tools/test/h5dump/expected/twidedisplay.ddl
diff --git a/tools/testfiles/twithddlfile.ddl b/tools/test/h5dump/expected/twithddlfile.ddl
index e69de29..e69de29 100644
--- a/tools/testfiles/twithddlfile.ddl
+++ b/tools/test/h5dump/expected/twithddlfile.ddl
diff --git a/tools/testfiles/vds/tvds-1.ddl b/tools/test/h5dump/expected/vds/tvds-1.ddl
index 47fd413..47fd413 100644
--- a/tools/testfiles/vds/tvds-1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-1.ddl
diff --git a/tools/testfiles/vds/tvds-2.ddl b/tools/test/h5dump/expected/vds/tvds-2.ddl
index 5f2ae16..5f2ae16 100644
--- a/tools/testfiles/vds/tvds-2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-2.ddl
diff --git a/tools/testfiles/vds/tvds-3_1.ddl b/tools/test/h5dump/expected/vds/tvds-3_1.ddl
index 7d7d8b6..7d7d8b6 100644
--- a/tools/testfiles/vds/tvds-3_1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-3_1.ddl
diff --git a/tools/testfiles/vds/tvds-3_2.ddl b/tools/test/h5dump/expected/vds/tvds-3_2.ddl
index baec6f0..baec6f0 100644
--- a/tools/testfiles/vds/tvds-3_2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-3_2.ddl
diff --git a/tools/testfiles/vds/tvds-4.ddl b/tools/test/h5dump/expected/vds/tvds-4.ddl
index 1832724..1832724 100644
--- a/tools/testfiles/vds/tvds-4.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-4.ddl
diff --git a/tools/testfiles/vds/tvds-5.ddl b/tools/test/h5dump/expected/vds/tvds-5.ddl
index f59017b..f59017b 100644
--- a/tools/testfiles/vds/tvds-5.ddl
+++ b/tools/test/h5dump/expected/vds/tvds-5.ddl
diff --git a/tools/testfiles/vds/tvds_layout-1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl
index b5351f2..b5351f2 100644
--- a/tools/testfiles/vds/tvds_layout-1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-1.ddl
diff --git a/tools/testfiles/vds/tvds_layout-2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl
index 53407c7..53407c7 100644
--- a/tools/testfiles/vds/tvds_layout-2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-2.ddl
diff --git a/tools/testfiles/vds/tvds_layout-3_1.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl
index e75fe36..e75fe36 100644
--- a/tools/testfiles/vds/tvds_layout-3_1.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-3_1.ddl
diff --git a/tools/testfiles/vds/tvds_layout-3_2.ddl b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl
index 5b63269..5b63269 100644
--- a/tools/testfiles/vds/tvds_layout-3_2.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-3_2.ddl
diff --git a/tools/testfiles/vds/tvds_layout-4.ddl b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl
index a449d0c..a449d0c 100644
--- a/tools/testfiles/vds/tvds_layout-4.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-4.ddl
diff --git a/tools/testfiles/vds/tvds_layout-5.ddl b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl
index 1698eb4..1698eb4 100644
--- a/tools/testfiles/vds/tvds_layout-5.ddl
+++ b/tools/test/h5dump/expected/vds/tvds_layout-5.ddl
diff --git a/tools/testfiles/vds/vds-first.ddl b/tools/test/h5dump/expected/vds/vds-first.ddl
index 97b1ecf..97b1ecf 100644
--- a/tools/testfiles/vds/vds-first.ddl
+++ b/tools/test/h5dump/expected/vds/vds-first.ddl
diff --git a/tools/testfiles/vds/vds-gap1.ddl b/tools/test/h5dump/expected/vds/vds-gap1.ddl
index cace781..cace781 100644
--- a/tools/testfiles/vds/vds-gap1.ddl
+++ b/tools/test/h5dump/expected/vds/vds-gap1.ddl
diff --git a/tools/testfiles/vds/vds-gap2.ddl b/tools/test/h5dump/expected/vds/vds-gap2.ddl
index 24da48f..24da48f 100644
--- a/tools/testfiles/vds/vds-gap2.ddl
+++ b/tools/test/h5dump/expected/vds/vds-gap2.ddl
diff --git a/tools/testfiles/vds/vds_layout-eiger.ddl b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl
index d32a139..d32a139 100644
--- a/tools/testfiles/vds/vds_layout-eiger.ddl
+++ b/tools/test/h5dump/expected/vds/vds_layout-eiger.ddl
diff --git a/tools/testfiles/vds/vds_layout-maxmin.ddl b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl
index 790fc1c..790fc1c 100644
--- a/tools/testfiles/vds/vds_layout-maxmin.ddl
+++ b/tools/test/h5dump/expected/vds/vds_layout-maxmin.ddl
diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
index c7d2fcf..c7d2fcf 100644
--- a/tools/testfiles/tall-2A.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall-2A.h5.xml
diff --git a/tools/testfiles/tall.h5.xml b/tools/test/h5dump/expected/xml/tall.h5.xml
index ba130f1..ba130f1 100644
--- a/tools/testfiles/tall.h5.xml
+++ b/tools/test/h5dump/expected/xml/tall.h5.xml
diff --git a/tools/testfiles/tarray1.h5.xml b/tools/test/h5dump/expected/xml/tarray1.h5.xml
index 26d2d9b..26d2d9b 100644
--- a/tools/testfiles/tarray1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray1.h5.xml
diff --git a/tools/testfiles/tarray2.h5.xml b/tools/test/h5dump/expected/xml/tarray2.h5.xml
index 8f4f312..8f4f312 100644
--- a/tools/testfiles/tarray2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray2.h5.xml
diff --git a/tools/testfiles/tarray3.h5.xml b/tools/test/h5dump/expected/xml/tarray3.h5.xml
index 3879994..3879994 100644
--- a/tools/testfiles/tarray3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray3.h5.xml
diff --git a/tools/testfiles/tarray6.h5.xml b/tools/test/h5dump/expected/xml/tarray6.h5.xml
index 0fb50ed..0fb50ed 100644
--- a/tools/testfiles/tarray6.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray6.h5.xml
diff --git a/tools/testfiles/tarray7.h5.xml b/tools/test/h5dump/expected/xml/tarray7.h5.xml
index e6a5bca..e6a5bca 100644
--- a/tools/testfiles/tarray7.h5.xml
+++ b/tools/test/h5dump/expected/xml/tarray7.h5.xml
diff --git a/tools/testfiles/tattr.h5.xml b/tools/test/h5dump/expected/xml/tattr.h5.xml
index ce54360..ce54360 100644
--- a/tools/testfiles/tattr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tattr.h5.xml
diff --git a/tools/testfiles/tbitfields_be.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
index 26bbd91..26bbd91 100644
--- a/tools/testfiles/tbitfields_be.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_be.h5.xml
diff --git a/tools/testfiles/tbitfields_le.h5.xml b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
index c8ba026..c8ba026 100644
--- a/tools/testfiles/tbitfields_le.h5.xml
+++ b/tools/test/h5dump/expected/xml/tbitfields_le.h5.xml
diff --git a/tools/testfiles/tcompound.h5.xml b/tools/test/h5dump/expected/xml/tcompound.h5.xml
index 5c74493..5c74493 100644
--- a/tools/testfiles/tcompound.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound.h5.xml
diff --git a/tools/testfiles/tcompound2.h5.xml b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
index 5c69cef..5c69cef 100644
--- a/tools/testfiles/tcompound2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound2.h5.xml
diff --git a/tools/testfiles/tcompound_complex.h5.xml b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
index 92bd64d..92bd64d 100644
--- a/tools/testfiles/tcompound_complex.h5.xml
+++ b/tools/test/h5dump/expected/xml/tcompound_complex.h5.xml
diff --git a/tools/testfiles/tdatareg.h5.xml b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
index ea65384..ea65384 100644
--- a/tools/testfiles/tdatareg.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdatareg.h5.xml
diff --git a/tools/testfiles/tdset.h5.xml b/tools/test/h5dump/expected/xml/tdset.h5.xml
index 80dcf6f..80dcf6f 100644
--- a/tools/testfiles/tdset.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset.h5.xml
diff --git a/tools/testfiles/tdset2.h5.xml b/tools/test/h5dump/expected/xml/tdset2.h5.xml
index 7f78685..7f78685 100644
--- a/tools/testfiles/tdset2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tdset2.h5.xml
diff --git a/tools/testfiles/tempty-dtd-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
index 213d582..213d582 100644
--- a/tools/testfiles/tempty-dtd-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd-2.h5.xml
diff --git a/tools/testfiles/tempty-dtd-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml
index d3c5e81..d3c5e81 100644
--- a/tools/testfiles/tempty-dtd-uri.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd-uri.h5.xml
diff --git a/tools/testfiles/tempty-dtd.h5.xml b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
index 213d582..213d582 100644
--- a/tools/testfiles/tempty-dtd.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-dtd.h5.xml
diff --git a/tools/testfiles/tempty-nons-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
index 219dbfd..219dbfd 100644
--- a/tools/testfiles/tempty-nons-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons-2.h5.xml
diff --git a/tools/testfiles/tempty-nons-uri.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml
index 032de41..032de41 100644
--- a/tools/testfiles/tempty-nons-uri.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons-uri.h5.xml
diff --git a/tools/testfiles/tempty-nons.h5.xml b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
index 219dbfd..219dbfd 100644
--- a/tools/testfiles/tempty-nons.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-nons.h5.xml
diff --git a/tools/testfiles/tempty-ns-2.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
index 00040d2..00040d2 100644
--- a/tools/testfiles/tempty-ns-2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns-2.h5.xml
diff --git a/tools/testfiles/tempty-ns.h5.xml b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
index 00040d2..00040d2 100644
--- a/tools/testfiles/tempty-ns.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty-ns.h5.xml
diff --git a/tools/testfiles/tempty.h5.xml b/tools/test/h5dump/expected/xml/tempty.h5.xml
index 41eef37..41eef37 100644
--- a/tools/testfiles/tempty.h5.xml
+++ b/tools/test/h5dump/expected/xml/tempty.h5.xml
diff --git a/tools/testfiles/tenum.h5.xml b/tools/test/h5dump/expected/xml/tenum.h5.xml
index 33a6e62..33a6e62 100644
--- a/tools/testfiles/tenum.h5.xml
+++ b/tools/test/h5dump/expected/xml/tenum.h5.xml
diff --git a/tools/testfiles/test35.nc.xml b/tools/test/h5dump/expected/xml/test35.nc.xml
index a38ed8a..a38ed8a 100644
--- a/tools/testfiles/test35.nc.xml
+++ b/tools/test/h5dump/expected/xml/test35.nc.xml
diff --git a/tools/testfiles/textlink.h5.xml b/tools/test/h5dump/expected/xml/textlink.h5.xml
index 9097f79..9097f79 100644
--- a/tools/testfiles/textlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/textlink.h5.xml
diff --git a/tools/testfiles/tfpformat.h5.xml b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
index 6445979..6445979 100644
--- a/tools/testfiles/tfpformat.h5.xml
+++ b/tools/test/h5dump/expected/xml/tfpformat.h5.xml
diff --git a/tools/testfiles/tgroup.h5.xml b/tools/test/h5dump/expected/xml/tgroup.h5.xml
index 1eaf662..1eaf662 100644
--- a/tools/testfiles/tgroup.h5.xml
+++ b/tools/test/h5dump/expected/xml/tgroup.h5.xml
diff --git a/tools/testfiles/thlink.h5.xml b/tools/test/h5dump/expected/xml/thlink.h5.xml
index d0fa36e..d0fa36e 100644
--- a/tools/testfiles/thlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/thlink.h5.xml
diff --git a/tools/testfiles/tloop.h5.xml b/tools/test/h5dump/expected/xml/tloop.h5.xml
index 8cc6880..8cc6880 100644
--- a/tools/testfiles/tloop.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop.h5.xml
diff --git a/tools/testfiles/tloop2.h5.xml b/tools/test/h5dump/expected/xml/tloop2.h5.xml
index e2df102..e2df102 100644
--- a/tools/testfiles/tloop2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tloop2.h5.xml
diff --git a/tools/testfiles/tmany.h5.xml b/tools/test/h5dump/expected/xml/tmany.h5.xml
index 842f1f5..842f1f5 100644
--- a/tools/testfiles/tmany.h5.xml
+++ b/tools/test/h5dump/expected/xml/tmany.h5.xml
diff --git a/tools/testfiles/tname-amp.h5.xml b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
index e40c38b..e40c38b 100644
--- a/tools/testfiles/tname-amp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-amp.h5.xml
diff --git a/tools/testfiles/tname-apos.h5.xml b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
index 2acd0bf..2acd0bf 100644
--- a/tools/testfiles/tname-apos.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-apos.h5.xml
diff --git a/tools/testfiles/tname-gt.h5.xml b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
index b44949e..b44949e 100644
--- a/tools/testfiles/tname-gt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-gt.h5.xml
diff --git a/tools/testfiles/tname-lt.h5.xml b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
index b148275..b148275 100644
--- a/tools/testfiles/tname-lt.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-lt.h5.xml
diff --git a/tools/testfiles/tname-quot.h5.xml b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
index 83fd347..83fd347 100644
--- a/tools/testfiles/tname-quot.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-quot.h5.xml
diff --git a/tools/testfiles/tname-sp.h5.xml b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
index 07b80e4..07b80e4 100644
--- a/tools/testfiles/tname-sp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tname-sp.h5.xml
diff --git a/tools/testfiles/tnamed_dtype_attr.h5.xml b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
index c0e30b4..c0e30b4 100644
--- a/tools/testfiles/tnamed_dtype_attr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnamed_dtype_attr.h5.xml
diff --git a/tools/testfiles/tnestedcomp.h5.xml b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
index a5ca214..a5ca214 100644
--- a/tools/testfiles/tnestedcomp.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnestedcomp.h5.xml
diff --git a/tools/testfiles/tnodata.h5.xml b/tools/test/h5dump/expected/xml/tnodata.h5.xml
index b60c4dc..b60c4dc 100644
--- a/tools/testfiles/tnodata.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnodata.h5.xml
diff --git a/tools/testfiles/tnullspace.h5.xml b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
index b1c1974..b1c1974 100644
--- a/tools/testfiles/tnullspace.h5.xml
+++ b/tools/test/h5dump/expected/xml/tnullspace.h5.xml
diff --git a/tools/testfiles/tobjref.h5.xml b/tools/test/h5dump/expected/xml/tobjref.h5.xml
index 71eb6ed..71eb6ed 100644
--- a/tools/testfiles/tobjref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tobjref.h5.xml
diff --git a/tools/testfiles/topaque.h5.xml b/tools/test/h5dump/expected/xml/topaque.h5.xml
index c0699f0..c0699f0 100644
--- a/tools/testfiles/topaque.h5.xml
+++ b/tools/test/h5dump/expected/xml/topaque.h5.xml
diff --git a/tools/testfiles/torderattr1.h5.xml b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
index e3e56eb..e3e56eb 100644
--- a/tools/testfiles/torderattr1.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr1.h5.xml
diff --git a/tools/testfiles/torderattr2.h5.xml b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
index 1163afb..1163afb 100644
--- a/tools/testfiles/torderattr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr2.h5.xml
diff --git a/tools/testfiles/torderattr3.h5.xml b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
index 73ef223..73ef223 100644
--- a/tools/testfiles/torderattr3.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr3.h5.xml
diff --git a/tools/testfiles/torderattr4.h5.xml b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
index 1cc78fd..1cc78fd 100644
--- a/tools/testfiles/torderattr4.h5.xml
+++ b/tools/test/h5dump/expected/xml/torderattr4.h5.xml
diff --git a/tools/testfiles/tref-escapes-at.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
index 40c6b89..40c6b89 100644
--- a/tools/testfiles/tref-escapes-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes-at.h5.xml
diff --git a/tools/testfiles/tref-escapes.h5.xml b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
index 4ebac85..4ebac85 100644
--- a/tools/testfiles/tref-escapes.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref-escapes.h5.xml
diff --git a/tools/testfiles/tref.h5.xml b/tools/test/h5dump/expected/xml/tref.h5.xml
index 4c3fb8f..4c3fb8f 100644
--- a/tools/testfiles/tref.h5.xml
+++ b/tools/test/h5dump/expected/xml/tref.h5.xml
diff --git a/tools/testfiles/tsaf.h5.xml b/tools/test/h5dump/expected/xml/tsaf.h5.xml
index d646791..d646791 100644
--- a/tools/testfiles/tsaf.h5.xml
+++ b/tools/test/h5dump/expected/xml/tsaf.h5.xml
diff --git a/tools/testfiles/tslink.h5.xml b/tools/test/h5dump/expected/xml/tslink.h5.xml
index 493decd..493decd 100644
--- a/tools/testfiles/tslink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tslink.h5.xml
diff --git a/tools/testfiles/tstr.h5.xml b/tools/test/h5dump/expected/xml/tstr.h5.xml
index 32d63af..32d63af 100644
--- a/tools/testfiles/tstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr.h5.xml
diff --git a/tools/testfiles/tstr2.h5.xml b/tools/test/h5dump/expected/xml/tstr2.h5.xml
index 1203417..1203417 100644
--- a/tools/testfiles/tstr2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstr2.h5.xml
diff --git a/tools/testfiles/tstring-at.h5.xml b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
index a8281f4..a8281f4 100644
--- a/tools/testfiles/tstring-at.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring-at.h5.xml
diff --git a/tools/testfiles/tstring.h5.xml b/tools/test/h5dump/expected/xml/tstring.h5.xml
index d68db77..d68db77 100644
--- a/tools/testfiles/tstring.h5.xml
+++ b/tools/test/h5dump/expected/xml/tstring.h5.xml
diff --git a/tools/testfiles/tudlink.h5.xml b/tools/test/h5dump/expected/xml/tudlink.h5.xml
index 137c47b..137c47b 100644
--- a/tools/testfiles/tudlink.h5.xml
+++ b/tools/test/h5dump/expected/xml/tudlink.h5.xml
diff --git a/tools/testfiles/tvldtypes1.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
index b1aa5a6..b1aa5a6 100644
--- a/tools/testfiles/tvldtypes1.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes1.h5.xml
diff --git a/tools/testfiles/tvldtypes2.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
index 662ad3a..662ad3a 100644
--- a/tools/testfiles/tvldtypes2.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes2.h5.xml
diff --git a/tools/testfiles/tvldtypes3.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
index 56d81a1..56d81a1 100644
--- a/tools/testfiles/tvldtypes3.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes3.h5.xml
diff --git a/tools/testfiles/tvldtypes4.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
index 8e31bd9..8e31bd9 100644
--- a/tools/testfiles/tvldtypes4.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes4.h5.xml
diff --git a/tools/testfiles/tvldtypes5.h5.xml b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
index be68e09..be68e09 100644
--- a/tools/testfiles/tvldtypes5.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvldtypes5.h5.xml
diff --git a/tools/testfiles/tvlstr.h5.xml b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
index d945964..d945964 100644
--- a/tools/testfiles/tvlstr.h5.xml
+++ b/tools/test/h5dump/expected/xml/tvlstr.h5.xml
diff --git a/tools/testfiles/zerodim.ddl b/tools/test/h5dump/expected/zerodim.ddl
index 484e907..484e907 100644
--- a/tools/testfiles/zerodim.ddl
+++ b/tools/test/h5dump/expected/zerodim.ddl
diff --git a/tools/testfiles/tall-6.exp b/tools/test/h5dump/exportfiles/tall-6.exp
index 8580cd6..8580cd6 100644
--- a/tools/testfiles/tall-6.exp
+++ b/tools/test/h5dump/exportfiles/tall-6.exp
diff --git a/tools/testfiles/tbinregR.exp b/tools/test/h5dump/exportfiles/tbinregR.exp
index 3bf7ddf..3bf7ddf 100644
--- a/tools/testfiles/tbinregR.exp
+++ b/tools/test/h5dump/exportfiles/tbinregR.exp
diff --git a/tools/testfiles/tnoddlfile.exp b/tools/test/h5dump/exportfiles/tnoddlfile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/tnoddlfile.exp
+++ b/tools/test/h5dump/exportfiles/tnoddlfile.exp
diff --git a/tools/testfiles/trawdatafile.exp b/tools/test/h5dump/exportfiles/trawdatafile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/trawdatafile.exp
+++ b/tools/test/h5dump/exportfiles/trawdatafile.exp
diff --git a/tools/testfiles/trawssetfile.exp b/tools/test/h5dump/exportfiles/trawssetfile.exp
index 2de8392..2de8392 100644
--- a/tools/testfiles/trawssetfile.exp
+++ b/tools/test/h5dump/exportfiles/trawssetfile.exp
diff --git a/tools/testfiles/tstr2bin2.exp b/tools/test/h5dump/exportfiles/tstr2bin2.exp
index 5d4c544..5d4c544 100644
--- a/tools/testfiles/tstr2bin2.exp
+++ b/tools/test/h5dump/exportfiles/tstr2bin2.exp
diff --git a/tools/testfiles/tstr2bin6.exp b/tools/test/h5dump/exportfiles/tstr2bin6.exp
index 5c6c22a..5c6c22a 100644
--- a/tools/testfiles/tstr2bin6.exp
+++ b/tools/test/h5dump/exportfiles/tstr2bin6.exp
diff --git a/tools/testfiles/twithddl.exp b/tools/test/h5dump/exportfiles/twithddl.exp
index f99d906..f99d906 100644
--- a/tools/testfiles/twithddl.exp
+++ b/tools/test/h5dump/exportfiles/twithddl.exp
diff --git a/tools/testfiles/twithddlfile.exp b/tools/test/h5dump/exportfiles/twithddlfile.exp
index dc19888..dc19888 100644
--- a/tools/testfiles/twithddlfile.exp
+++ b/tools/test/h5dump/exportfiles/twithddlfile.exp
diff --git a/tools/test/h5dump/h5dump_plugin.sh.in b/tools/test/h5dump/h5dump_plugin.sh.in
index d9b77ee..d080c1d 100644
--- a/tools/test/h5dump/h5dump_plugin.sh.in
+++ b/tools/test/h5dump/h5dump_plugin.sh.in
@@ -45,8 +45,8 @@ AWK='awk'
 SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -62,7 +62,7 @@ test -d $TESTDIR || mkdir $TESTDIR
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
 $SRC_H5DUMP_TESTFILES/tudfilter.h5
-$SRC_H5DUMP_TESTFILES/tudfilter.ddl
+$SRC_H5DUMP_OUTFILES/tudfilter.ddl
 "
 
 # RUNSERIAL is used. Check if it can return exit code from executable correctly.
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index e77eaf2..aed3eda 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -588,7 +588,7 @@ gent_attribute(void)
     dims[0] = 24;
     space   = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(root, "/attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(buf, sizeof(buf), "attribute of root group");
+    snprintf(buf, sizeof(buf), "attribute of root group");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -963,7 +963,7 @@ gent_udlink(void)
     /* This ud link will dangle, but that's okay */
     fid = H5Fcreate(FILE54, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     H5Lcreate_ud(fid, "udlink1", (H5L_type_t)MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
-    HDstrcpy(buf, "foo");
+    strcpy(buf, "foo");
     H5Lcreate_ud(fid, "udlink2", (H5L_type_t)MY_LINKCLASS, buf, 4, H5P_DEFAULT, H5P_DEFAULT);
 
     H5Fclose(fid);
@@ -1386,7 +1386,7 @@ gent_all(void)
     dims[0] = 10;
     space   = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(buf, sizeof(buf), "abcdefghi");
+    snprintf(buf, sizeof(buf), "abcdefghi");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1422,7 +1422,7 @@ gent_all(void)
     dims[0] = 27;
     space   = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(buf, sizeof(buf), "1st attribute of dset1.1.1");
+    snprintf(buf, sizeof(buf), "1st attribute of dset1.1.1");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1430,7 +1430,7 @@ gent_all(void)
     dims[0] = 27;
     space   = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1");
+    snprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1");
     H5Awrite(attr, H5T_NATIVE_SCHAR, buf);
     H5Sclose(space);
     H5Aclose(attr);
@@ -1629,7 +1629,7 @@ gent_many(void)
     dims[0] = 10;
     space2  = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space2, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(buf, sizeof(buf), "abcdefghi");
+    snprintf(buf, sizeof(buf), "abcdefghi");
     H5Awrite(attr, H5T_NATIVE_CHAR, buf);
     H5Sclose(space2);
     H5Aclose(attr);
@@ -1894,7 +1894,7 @@ gent_str(void)
                 for (l = 0; l < 10; l++)
                     comp1[i][j].a[k][l] = (l + j + k) * (l + j + k);
             for (k = 0; k < 12; k++)
-                HDstrcpy(comp1[i][j].s[k], "abcdefgh12345678abcdefgh12345678");
+                strcpy(comp1[i][j].s[k], "abcdefgh12345678abcdefgh12345678");
         }
 
     dataset = H5Dcreate2(fid, "/comp1", f_type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -1967,9 +1967,9 @@ gent_str2(void)
     dims[0] = 3;
     space2  = H5Screate_simple(1, dims, NULL);
     attr    = H5Acreate2(dataset, "attr1", fxdlenstr2, space2, H5P_DEFAULT, H5P_DEFAULT);
-    HDsnprintf(&(buf2[0 * LENSTR2]), LENSTR2, "0123456789");
-    HDsnprintf(&(buf2[1 * LENSTR2]), LENSTR2, "abcdefghij");
-    HDsnprintf(&(buf2[2 * LENSTR2]), LENSTR2, "ABCDEFGHIJ");
+    snprintf(&(buf2[0 * LENSTR2]), LENSTR2, "0123456789");
+    snprintf(&(buf2[1 * LENSTR2]), LENSTR2, "abcdefghij");
+    snprintf(&(buf2[2 * LENSTR2]), LENSTR2, "ABCDEFGHIJ");
     H5Awrite(attr, fxdlenstr2, buf2);
     H5Sclose(space2);
     H5Tclose(fxdlenstr2);
@@ -1981,8 +1981,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLTERM of", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLTERM of", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -1994,8 +1994,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLTERM of string array", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLTERM of string array", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -2013,8 +2013,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLPAD of", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLPAD of", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -2026,8 +2026,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLPAD of string array", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_NULLPAD of string array", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -2045,8 +2045,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_SPACEPAD of", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_SPACEPAD of", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -2058,8 +2058,8 @@ gent_str2(void)
 
     for (i = 0; (hsize_t)i < sdim; i++) {
         start[0] = (hsize_t)i;
-        HDsnprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_SPACEPAD of string array", i);
-        H5Tset_size(memtype, HDstrlen(buf) + 1);
+        snprintf(buf, sizeof(buf), "This is row %1d of type H5T_STR_SPACEPAD of string array", i);
+        H5Tset_size(memtype, strlen(buf) + 1);
         H5Sselect_hyperslab(hyper_space, H5S_SELECT_SET, start, stride, count, block);
         H5Dwrite(dataset, memtype, mem_space, hyper_space, H5P_DEFAULT, buf);
     }
@@ -3790,7 +3790,7 @@ gent_split_file(void)
     root = H5Gopen2(fid, "/", H5P_DEFAULT);
 
     atype = H5Tcopy(H5T_C_S1);
-    H5Tset_size(atype, HDstrlen(meta) + 1);
+    H5Tset_size(atype, strlen(meta) + 1);
     H5Tset_strpad(atype, H5T_STR_NULLTERM);
 
     dims[0] = 1;
@@ -3879,19 +3879,19 @@ gent_multi(void)
     memset(memb_name, 0, sizeof memb_name);
     memset(memb_addr, 0, sizeof memb_addr);
 
-    assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
+    assert(strlen(multi_letters) == H5FD_MEM_NTYPES);
 
     for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) {
         memb_fapl[mt] = H5P_DEFAULT;
         memb_map[mt]  = mt;
-        HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
+        sprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]);
         memb_name[mt] = sv[mt];
         /*printf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/
         memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10);
     }
     memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER;
 
-    H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE);
+    H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, false);
 
     fid = H5Fcreate(FILE36, H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
 
@@ -3928,7 +3928,7 @@ gent_large_objname(void)
     group = H5Gcreate2(fid, "this_is_a_large_group_name", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
     for (i = 0; i < 50; ++i) {
-        HDsnprintf(grp_name, sizeof(grp_name), "this_is_a_large_group_name%d", i);
+        snprintf(grp_name, sizeof(grp_name), "this_is_a_large_group_name%d", i);
         group2 = H5Gcreate2(group, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Gclose(group2);
     }
@@ -3999,7 +3999,7 @@ gent_char(void)
     hid_t       sid1;    /* Dataspace ID     */
     hsize_t     dims1[1];
 
-    dims1[0] = HDstrlen(wdata);
+    dims1[0] = strlen(wdata);
 
     /* Create file */
     fid1 = H5Fcreate(FILE39, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -7133,7 +7133,7 @@ gent_fs_strategy_threshold(void)
     fcpl = H5Pcreate(H5P_FILE_CREATE);
 
     /* Set file space information */
-    H5Pset_file_space_strategy(fcpl, STRATEGY, TRUE, (hsize_t)THRESHOLD10);
+    H5Pset_file_space_strategy(fcpl, STRATEGY, true, (hsize_t)THRESHOLD10);
     H5Pset_file_space_page_size(fcpl, (hsize_t)FSPACE_PAGE_SIZE);
 
     /* Create the file with the specified strategy and threshold */
@@ -10877,10 +10877,10 @@ gent_compound_complex2(void)
                     /* Set up first nested compound */
                     buf[i].d.nested_a = (double)i;
 
-                    HDstrcpy(buf[i].d.nested_string, "This is a test string.");
+                    strcpy(buf[i].d.nested_string, "This is a test string.");
 
                     for (j = 0; j < 4; j++)
-                        HDstrcpy(buf[i].d.nested_string_array[j], "String test");
+                        strcpy(buf[i].d.nested_string_array[j], "String test");
 
                     /* Set up multiple nested compound */
                     buf[i].e.a = (float)i;
@@ -10892,9 +10892,9 @@ gent_compound_complex2(void)
                         buf[i].e.b.multiple_nested_d[j] = (long)(j - i * 10);
                     }
 
-                    HDstrcpy(buf[i].e.c.further_nested_string, "1234567890");
+                    strcpy(buf[i].e.c.further_nested_string, "1234567890");
                     for (j = 0; j < 4; j++)
-                        HDstrcpy(buf[i].e.c.further_nested_string_array[j], "STRING ARRAY");
+                        strcpy(buf[i].e.c.further_nested_string_array[j], "STRING ARRAY");
 
                     for (j = 0; j < 10; j++) {
                         buf[i].e.c.deep_nest.deep_nested_short[j]  = (short)(j + i * 10);
@@ -11346,16 +11346,16 @@ onion_filepaths_init(const char *basename)
     if (NULL == (paths = calloc(1, sizeof(struct onion_filepaths))))
         goto error;
 
-    if (NULL == (paths->canon = HDstrdup(basename)))
+    if (NULL == (paths->canon = strdup(basename)))
         goto error;
 
     if (NULL == (paths->onion = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
         goto error;
-    HDsnprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
+    snprintf(paths->onion, ONION_TEST_FIXNAME_SIZE, "%s.onion", paths->canon);
 
     if (NULL == (paths->recovery = malloc(sizeof(char) * ONION_TEST_FIXNAME_SIZE)))
         goto error;
-    HDsnprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
+    snprintf(paths->recovery, ONION_TEST_FIXNAME_SIZE, "%s.onion.recovery", paths->canon);
 
     return paths;
 
diff --git a/tools/testfiles/charsets.h5 b/tools/test/h5dump/testfiles/charsets.h5
index 2b9e735..2b9e735 100644
--- a/tools/testfiles/charsets.h5
+++ b/tools/test/h5dump/testfiles/charsets.h5
diff --git a/tools/testfiles/err_attr_dspace.h5 b/tools/test/h5dump/testfiles/err_attr_dspace.h5
index 969c328..969c328 100644
--- a/tools/testfiles/err_attr_dspace.h5
+++ b/tools/test/h5dump/testfiles/err_attr_dspace.h5
diff --git a/tools/testfiles/file_space.h5 b/tools/test/h5dump/testfiles/file_space.h5
index d9e2890..d9e2890 100644
--- a/tools/testfiles/file_space.h5
+++ b/tools/test/h5dump/testfiles/file_space.h5
diff --git a/tools/testfiles/filter_fail.h5 b/tools/test/h5dump/testfiles/filter_fail.h5
index c140a69..c140a69 100644
--- a/tools/testfiles/filter_fail.h5
+++ b/tools/test/h5dump/testfiles/filter_fail.h5
diff --git a/tools/testfiles/packedbits.h5 b/tools/test/h5dump/testfiles/packedbits.h5
index cbb73ab..cbb73ab 100644
--- a/tools/testfiles/packedbits.h5
+++ b/tools/test/h5dump/testfiles/packedbits.h5
diff --git a/tools/testfiles/t128bit_float.h5 b/tools/test/h5dump/testfiles/t128bit_float.h5
index 134d510..134d510 100644
--- a/tools/testfiles/t128bit_float.h5
+++ b/tools/test/h5dump/testfiles/t128bit_float.h5
diff --git a/tools/testfiles/tCVE-2021-37501_attr_decode.h5 b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5
index 331b05b..331b05b 100644
--- a/tools/testfiles/tCVE-2021-37501_attr_decode.h5
+++ b/tools/test/h5dump/testfiles/tCVE-2021-37501_attr_decode.h5
diff --git a/tools/testfiles/tCVE_2018_11206_fill_new.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5
index 643591c..643591c 100644
--- a/tools/testfiles/tCVE_2018_11206_fill_new.h5
+++ b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_new.h5
diff --git a/tools/testfiles/tCVE_2018_11206_fill_old.h5 b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5
index 7f5b41a..7f5b41a 100644
--- a/tools/testfiles/tCVE_2018_11206_fill_old.h5
+++ b/tools/test/h5dump/testfiles/tCVE_2018_11206_fill_old.h5
diff --git a/tools/testfiles/taindices.h5 b/tools/test/h5dump/testfiles/taindices.h5
index b482a21..b482a21 100644
--- a/tools/testfiles/taindices.h5
+++ b/tools/test/h5dump/testfiles/taindices.h5
diff --git a/tools/testfiles/tall.h5 b/tools/test/h5dump/testfiles/tall.h5
index 918aeee..918aeee 100644
--- a/tools/testfiles/tall.h5
+++ b/tools/test/h5dump/testfiles/tall.h5
diff --git a/tools/testfiles/tarray1.h5 b/tools/test/h5dump/testfiles/tarray1.h5
index 90371f2..90371f2 100644
--- a/tools/testfiles/tarray1.h5
+++ b/tools/test/h5dump/testfiles/tarray1.h5
diff --git a/tools/testfiles/tarray1_big.h5 b/tools/test/h5dump/testfiles/tarray1_big.h5
index 6862dd5..6862dd5 100644
--- a/tools/testfiles/tarray1_big.h5
+++ b/tools/test/h5dump/testfiles/tarray1_big.h5
diff --git a/tools/testfiles/tarray2.h5 b/tools/test/h5dump/testfiles/tarray2.h5
index e2e53e8..e2e53e8 100644
--- a/tools/testfiles/tarray2.h5
+++ b/tools/test/h5dump/testfiles/tarray2.h5
diff --git a/tools/testfiles/tarray3.h5 b/tools/test/h5dump/testfiles/tarray3.h5
index 580d846..580d846 100644
--- a/tools/testfiles/tarray3.h5
+++ b/tools/test/h5dump/testfiles/tarray3.h5
diff --git a/tools/testfiles/tarray4.h5 b/tools/test/h5dump/testfiles/tarray4.h5
index b34efb8..b34efb8 100644
--- a/tools/testfiles/tarray4.h5
+++ b/tools/test/h5dump/testfiles/tarray4.h5
diff --git a/tools/testfiles/tarray5.h5 b/tools/test/h5dump/testfiles/tarray5.h5
index 55ebf46..55ebf46 100644
--- a/tools/testfiles/tarray5.h5
+++ b/tools/test/h5dump/testfiles/tarray5.h5
diff --git a/tools/testfiles/tarray6.h5 b/tools/test/h5dump/testfiles/tarray6.h5
index 7eb078c..7eb078c 100644
--- a/tools/testfiles/tarray6.h5
+++ b/tools/test/h5dump/testfiles/tarray6.h5
diff --git a/tools/testfiles/tarray7.h5 b/tools/test/h5dump/testfiles/tarray7.h5
index 74089ea..74089ea 100644
--- a/tools/testfiles/tarray7.h5
+++ b/tools/test/h5dump/testfiles/tarray7.h5
diff --git a/tools/testfiles/tarray8.h5 b/tools/test/h5dump/testfiles/tarray8.h5
index 88022c3..88022c3 100644
--- a/tools/testfiles/tarray8.h5
+++ b/tools/test/h5dump/testfiles/tarray8.h5
diff --git a/tools/testfiles/tattr.h5 b/tools/test/h5dump/testfiles/tattr.h5
index d61def5..d61def5 100644
--- a/tools/testfiles/tattr.h5
+++ b/tools/test/h5dump/testfiles/tattr.h5
diff --git a/tools/testfiles/tattr2.h5 b/tools/test/h5dump/testfiles/tattr2.h5
index c40f3f7..c40f3f7 100644
--- a/tools/testfiles/tattr2.h5
+++ b/tools/test/h5dump/testfiles/tattr2.h5
diff --git a/tools/testfiles/tattr4_be.h5 b/tools/test/h5dump/testfiles/tattr4_be.h5
index a464ac6..a464ac6 100644
--- a/tools/testfiles/tattr4_be.h5
+++ b/tools/test/h5dump/testfiles/tattr4_be.h5
diff --git a/tools/testfiles/tattrintsize.h5 b/tools/test/h5dump/testfiles/tattrintsize.h5
index 04d6f4c..04d6f4c 100644
--- a/tools/testfiles/tattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tattrintsize.h5
diff --git a/tools/testfiles/tattrreg.h5 b/tools/test/h5dump/testfiles/tattrreg.h5
index 193b3e1..193b3e1 100644
--- a/tools/testfiles/tattrreg.h5
+++ b/tools/test/h5dump/testfiles/tattrreg.h5
diff --git a/tools/testfiles/tbigdims.h5 b/tools/test/h5dump/testfiles/tbigdims.h5
index c54c2c3..c54c2c3 100644
--- a/tools/testfiles/tbigdims.h5
+++ b/tools/test/h5dump/testfiles/tbigdims.h5
diff --git a/tools/testfiles/tbinary.h5 b/tools/test/h5dump/testfiles/tbinary.h5
index c85aa51..c85aa51 100644
--- a/tools/testfiles/tbinary.h5
+++ b/tools/test/h5dump/testfiles/tbinary.h5
diff --git a/tools/testfiles/tbitnopaque.h5 b/tools/test/h5dump/testfiles/tbitnopaque.h5
index 089a86d..089a86d 100644
--- a/tools/testfiles/tbitnopaque.h5
+++ b/tools/test/h5dump/testfiles/tbitnopaque.h5
diff --git a/tools/testfiles/tchar.h5 b/tools/test/h5dump/testfiles/tchar.h5
index 4d23ea9..4d23ea9 100644
--- a/tools/testfiles/tchar.h5
+++ b/tools/test/h5dump/testfiles/tchar.h5
diff --git a/tools/testfiles/tcmpdattrintsize.h5 b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5
index 40d4887..40d4887 100644
--- a/tools/testfiles/tcmpdattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tcmpdattrintsize.h5
diff --git a/tools/testfiles/tcmpdintarray.h5 b/tools/test/h5dump/testfiles/tcmpdintarray.h5
index 17798fe..17798fe 100644
--- a/tools/testfiles/tcmpdintarray.h5
+++ b/tools/test/h5dump/testfiles/tcmpdintarray.h5
diff --git a/tools/testfiles/tcmpdints.h5 b/tools/test/h5dump/testfiles/tcmpdints.h5
index d4af1c4..d4af1c4 100644
--- a/tools/testfiles/tcmpdints.h5
+++ b/tools/test/h5dump/testfiles/tcmpdints.h5
diff --git a/tools/testfiles/tcmpdintsize.h5 b/tools/test/h5dump/testfiles/tcmpdintsize.h5
index 0e7bef5..0e7bef5 100644
--- a/tools/testfiles/tcmpdintsize.h5
+++ b/tools/test/h5dump/testfiles/tcmpdintsize.h5
diff --git a/tools/testfiles/tcompound.h5 b/tools/test/h5dump/testfiles/tcompound.h5
index d1ec650..d1ec650 100644
--- a/tools/testfiles/tcompound.h5
+++ b/tools/test/h5dump/testfiles/tcompound.h5
diff --git a/tools/testfiles/tcompound_complex.h5 b/tools/test/h5dump/testfiles/tcompound_complex.h5
index 5c6274f..5c6274f 100644
--- a/tools/testfiles/tcompound_complex.h5
+++ b/tools/test/h5dump/testfiles/tcompound_complex.h5
diff --git a/tools/testfiles/tcompound_complex2.h5 b/tools/test/h5dump/testfiles/tcompound_complex2.h5
index eee6073..eee6073 100644
--- a/tools/testfiles/tcompound_complex2.h5
+++ b/tools/test/h5dump/testfiles/tcompound_complex2.h5
diff --git a/tools/testfiles/tdatareg.h5 b/tools/test/h5dump/testfiles/tdatareg.h5
index 62a889f..62a889f 100644
--- a/tools/testfiles/tdatareg.h5
+++ b/tools/test/h5dump/testfiles/tdatareg.h5
diff --git a/tools/testfiles/tdset.h5 b/tools/test/h5dump/testfiles/tdset.h5
index 71dcb91..71dcb91 100644
--- a/tools/testfiles/tdset.h5
+++ b/tools/test/h5dump/testfiles/tdset.h5
diff --git a/tools/testfiles/tempty.h5 b/tools/test/h5dump/testfiles/tempty.h5
index d7d903f..d7d903f 100644
--- a/tools/testfiles/tempty.h5
+++ b/tools/test/h5dump/testfiles/tempty.h5
diff --git a/tools/testfiles/textlink.h5 b/tools/test/h5dump/testfiles/textlink.h5
index a5ec3e6..a5ec3e6 100644
--- a/tools/testfiles/textlink.h5
+++ b/tools/test/h5dump/testfiles/textlink.h5
diff --git a/tools/testfiles/textlinkfar.h5 b/tools/test/h5dump/testfiles/textlinkfar.h5
index 6fb3130..6fb3130 100644
--- a/tools/testfiles/textlinkfar.h5
+++ b/tools/test/h5dump/testfiles/textlinkfar.h5
diff --git a/tools/testfiles/textlinksrc.h5 b/tools/test/h5dump/testfiles/textlinksrc.h5
index 4db1cc4..4db1cc4 100644
--- a/tools/testfiles/textlinksrc.h5
+++ b/tools/test/h5dump/testfiles/textlinksrc.h5
diff --git a/tools/testfiles/textlinktar.h5 b/tools/test/h5dump/testfiles/textlinktar.h5
index fe33e10..fe33e10 100644
--- a/tools/testfiles/textlinktar.h5
+++ b/tools/test/h5dump/testfiles/textlinktar.h5
diff --git a/tools/testfiles/tfamily00000.h5 b/tools/test/h5dump/testfiles/tfamily00000.h5
index a130bfd..a130bfd 100644
--- a/tools/testfiles/tfamily00000.h5
+++ b/tools/test/h5dump/testfiles/tfamily00000.h5
diff --git a/tools/testfiles/tfamily00001.h5 b/tools/test/h5dump/testfiles/tfamily00001.h5
index 83119d8..83119d8 100644
--- a/tools/testfiles/tfamily00001.h5
+++ b/tools/test/h5dump/testfiles/tfamily00001.h5
diff --git a/tools/testfiles/tfamily00002.h5 b/tools/test/h5dump/testfiles/tfamily00002.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00002.h5
+++ b/tools/test/h5dump/testfiles/tfamily00002.h5
diff --git a/tools/testfiles/tfamily00003.h5 b/tools/test/h5dump/testfiles/tfamily00003.h5
index 2917a8a..2917a8a 100644
--- a/tools/testfiles/tfamily00003.h5
+++ b/tools/test/h5dump/testfiles/tfamily00003.h5
diff --git a/tools/testfiles/tfamily00004.h5 b/tools/test/h5dump/testfiles/tfamily00004.h5
index a583474..a583474 100644
--- a/tools/testfiles/tfamily00004.h5
+++ b/tools/test/h5dump/testfiles/tfamily00004.h5
diff --git a/tools/testfiles/tfamily00005.h5 b/tools/test/h5dump/testfiles/tfamily00005.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00005.h5
+++ b/tools/test/h5dump/testfiles/tfamily00005.h5
diff --git a/tools/testfiles/tfamily00006.h5 b/tools/test/h5dump/testfiles/tfamily00006.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00006.h5
+++ b/tools/test/h5dump/testfiles/tfamily00006.h5
diff --git a/tools/testfiles/tfamily00007.h5 b/tools/test/h5dump/testfiles/tfamily00007.h5
index 65f57c2..65f57c2 100644
--- a/tools/testfiles/tfamily00007.h5
+++ b/tools/test/h5dump/testfiles/tfamily00007.h5
diff --git a/tools/testfiles/tfamily00008.h5 b/tools/test/h5dump/testfiles/tfamily00008.h5
index fb35a9c..fb35a9c 100644
--- a/tools/testfiles/tfamily00008.h5
+++ b/tools/test/h5dump/testfiles/tfamily00008.h5
diff --git a/tools/testfiles/tfamily00009.h5 b/tools/test/h5dump/testfiles/tfamily00009.h5
index fd2920a..fd2920a 100644
--- a/tools/testfiles/tfamily00009.h5
+++ b/tools/test/h5dump/testfiles/tfamily00009.h5
diff --git a/tools/testfiles/tfamily00010.h5 b/tools/test/h5dump/testfiles/tfamily00010.h5
index 3bf308f..3bf308f 100644
--- a/tools/testfiles/tfamily00010.h5
+++ b/tools/test/h5dump/testfiles/tfamily00010.h5
diff --git a/tools/testfiles/tfcontents1.h5 b/tools/test/h5dump/testfiles/tfcontents1.h5
index c16ee4d..c16ee4d 100644
--- a/tools/testfiles/tfcontents1.h5
+++ b/tools/test/h5dump/testfiles/tfcontents1.h5
diff --git a/tools/testfiles/tfcontents2.h5 b/tools/test/h5dump/testfiles/tfcontents2.h5
index 1df0779..1df0779 100644
--- a/tools/testfiles/tfcontents2.h5
+++ b/tools/test/h5dump/testfiles/tfcontents2.h5
diff --git a/tools/testfiles/tfilters.h5 b/tools/test/h5dump/testfiles/tfilters.h5
index 7c33e55..7c33e55 100644
--- a/tools/testfiles/tfilters.h5
+++ b/tools/test/h5dump/testfiles/tfilters.h5
diff --git a/tools/testfiles/tfloatsattrs.h5 b/tools/test/h5dump/testfiles/tfloatsattrs.h5
index 9e73542..9e73542 100644
--- a/tools/testfiles/tfloatsattrs.h5
+++ b/tools/test/h5dump/testfiles/tfloatsattrs.h5
diff --git a/tools/testfiles/tfpformat.h5 b/tools/test/h5dump/testfiles/tfpformat.h5
index 5f78930..5f78930 100644
--- a/tools/testfiles/tfpformat.h5
+++ b/tools/test/h5dump/testfiles/tfpformat.h5
diff --git a/tools/testfiles/tfvalues.h5 b/tools/test/h5dump/testfiles/tfvalues.h5
index a6af958..a6af958 100644
--- a/tools/testfiles/tfvalues.h5
+++ b/tools/test/h5dump/testfiles/tfvalues.h5
diff --git a/tools/testfiles/tgroup.h5 b/tools/test/h5dump/testfiles/tgroup.h5
index 565fb67..565fb67 100644
--- a/tools/testfiles/tgroup.h5
+++ b/tools/test/h5dump/testfiles/tgroup.h5
diff --git a/tools/testfiles/tgrp_comments.h5 b/tools/test/h5dump/testfiles/tgrp_comments.h5
index ddd2eec..ddd2eec 100644
--- a/tools/testfiles/tgrp_comments.h5
+++ b/tools/test/h5dump/testfiles/tgrp_comments.h5
diff --git a/tools/testfiles/tgrpnullspace.h5 b/tools/test/h5dump/testfiles/tgrpnullspace.h5
index 82a405e..82a405e 100644
--- a/tools/testfiles/tgrpnullspace.h5
+++ b/tools/test/h5dump/testfiles/tgrpnullspace.h5
diff --git a/tools/testfiles/thlink.h5 b/tools/test/h5dump/testfiles/thlink.h5
index 6e0e7e1..6e0e7e1 100644
--- a/tools/testfiles/thlink.h5
+++ b/tools/test/h5dump/testfiles/thlink.h5
diff --git a/tools/testfiles/thyperslab.h5 b/tools/test/h5dump/testfiles/thyperslab.h5
index a730aa3..a730aa3 100644
--- a/tools/testfiles/thyperslab.h5
+++ b/tools/test/h5dump/testfiles/thyperslab.h5
diff --git a/tools/testfiles/tints4dims.h5 b/tools/test/h5dump/testfiles/tints4dims.h5
index 2fe8321..2fe8321 100644
--- a/tools/testfiles/tints4dims.h5
+++ b/tools/test/h5dump/testfiles/tints4dims.h5
diff --git a/tools/testfiles/tintsattrs.h5 b/tools/test/h5dump/testfiles/tintsattrs.h5
index ca8c573..ca8c573 100644
--- a/tools/testfiles/tintsattrs.h5
+++ b/tools/test/h5dump/testfiles/tintsattrs.h5
diff --git a/tools/testfiles/tintsnodata.h5 b/tools/test/h5dump/testfiles/tintsnodata.h5
index 741da09..741da09 100644
--- a/tools/testfiles/tintsnodata.h5
+++ b/tools/test/h5dump/testfiles/tintsnodata.h5
diff --git a/tools/testfiles/tlarge_objname.h5 b/tools/test/h5dump/testfiles/tlarge_objname.h5
index 707d7b6..707d7b6 100644
--- a/tools/testfiles/tlarge_objname.h5
+++ b/tools/test/h5dump/testfiles/tlarge_objname.h5
diff --git a/tools/testfiles/tldouble.h5 b/tools/test/h5dump/testfiles/tldouble.h5
index eb031e7..eb031e7 100644
--- a/tools/testfiles/tldouble.h5
+++ b/tools/test/h5dump/testfiles/tldouble.h5
diff --git a/tools/testfiles/tldouble_scalar.h5 b/tools/test/h5dump/testfiles/tldouble_scalar.h5
index 0344ea0..0344ea0 100644
--- a/tools/testfiles/tldouble_scalar.h5
+++ b/tools/test/h5dump/testfiles/tldouble_scalar.h5
diff --git a/tools/testfiles/tlonglinks.h5 b/tools/test/h5dump/testfiles/tlonglinks.h5
index f54e5f5..f54e5f5 100644
--- a/tools/testfiles/tlonglinks.h5
+++ b/tools/test/h5dump/testfiles/tlonglinks.h5
diff --git a/tools/testfiles/tloop.h5 b/tools/test/h5dump/testfiles/tloop.h5
index d7a2f47..d7a2f47 100644
--- a/tools/testfiles/tloop.h5
+++ b/tools/test/h5dump/testfiles/tloop.h5
diff --git a/tools/testfiles/tmulti-b.h5 b/tools/test/h5dump/testfiles/tmulti-b.h5
index 3f5d51f..3f5d51f 100644
--- a/tools/testfiles/tmulti-b.h5
+++ b/tools/test/h5dump/testfiles/tmulti-b.h5
diff --git a/tools/testfiles/tmulti-g.h5 b/tools/test/h5dump/testfiles/tmulti-g.h5
index e69de29..e69de29 100644
--- a/tools/testfiles/tmulti-g.h5
+++ b/tools/test/h5dump/testfiles/tmulti-g.h5
diff --git a/tools/testfiles/tmulti-l.h5 b/tools/test/h5dump/testfiles/tmulti-l.h5
index 42fe396..42fe396 100644
--- a/tools/testfiles/tmulti-l.h5
+++ b/tools/test/h5dump/testfiles/tmulti-l.h5
diff --git a/tools/testfiles/tmulti-o.h5 b/tools/test/h5dump/testfiles/tmulti-o.h5
index b433ee8..b433ee8 100644
--- a/tools/testfiles/tmulti-o.h5
+++ b/tools/test/h5dump/testfiles/tmulti-o.h5
diff --git a/tools/testfiles/tmulti-r.h5 b/tools/test/h5dump/testfiles/tmulti-r.h5
index 928d4d5..928d4d5 100644
--- a/tools/testfiles/tmulti-r.h5
+++ b/tools/test/h5dump/testfiles/tmulti-r.h5
diff --git a/tools/testfiles/tmulti-s.h5 b/tools/test/h5dump/testfiles/tmulti-s.h5
index 3feae49..3feae49 100644
--- a/tools/testfiles/tmulti-s.h5
+++ b/tools/test/h5dump/testfiles/tmulti-s.h5
diff --git a/tools/testfiles/tnamed_dtype_attr.h5 b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5
index e7bf23d..e7bf23d 100644
--- a/tools/testfiles/tnamed_dtype_attr.h5
+++ b/tools/test/h5dump/testfiles/tnamed_dtype_attr.h5
diff --git a/tools/testfiles/tnestedcmpddt.h5 b/tools/test/h5dump/testfiles/tnestedcmpddt.h5
index f2af756..f2af756 100644
--- a/tools/testfiles/tnestedcmpddt.h5
+++ b/tools/test/h5dump/testfiles/tnestedcmpddt.h5
diff --git a/tools/testfiles/tnestedcomp.h5 b/tools/test/h5dump/testfiles/tnestedcomp.h5
index b777ee3..b777ee3 100644
--- a/tools/testfiles/tnestedcomp.h5
+++ b/tools/test/h5dump/testfiles/tnestedcomp.h5
diff --git a/tools/testfiles/tno-subset.h5 b/tools/test/h5dump/testfiles/tno-subset.h5
index e6b6f57..e6b6f57 100644
--- a/tools/testfiles/tno-subset.h5
+++ b/tools/test/h5dump/testfiles/tno-subset.h5
diff --git a/tools/testfiles/tnullspace.h5 b/tools/test/h5dump/testfiles/tnullspace.h5
index b5dac5d..b5dac5d 100644
--- a/tools/testfiles/tnullspace.h5
+++ b/tools/test/h5dump/testfiles/tnullspace.h5
diff --git a/tools/testfiles/torderattr.h5 b/tools/test/h5dump/testfiles/torderattr.h5
index bafa846..bafa846 100644
--- a/tools/testfiles/torderattr.h5
+++ b/tools/test/h5dump/testfiles/torderattr.h5
diff --git a/tools/testfiles/tordergr.h5 b/tools/test/h5dump/testfiles/tordergr.h5
index 9ccd238..9ccd238 100644
--- a/tools/testfiles/tordergr.h5
+++ b/tools/test/h5dump/testfiles/tordergr.h5
diff --git a/tools/testfiles/trefer_attr.h5 b/tools/test/h5dump/testfiles/trefer_attr.h5
index 3110ce3..3110ce3 100644
--- a/tools/testfiles/trefer_attr.h5
+++ b/tools/test/h5dump/testfiles/trefer_attr.h5
diff --git a/tools/testfiles/trefer_compat.h5 b/tools/test/h5dump/testfiles/trefer_compat.h5
index 5f6dd60..5f6dd60 100644
--- a/tools/testfiles/trefer_compat.h5
+++ b/tools/test/h5dump/testfiles/trefer_compat.h5
diff --git a/tools/testfiles/trefer_ext1.h5 b/tools/test/h5dump/testfiles/trefer_ext1.h5
index 9fc9741..9fc9741 100644
--- a/tools/testfiles/trefer_ext1.h5
+++ b/tools/test/h5dump/testfiles/trefer_ext1.h5
diff --git a/tools/testfiles/trefer_ext2.h5 b/tools/test/h5dump/testfiles/trefer_ext2.h5
index fcbb75d..fcbb75d 100644
--- a/tools/testfiles/trefer_ext2.h5
+++ b/tools/test/h5dump/testfiles/trefer_ext2.h5
diff --git a/tools/testfiles/trefer_grp.h5 b/tools/test/h5dump/testfiles/trefer_grp.h5
index d846e75..d846e75 100644
--- a/tools/testfiles/trefer_grp.h5
+++ b/tools/test/h5dump/testfiles/trefer_grp.h5
diff --git a/tools/testfiles/trefer_obj.h5 b/tools/test/h5dump/testfiles/trefer_obj.h5
index de4c19d..de4c19d 100644
--- a/tools/testfiles/trefer_obj.h5
+++ b/tools/test/h5dump/testfiles/trefer_obj.h5
diff --git a/tools/testfiles/trefer_obj_del.h5 b/tools/test/h5dump/testfiles/trefer_obj_del.h5
index c1710e8..c1710e8 100644
--- a/tools/testfiles/trefer_obj_del.h5
+++ b/tools/test/h5dump/testfiles/trefer_obj_del.h5
diff --git a/tools/testfiles/trefer_param.h5 b/tools/test/h5dump/testfiles/trefer_param.h5
index 234629a..234629a 100644
--- a/tools/testfiles/trefer_param.h5
+++ b/tools/test/h5dump/testfiles/trefer_param.h5
diff --git a/tools/testfiles/trefer_reg.h5 b/tools/test/h5dump/testfiles/trefer_reg.h5
index 8ed9184..8ed9184 100644
--- a/tools/testfiles/trefer_reg.h5
+++ b/tools/test/h5dump/testfiles/trefer_reg.h5
diff --git a/tools/testfiles/trefer_reg_1d.h5 b/tools/test/h5dump/testfiles/trefer_reg_1d.h5
index 932454d..932454d 100644
--- a/tools/testfiles/trefer_reg_1d.h5
+++ b/tools/test/h5dump/testfiles/trefer_reg_1d.h5
diff --git a/tools/testfiles/tsaf.h5 b/tools/test/h5dump/testfiles/tsaf.h5
index c84c5b6..c84c5b6 100644
--- a/tools/testfiles/tsaf.h5
+++ b/tools/test/h5dump/testfiles/tsaf.h5
diff --git a/tools/testfiles/tscalarattrintsize.h5 b/tools/test/h5dump/testfiles/tscalarattrintsize.h5
index df91f54..df91f54 100644
--- a/tools/testfiles/tscalarattrintsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarattrintsize.h5
diff --git a/tools/testfiles/tscalarintattrsize.h5 b/tools/test/h5dump/testfiles/tscalarintattrsize.h5
index 61f5fb3..61f5fb3 100644
--- a/tools/testfiles/tscalarintattrsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarintattrsize.h5
diff --git a/tools/testfiles/tscalarintsize.h5 b/tools/test/h5dump/testfiles/tscalarintsize.h5
index 5a82378..5a82378 100644
--- a/tools/testfiles/tscalarintsize.h5
+++ b/tools/test/h5dump/testfiles/tscalarintsize.h5
diff --git a/tools/testfiles/tscalarstring.h5 b/tools/test/h5dump/testfiles/tscalarstring.h5
index b0993ef..b0993ef 100644
--- a/tools/testfiles/tscalarstring.h5
+++ b/tools/test/h5dump/testfiles/tscalarstring.h5
diff --git a/tools/testfiles/tslink.h5 b/tools/test/h5dump/testfiles/tslink.h5
index 753b62d..753b62d 100644
--- a/tools/testfiles/tslink.h5
+++ b/tools/test/h5dump/testfiles/tslink.h5
diff --git a/tools/testfiles/tsoftlinks.h5 b/tools/test/h5dump/testfiles/tsoftlinks.h5
index 01ea922..01ea922 100644
--- a/tools/testfiles/tsoftlinks.h5
+++ b/tools/test/h5dump/testfiles/tsoftlinks.h5
diff --git a/tools/testfiles/tsplit_file-m.h5 b/tools/test/h5dump/testfiles/tsplit_file-m.h5
index a6eef73..a6eef73 100644
--- a/tools/testfiles/tsplit_file-m.h5
+++ b/tools/test/h5dump/testfiles/tsplit_file-m.h5
diff --git a/tools/testfiles/tsplit_file-r.h5 b/tools/test/h5dump/testfiles/tsplit_file-r.h5
index 928d4d5..928d4d5 100644
--- a/tools/testfiles/tsplit_file-r.h5
+++ b/tools/test/h5dump/testfiles/tsplit_file-r.h5
diff --git a/tools/testfiles/tst_onion_dset_1d.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5
index 5042ebf..5042ebf 100644
--- a/tools/testfiles/tst_onion_dset_1d.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5
diff --git a/tools/testfiles/tst_onion_dset_1d.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion
index a86670e..a86670e 100644
--- a/tools/testfiles/tst_onion_dset_1d.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_1d.h5.onion
diff --git a/tools/testfiles/tst_onion_dset_ext.h5 b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5
index 479aaa8..479aaa8 100644
--- a/tools/testfiles/tst_onion_dset_ext.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5
diff --git a/tools/testfiles/tst_onion_dset_ext.h5.onion b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion
index b5cbdb4..b5cbdb4 100644
--- a/tools/testfiles/tst_onion_dset_ext.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_dset_ext.h5.onion
diff --git a/tools/testfiles/tst_onion_objs.h5 b/tools/test/h5dump/testfiles/tst_onion_objs.h5
index 479aaa8..479aaa8 100644
--- a/tools/testfiles/tst_onion_objs.h5
+++ b/tools/test/h5dump/testfiles/tst_onion_objs.h5
diff --git a/tools/testfiles/tst_onion_objs.h5.onion b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion
index 4abc174..4abc174 100644
--- a/tools/testfiles/tst_onion_objs.h5.onion
+++ b/tools/test/h5dump/testfiles/tst_onion_objs.h5.onion
diff --git a/tools/testfiles/tstr.h5 b/tools/test/h5dump/testfiles/tstr.h5
index af5384f..af5384f 100644
--- a/tools/testfiles/tstr.h5
+++ b/tools/test/h5dump/testfiles/tstr.h5
diff --git a/tools/testfiles/tstr2.h5 b/tools/test/h5dump/testfiles/tstr2.h5
index d3b1588..d3b1588 100644
--- a/tools/testfiles/tstr2.h5
+++ b/tools/test/h5dump/testfiles/tstr2.h5
diff --git a/tools/testfiles/tstr3.h5 b/tools/test/h5dump/testfiles/tstr3.h5
index 9f9112f..9f9112f 100644
--- a/tools/testfiles/tstr3.h5
+++ b/tools/test/h5dump/testfiles/tstr3.h5
diff --git a/tools/testfiles/tudfilter.h5 b/tools/test/h5dump/testfiles/tudfilter.h5
index 081b000..081b000 100644
--- a/tools/testfiles/tudfilter.h5
+++ b/tools/test/h5dump/testfiles/tudfilter.h5
diff --git a/tools/testfiles/tudlink.h5 b/tools/test/h5dump/testfiles/tudlink.h5
index 5dc0c707..5dc0c707 100644
--- a/tools/testfiles/tudlink.h5
+++ b/tools/test/h5dump/testfiles/tudlink.h5
diff --git a/tools/testfiles/tvldtypes1.h5 b/tools/test/h5dump/testfiles/tvldtypes1.h5
index b5b2bd7..b5b2bd7 100644
--- a/tools/testfiles/tvldtypes1.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes1.h5
diff --git a/tools/testfiles/tvldtypes2.h5 b/tools/test/h5dump/testfiles/tvldtypes2.h5
index 65bf63f..65bf63f 100644
--- a/tools/testfiles/tvldtypes2.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes2.h5
diff --git a/tools/testfiles/tvldtypes3.h5 b/tools/test/h5dump/testfiles/tvldtypes3.h5
index dd4aca7..dd4aca7 100644
--- a/tools/testfiles/tvldtypes3.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes3.h5
diff --git a/tools/testfiles/tvldtypes4.h5 b/tools/test/h5dump/testfiles/tvldtypes4.h5
index 70dc73e..70dc73e 100644
--- a/tools/testfiles/tvldtypes4.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes4.h5
diff --git a/tools/testfiles/tvldtypes5.h5 b/tools/test/h5dump/testfiles/tvldtypes5.h5
index 776c020..776c020 100644
--- a/tools/testfiles/tvldtypes5.h5
+++ b/tools/test/h5dump/testfiles/tvldtypes5.h5
diff --git a/tools/testfiles/tvlenstr_array.h5 b/tools/test/h5dump/testfiles/tvlenstr_array.h5
index 4277f20..4277f20 100644
--- a/tools/testfiles/tvlenstr_array.h5
+++ b/tools/test/h5dump/testfiles/tvlenstr_array.h5
diff --git a/tools/testfiles/tvlstr.h5 b/tools/test/h5dump/testfiles/tvlstr.h5
index acd8a1f..acd8a1f 100644
--- a/tools/testfiles/tvlstr.h5
+++ b/tools/test/h5dump/testfiles/tvlstr.h5
diff --git a/tools/testfiles/tvms.h5 b/tools/test/h5dump/testfiles/tvms.h5
index 9c243ff..9c243ff 100644
--- a/tools/testfiles/tvms.h5
+++ b/tools/test/h5dump/testfiles/tvms.h5
diff --git a/tools/testfiles/vds/1_a.h5 b/tools/test/h5dump/testfiles/vds/1_a.h5
index 953d33d..953d33d 100644
--- a/tools/testfiles/vds/1_a.h5
+++ b/tools/test/h5dump/testfiles/vds/1_a.h5
diff --git a/tools/testfiles/vds/1_b.h5 b/tools/test/h5dump/testfiles/vds/1_b.h5
index 6ba95e6..6ba95e6 100644
--- a/tools/testfiles/vds/1_b.h5
+++ b/tools/test/h5dump/testfiles/vds/1_b.h5
diff --git a/tools/testfiles/vds/1_c.h5 b/tools/test/h5dump/testfiles/vds/1_c.h5
index 4bcebbd..4bcebbd 100644
--- a/tools/testfiles/vds/1_c.h5
+++ b/tools/test/h5dump/testfiles/vds/1_c.h5
diff --git a/tools/testfiles/vds/1_d.h5 b/tools/test/h5dump/testfiles/vds/1_d.h5
index 9c2d795..9c2d795 100644
--- a/tools/testfiles/vds/1_d.h5
+++ b/tools/test/h5dump/testfiles/vds/1_d.h5
diff --git a/tools/testfiles/vds/1_e.h5 b/tools/test/h5dump/testfiles/vds/1_e.h5
index 4f7aa7b..4f7aa7b 100644
--- a/tools/testfiles/vds/1_e.h5
+++ b/tools/test/h5dump/testfiles/vds/1_e.h5
diff --git a/tools/testfiles/vds/1_f.h5 b/tools/test/h5dump/testfiles/vds/1_f.h5
index 62e86bc..62e86bc 100644
--- a/tools/testfiles/vds/1_f.h5
+++ b/tools/test/h5dump/testfiles/vds/1_f.h5
diff --git a/tools/testfiles/vds/1_vds.h5 b/tools/test/h5dump/testfiles/vds/1_vds.h5
index 707a37f..707a37f 100644
--- a/tools/testfiles/vds/1_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/1_vds.h5
diff --git a/tools/testfiles/vds/2_a.h5 b/tools/test/h5dump/testfiles/vds/2_a.h5
index 5227e9e..5227e9e 100644
--- a/tools/testfiles/vds/2_a.h5
+++ b/tools/test/h5dump/testfiles/vds/2_a.h5
diff --git a/tools/testfiles/vds/2_b.h5 b/tools/test/h5dump/testfiles/vds/2_b.h5
index 34723a3..34723a3 100644
--- a/tools/testfiles/vds/2_b.h5
+++ b/tools/test/h5dump/testfiles/vds/2_b.h5
diff --git a/tools/testfiles/vds/2_c.h5 b/tools/test/h5dump/testfiles/vds/2_c.h5
index d2252fc..d2252fc 100644
--- a/tools/testfiles/vds/2_c.h5
+++ b/tools/test/h5dump/testfiles/vds/2_c.h5
diff --git a/tools/testfiles/vds/2_d.h5 b/tools/test/h5dump/testfiles/vds/2_d.h5
index 6880c2e..6880c2e 100644
--- a/tools/testfiles/vds/2_d.h5
+++ b/tools/test/h5dump/testfiles/vds/2_d.h5
diff --git a/tools/testfiles/vds/2_e.h5 b/tools/test/h5dump/testfiles/vds/2_e.h5
index 81ffacc..81ffacc 100644
--- a/tools/testfiles/vds/2_e.h5
+++ b/tools/test/h5dump/testfiles/vds/2_e.h5
diff --git a/tools/testfiles/vds/2_vds.h5 b/tools/test/h5dump/testfiles/vds/2_vds.h5
index cbef59c..cbef59c 100644
--- a/tools/testfiles/vds/2_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/2_vds.h5
diff --git a/tools/testfiles/vds/3_1_vds.h5 b/tools/test/h5dump/testfiles/vds/3_1_vds.h5
index e66e4c7..e66e4c7 100644
--- a/tools/testfiles/vds/3_1_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/3_1_vds.h5
diff --git a/tools/testfiles/vds/3_2_vds.h5 b/tools/test/h5dump/testfiles/vds/3_2_vds.h5
index a19dab5..a19dab5 100644
--- a/tools/testfiles/vds/3_2_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/3_2_vds.h5
diff --git a/tools/testfiles/vds/4_0.h5 b/tools/test/h5dump/testfiles/vds/4_0.h5
index 5e71d20..5e71d20 100644
--- a/tools/testfiles/vds/4_0.h5
+++ b/tools/test/h5dump/testfiles/vds/4_0.h5
diff --git a/tools/testfiles/vds/4_1.h5 b/tools/test/h5dump/testfiles/vds/4_1.h5
index edad46e..edad46e 100644
--- a/tools/testfiles/vds/4_1.h5
+++ b/tools/test/h5dump/testfiles/vds/4_1.h5
diff --git a/tools/testfiles/vds/4_2.h5 b/tools/test/h5dump/testfiles/vds/4_2.h5
index a82b012..a82b012 100644
--- a/tools/testfiles/vds/4_2.h5
+++ b/tools/test/h5dump/testfiles/vds/4_2.h5
diff --git a/tools/testfiles/vds/4_vds.h5 b/tools/test/h5dump/testfiles/vds/4_vds.h5
index 64c2288..64c2288 100644
--- a/tools/testfiles/vds/4_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/4_vds.h5
diff --git a/tools/testfiles/vds/5_a.h5 b/tools/test/h5dump/testfiles/vds/5_a.h5
index e8ea552..e8ea552 100644
--- a/tools/testfiles/vds/5_a.h5
+++ b/tools/test/h5dump/testfiles/vds/5_a.h5
diff --git a/tools/testfiles/vds/5_b.h5 b/tools/test/h5dump/testfiles/vds/5_b.h5
index 6da7cf5..6da7cf5 100644
--- a/tools/testfiles/vds/5_b.h5
+++ b/tools/test/h5dump/testfiles/vds/5_b.h5
diff --git a/tools/testfiles/vds/5_c.h5 b/tools/test/h5dump/testfiles/vds/5_c.h5
index 3e3bc61..3e3bc61 100644
--- a/tools/testfiles/vds/5_c.h5
+++ b/tools/test/h5dump/testfiles/vds/5_c.h5
diff --git a/tools/testfiles/vds/5_vds.h5 b/tools/test/h5dump/testfiles/vds/5_vds.h5
index 379485e..379485e 100644
--- a/tools/testfiles/vds/5_vds.h5
+++ b/tools/test/h5dump/testfiles/vds/5_vds.h5
diff --git a/tools/testfiles/vds/a.h5 b/tools/test/h5dump/testfiles/vds/a.h5
index fa19535..fa19535 100644
--- a/tools/testfiles/vds/a.h5
+++ b/tools/test/h5dump/testfiles/vds/a.h5
diff --git a/tools/testfiles/vds/b.h5 b/tools/test/h5dump/testfiles/vds/b.h5
index 08449ca..08449ca 100644
--- a/tools/testfiles/vds/b.h5
+++ b/tools/test/h5dump/testfiles/vds/b.h5
diff --git a/tools/testfiles/vds/c.h5 b/tools/test/h5dump/testfiles/vds/c.h5
index ba9af30..ba9af30 100644
--- a/tools/testfiles/vds/c.h5
+++ b/tools/test/h5dump/testfiles/vds/c.h5
diff --git a/tools/testfiles/vds/d.h5 b/tools/test/h5dump/testfiles/vds/d.h5
index 8eceb4a..8eceb4a 100644
--- a/tools/testfiles/vds/d.h5
+++ b/tools/test/h5dump/testfiles/vds/d.h5
diff --git a/tools/testfiles/vds/f-0.h5 b/tools/test/h5dump/testfiles/vds/f-0.h5
index 242df07..242df07 100644
--- a/tools/testfiles/vds/f-0.h5
+++ b/tools/test/h5dump/testfiles/vds/f-0.h5
diff --git a/tools/testfiles/vds/f-3.h5 b/tools/test/h5dump/testfiles/vds/f-3.h5
index 539c1c9..539c1c9 100644
--- a/tools/testfiles/vds/f-3.h5
+++ b/tools/test/h5dump/testfiles/vds/f-3.h5
diff --git a/tools/testfiles/vds/vds-eiger.h5 b/tools/test/h5dump/testfiles/vds/vds-eiger.h5
index 23d1fd3..23d1fd3 100644
--- a/tools/testfiles/vds/vds-eiger.h5
+++ b/tools/test/h5dump/testfiles/vds/vds-eiger.h5
diff --git a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5 b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5
index b7f8827..b7f8827 100644
--- a/tools/testfiles/vds/vds-percival-unlim-maxmin.h5
+++ b/tools/test/h5dump/testfiles/vds/vds-percival-unlim-maxmin.h5
diff --git a/tools/testfiles/tbitfields.h5 b/tools/test/h5dump/testfiles/xml/tbitfields.h5
index 11087f0..11087f0 100644
--- a/tools/testfiles/tbitfields.h5
+++ b/tools/test/h5dump/testfiles/xml/tbitfields.h5
diff --git a/tools/testfiles/tcompound2.h5 b/tools/test/h5dump/testfiles/xml/tcompound2.h5
index 98e80bd..98e80bd 100644
--- a/tools/testfiles/tcompound2.h5
+++ b/tools/test/h5dump/testfiles/xml/tcompound2.h5
diff --git a/tools/testfiles/tdset2.h5 b/tools/test/h5dump/testfiles/xml/tdset2.h5
index 5e17cfd..5e17cfd 100644
--- a/tools/testfiles/tdset2.h5
+++ b/tools/test/h5dump/testfiles/xml/tdset2.h5
diff --git a/tools/testfiles/tenum.h5 b/tools/test/h5dump/testfiles/xml/tenum.h5
index b1300d8..b1300d8 100644
--- a/tools/testfiles/tenum.h5
+++ b/tools/test/h5dump/testfiles/xml/tenum.h5
diff --git a/tools/testfiles/test35.nc b/tools/test/h5dump/testfiles/xml/test35.nc
index 4bd5d7f..4bd5d7f 100644
--- a/tools/testfiles/test35.nc
+++ b/tools/test/h5dump/testfiles/xml/test35.nc
diff --git a/tools/testfiles/tloop2.h5 b/tools/test/h5dump/testfiles/xml/tloop2.h5
index 995bfab..995bfab 100644
--- a/tools/testfiles/tloop2.h5
+++ b/tools/test/h5dump/testfiles/xml/tloop2.h5
diff --git a/tools/testfiles/tmany.h5 b/tools/test/h5dump/testfiles/xml/tmany.h5
index 1f2bbaa..1f2bbaa 100644
--- a/tools/testfiles/tmany.h5
+++ b/tools/test/h5dump/testfiles/xml/tmany.h5
diff --git a/tools/testfiles/tname-amp.h5 b/tools/test/h5dump/testfiles/xml/tname-amp.h5
index 27ab521..27ab521 100644
--- a/tools/testfiles/tname-amp.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-amp.h5
diff --git a/tools/testfiles/tname-apos.h5 b/tools/test/h5dump/testfiles/xml/tname-apos.h5
index 42d0fc3..42d0fc3 100644
--- a/tools/testfiles/tname-apos.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-apos.h5
diff --git a/tools/testfiles/tname-gt.h5 b/tools/test/h5dump/testfiles/xml/tname-gt.h5
index fabd154..fabd154 100644
--- a/tools/testfiles/tname-gt.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-gt.h5
diff --git a/tools/testfiles/tname-lt.h5 b/tools/test/h5dump/testfiles/xml/tname-lt.h5
index 6b13375..6b13375 100644
--- a/tools/testfiles/tname-lt.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-lt.h5
diff --git a/tools/testfiles/tname-quot.h5 b/tools/test/h5dump/testfiles/xml/tname-quot.h5
index eb8d6cc..eb8d6cc 100644
--- a/tools/testfiles/tname-quot.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-quot.h5
diff --git a/tools/testfiles/tname-sp.h5 b/tools/test/h5dump/testfiles/xml/tname-sp.h5
index 0201efd..0201efd 100644
--- a/tools/testfiles/tname-sp.h5
+++ b/tools/test/h5dump/testfiles/xml/tname-sp.h5
diff --git a/tools/testfiles/tnodata.h5 b/tools/test/h5dump/testfiles/xml/tnodata.h5
index 8e0a89d..8e0a89d 100644
--- a/tools/testfiles/tnodata.h5
+++ b/tools/test/h5dump/testfiles/xml/tnodata.h5
diff --git a/tools/testfiles/tobjref.h5 b/tools/test/h5dump/testfiles/xml/tobjref.h5
index ef42ff3..ef42ff3 100644
--- a/tools/testfiles/tobjref.h5
+++ b/tools/test/h5dump/testfiles/xml/tobjref.h5
diff --git a/tools/testfiles/topaque.h5 b/tools/test/h5dump/testfiles/xml/topaque.h5
index d0b29c6..d0b29c6 100644
--- a/tools/testfiles/topaque.h5
+++ b/tools/test/h5dump/testfiles/xml/topaque.h5
diff --git a/tools/testfiles/tref-escapes-at.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5
index 641513c..641513c 100644
--- a/tools/testfiles/tref-escapes-at.h5
+++ b/tools/test/h5dump/testfiles/xml/tref-escapes-at.h5
diff --git a/tools/testfiles/tref-escapes.h5 b/tools/test/h5dump/testfiles/xml/tref-escapes.h5
index 6c7638b..6c7638b 100644
--- a/tools/testfiles/tref-escapes.h5
+++ b/tools/test/h5dump/testfiles/xml/tref-escapes.h5
diff --git a/tools/testfiles/tref.h5 b/tools/test/h5dump/testfiles/xml/tref.h5
index 73b4be5..73b4be5 100644
--- a/tools/testfiles/tref.h5
+++ b/tools/test/h5dump/testfiles/xml/tref.h5
diff --git a/tools/testfiles/tstring-at.h5 b/tools/test/h5dump/testfiles/xml/tstring-at.h5
index aa17960..aa17960 100644
--- a/tools/testfiles/tstring-at.h5
+++ b/tools/test/h5dump/testfiles/xml/tstring-at.h5
diff --git a/tools/testfiles/tstring.h5 b/tools/test/h5dump/testfiles/xml/tstring.h5
index 667fe78..667fe78 100644
--- a/tools/testfiles/tstring.h5
+++ b/tools/test/h5dump/testfiles/xml/tstring.h5
diff --git a/tools/testfiles/zerodim.h5 b/tools/test/h5dump/testfiles/zerodim.h5
index 6939353..6939353 100644
--- a/tools/testfiles/zerodim.h5
+++ b/tools/test/h5dump/testfiles/zerodim.h5
diff --git a/tools/test/h5dump/testh5dump.sh.in b/tools/test/h5dump/testh5dump.sh.in
index 6ea410b..8796aa9 100644
--- a/tools/test/h5dump/testh5dump.sh.in
+++ b/tools/test/h5dump/testh5dump.sh.in
@@ -52,11 +52,12 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
+SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles"
+SRC_H5DUMP_EXPFILES="$SRC_TOOLS/test/h5dump/exportfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -193,195 +194,198 @@ $SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/charsets.ddl
-$SRC_H5DUMP_TESTFILES/file_space.ddl
-$SRC_H5DUMP_TESTFILES/filter_fail.ddl
-$SRC_H5DUMP_TESTFILES/non_existing.ddl
-$SRC_H5DUMP_TESTFILES/packedbits.ddl
-$SRC_H5DUMP_TESTFILES/tall-1.ddl
-$SRC_H5DUMP_TESTFILES/tall-2.ddl
-$SRC_H5DUMP_TESTFILES/tall-2A.ddl
-$SRC_H5DUMP_TESTFILES/tall-2A0.ddl
-$SRC_H5DUMP_TESTFILES/tall-2B.ddl
-$SRC_H5DUMP_TESTFILES/tall-3.ddl
-$SRC_H5DUMP_TESTFILES/tall-4s.ddl
-$SRC_H5DUMP_TESTFILES/tall-5s.ddl
-$SRC_H5DUMP_TESTFILES/tall-6.ddl
-$SRC_H5DUMP_TESTFILES/tall-6.exp
-$SRC_H5DUMP_TESTFILES/tall-7.ddl
-$SRC_H5DUMP_TESTFILES/tall-7N.ddl
-$SRC_H5DUMP_TESTFILES/tallfilters.ddl
-$SRC_H5DUMP_TESTFILES/tarray1.ddl
-$SRC_H5DUMP_TESTFILES/tarray1_big.ddl
-$SRC_H5DUMP_TESTFILES/tarray2.ddl
-$SRC_H5DUMP_TESTFILES/tarray3.ddl
-$SRC_H5DUMP_TESTFILES/tarray4.ddl
-$SRC_H5DUMP_TESTFILES/tarray5.ddl
-$SRC_H5DUMP_TESTFILES/tarray6.ddl
-$SRC_H5DUMP_TESTFILES/tarray7.ddl
-$SRC_H5DUMP_TESTFILES/tarray8.ddl
-$SRC_H5DUMP_TESTFILES/tattr-1.ddl
-$SRC_H5DUMP_TESTFILES/tattr-2.ddl
-$SRC_H5DUMP_TESTFILES/tattr-3.ddl
-$SRC_H5DUMP_TESTFILES/tattr-4_be.ddl
-$SRC_H5DUMP_TESTFILES/tattrcontents1.ddl
-$SRC_H5DUMP_TESTFILES/tattrcontents2.ddl
-$SRC_H5DUMP_TESTFILES/tattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tattrreg.ddl
-$SRC_H5DUMP_TESTFILES/tattrregR.ddl
-$SRC_H5DUMP_TESTFILES/tbin1.ddl
-$SRC_H5DUMP_TESTFILES/tbin1.ddl
-$SRC_H5DUMP_TESTFILES/tbin2.ddl
-$SRC_H5DUMP_TESTFILES/tbin3.ddl
-$SRC_H5DUMP_TESTFILES/tbin4.ddl
-$SRC_H5DUMP_TESTFILES/tbinregR.ddl
-$SRC_H5DUMP_TESTFILES/tbigdims.ddl
-$SRC_H5DUMP_TESTFILES/tbitnopaque_be.ddl
-$SRC_H5DUMP_TESTFILES/tbitnopaque_le.ddl
-$SRC_H5DUMP_TESTFILES/tboot1.ddl
-$SRC_H5DUMP_TESTFILES/tboot2.ddl
-$SRC_H5DUMP_TESTFILES/tboot2A.ddl
-$SRC_H5DUMP_TESTFILES/tboot2B.ddl
-$SRC_H5DUMP_TESTFILES/tchar1.ddl
-$SRC_H5DUMP_TESTFILES/tchunked.ddl
-$SRC_H5DUMP_TESTFILES/tcmpdattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tcmpdintsize.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-1.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-2.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-3.ddl
-$SRC_H5DUMP_TESTFILES/tcomp-4.ddl
-$SRC_H5DUMP_TESTFILES/tcompound_complex2.ddl
-$SRC_H5DUMP_TESTFILES/tcompact.ddl
-$SRC_H5DUMP_TESTFILES/tcontents.ddl
-$SRC_H5DUMP_TESTFILES/tcontiguos.ddl
-$SRC_H5DUMP_TESTFILES/tdatareg.ddl
-$SRC_H5DUMP_TESTFILES/tdataregR.ddl
-$SRC_H5DUMP_TESTFILES/tdeflate.ddl
-$SRC_H5DUMP_TESTFILES/tdset-1.ddl
-$SRC_H5DUMP_TESTFILES/tdset-2.ddl
-$SRC_H5DUMP_TESTFILES/tdset-3s.ddl
-$SRC_H5DUMP_TESTFILES/tempty.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubstart.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubcount.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubstride.ddl
-$SRC_H5DUMP_TESTFILES/texceedsubblock.ddl
-$SRC_H5DUMP_TESTFILES/texternal.ddl
-$SRC_H5DUMP_TESTFILES/textlinksrc.ddl
-$SRC_H5DUMP_TESTFILES/textlinkfar.ddl
-$SRC_H5DUMP_TESTFILES/textlink.ddl
-$SRC_H5DUMP_TESTFILES/tfamily.ddl
-$SRC_H5DUMP_TESTFILES/tfill.ddl
-$SRC_H5DUMP_TESTFILES/tfletcher32.ddl
-$SRC_H5DUMP_TESTFILES/tfloatsattrs.ddl
-$SRC_H5DUMP_TESTFILES/tfpformat.ddl
-$SRC_H5DUMP_TESTFILES/tgroup-1.ddl
-$SRC_H5DUMP_TESTFILES/tgroup-2.ddl
-$SRC_H5DUMP_TESTFILES/tgrp_comments.ddl
-$SRC_H5DUMP_TESTFILES/tgrpnullspace.ddl
-$SRC_H5DUMP_TESTFILES/thlink-1.ddl
-$SRC_H5DUMP_TESTFILES/thlink-2.ddl
-$SRC_H5DUMP_TESTFILES/thlink-3.ddl
-$SRC_H5DUMP_TESTFILES/thlink-4.ddl
-$SRC_H5DUMP_TESTFILES/thlink-5.ddl
-$SRC_H5DUMP_TESTFILES/thyperslab.ddl
-$SRC_H5DUMP_TESTFILES/tindicesno.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub1.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub2.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub3.ddl
-$SRC_H5DUMP_TESTFILES/tindicessub4.ddl
-$SRC_H5DUMP_TESTFILES/tindicesyes.ddl
-$SRC_H5DUMP_TESTFILES/tints4dims.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsBlock2.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsBlockEq.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsCount2.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsCountEq.ddl
-$SRC_H5DUMP_TESTFILES/tints4dimsStride2.ddl
-$SRC_H5DUMP_TESTFILES/tintsattrs.ddl
-$SRC_H5DUMP_TESTFILES/tlarge_objname.ddl
-$SRC_H5DUMP_TESTFILES/tldouble.ddl
-$SRC_H5DUMP_TESTFILES/tldouble_scalar.ddl
-$SRC_H5DUMP_TESTFILES/tlonglinks.ddl
-$SRC_H5DUMP_TESTFILES/tloop-1.ddl
-$SRC_H5DUMP_TESTFILES/tmulti.ddl
-$SRC_H5DUMP_TESTFILES/tmultifile.ddl
-$SRC_H5DUMP_TESTFILES/tqmarkfile.ddl
-$SRC_H5DUMP_TESTFILES/tstarfile.ddl
-$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.ddl
-$SRC_H5DUMP_TESTFILES/tnestcomp-1.ddl
-$SRC_H5DUMP_TESTFILES/tnestedcmpddt.ddl
-$SRC_H5DUMP_TESTFILES/tnbit.ddl
-$SRC_H5DUMP_TESTFILES/tnoattrdata.ddl
-$SRC_H5DUMP_TESTFILES/tnoattrddl.ddl
-$SRC_H5DUMP_TESTFILES/tnodata.ddl
-$SRC_H5DUMP_TESTFILES/tnoddl.ddl
-$SRC_H5DUMP_TESTFILES/tnoddlfile.ddl
-$SRC_H5DUMP_TESTFILES/tnoddlfile.exp
-$SRC_H5DUMP_TESTFILES/tno-subset.ddl
-$SRC_H5DUMP_TESTFILES/tnullspace.ddl
-$SRC_H5DUMP_TESTFILES/trawdatafile.ddl
-$SRC_H5DUMP_TESTFILES/trawdatafile.exp
-$SRC_H5DUMP_TESTFILES/trawssetfile.ddl
-$SRC_H5DUMP_TESTFILES/trawssetfile.exp
-$SRC_H5DUMP_TESTFILES/zerodim.ddl
-$SRC_H5DUMP_TESTFILES/tordergr1.ddl
-$SRC_H5DUMP_TESTFILES/tordergr2.ddl
-$SRC_H5DUMP_TESTFILES/tordergr3.ddl
-$SRC_H5DUMP_TESTFILES/tordergr4.ddl
-$SRC_H5DUMP_TESTFILES/tordergr5.ddl
-$SRC_H5DUMP_TESTFILES/torderattr1.ddl
-$SRC_H5DUMP_TESTFILES/torderattr2.ddl
-$SRC_H5DUMP_TESTFILES/torderattr3.ddl
-$SRC_H5DUMP_TESTFILES/torderattr4.ddl
-$SRC_H5DUMP_TESTFILES/tordercontents1.ddl
-$SRC_H5DUMP_TESTFILES/tordercontents2.ddl
-$SRC_H5DUMP_TESTFILES/torderlinks1.ddl
-$SRC_H5DUMP_TESTFILES/torderlinks2.ddl
-$SRC_H5DUMP_TESTFILES/tperror.ddl
-$SRC_H5DUMP_TESTFILES/treadfilter.ddl
-$SRC_H5DUMP_TESTFILES/treadintfilter.ddl
-$SRC_H5DUMP_TESTFILES/treference.ddl
-$SRC_H5DUMP_TESTFILES/tsaf.ddl
-$SRC_H5DUMP_TESTFILES/tscalarattrintsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarintattrsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarintsize.ddl
-$SRC_H5DUMP_TESTFILES/tscalarstring.ddl
-$SRC_H5DUMP_TESTFILES/tscaleoffset.ddl
-$SRC_H5DUMP_TESTFILES/tshuffle.ddl
-$SRC_H5DUMP_TESTFILES/tslink-1.ddl
-$SRC_H5DUMP_TESTFILES/tslink-2.ddl
-$SRC_H5DUMP_TESTFILES/tslink-D.ddl
-$SRC_H5DUMP_TESTFILES/tsplit_file.ddl
-$SRC_H5DUMP_TESTFILES/tstr-1.ddl
-$SRC_H5DUMP_TESTFILES/tstr-2.ddl
-$SRC_H5DUMP_TESTFILES/tstr2bin2.exp
-$SRC_H5DUMP_TESTFILES/tstr2bin6.exp
-$SRC_H5DUMP_TESTFILES/tstring.ddl
-$SRC_H5DUMP_TESTFILES/tstring2.ddl
-$SRC_H5DUMP_TESTFILES/tstringe.ddl
-$SRC_H5DUMP_TESTFILES/tszip.ddl
-$SRC_H5DUMP_TESTFILES/tudlink-1.ddl
-$SRC_H5DUMP_TESTFILES/tudlink-2.ddl
-$SRC_H5DUMP_TESTFILES/tuserfilter.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes1.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes2.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes3.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes4.ddl
-$SRC_H5DUMP_TESTFILES/tvldtypes5.ddl
-$SRC_H5DUMP_TESTFILES/tvlenstr_array.ddl
-$SRC_H5DUMP_TESTFILES/tvlstr.ddl
-$SRC_H5DUMP_TESTFILES/tvms.ddl
-$SRC_H5DUMP_TESTFILES/twidedisplay.ddl
-$SRC_H5DUMP_TESTFILES/twithddl.exp
-$SRC_H5DUMP_TESTFILES/twithddlfile.ddl
-$SRC_H5DUMP_TESTFILES/twithddlfile.exp
-$SRC_H5DUMP_TESTFILES/h5dump-help.txt
-$SRC_H5DUMP_TESTFILES/out3.h5import
-$SRC_H5DUMP_TESTFILES/tbinregR.exp
-$SRC_H5DUMP_TESTFILES/err_attr_dspace.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_objs.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.ddl
-$SRC_H5DUMP_TESTFILES/tst_onion_revision_count.ddl
+$SRC_H5DUMP_OUTFILES/charsets.ddl
+$SRC_H5DUMP_OUTFILES/file_space.ddl
+$SRC_H5DUMP_OUTFILES/filter_fail.ddl
+$SRC_H5DUMP_OUTFILES/non_existing.ddl
+$SRC_H5DUMP_OUTFILES/packedbits.ddl
+$SRC_H5DUMP_OUTFILES/tall-1.ddl
+$SRC_H5DUMP_OUTFILES/tall-2.ddl
+$SRC_H5DUMP_OUTFILES/tall-2A.ddl
+$SRC_H5DUMP_OUTFILES/tall-2A0.ddl
+$SRC_H5DUMP_OUTFILES/tall-2B.ddl
+$SRC_H5DUMP_OUTFILES/tall-3.ddl
+$SRC_H5DUMP_OUTFILES/tall-4s.ddl
+$SRC_H5DUMP_OUTFILES/tall-5s.ddl
+$SRC_H5DUMP_OUTFILES/tall-6.ddl
+$SRC_H5DUMP_OUTFILES/tall-7.ddl
+$SRC_H5DUMP_OUTFILES/tall-7N.ddl
+$SRC_H5DUMP_OUTFILES/tallfilters.ddl
+$SRC_H5DUMP_OUTFILES/tarray1.ddl
+$SRC_H5DUMP_OUTFILES/tarray1_big.ddl
+$SRC_H5DUMP_OUTFILES/tarray2.ddl
+$SRC_H5DUMP_OUTFILES/tarray3.ddl
+$SRC_H5DUMP_OUTFILES/tarray4.ddl
+$SRC_H5DUMP_OUTFILES/tarray5.ddl
+$SRC_H5DUMP_OUTFILES/tarray6.ddl
+$SRC_H5DUMP_OUTFILES/tarray7.ddl
+$SRC_H5DUMP_OUTFILES/tarray8.ddl
+$SRC_H5DUMP_OUTFILES/tattr-1.ddl
+$SRC_H5DUMP_OUTFILES/tattr-2.ddl
+$SRC_H5DUMP_OUTFILES/tattr-3.ddl
+$SRC_H5DUMP_OUTFILES/tattr-4_be.ddl
+$SRC_H5DUMP_OUTFILES/tattrcontents1.ddl
+$SRC_H5DUMP_OUTFILES/tattrcontents2.ddl
+$SRC_H5DUMP_OUTFILES/tattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tattrreg.ddl
+$SRC_H5DUMP_OUTFILES/tattrregR.ddl
+$SRC_H5DUMP_OUTFILES/tbin1.ddl
+$SRC_H5DUMP_OUTFILES/tbin1.ddl
+$SRC_H5DUMP_OUTFILES/tbin2.ddl
+$SRC_H5DUMP_OUTFILES/tbin3.ddl
+$SRC_H5DUMP_OUTFILES/tbin4.ddl
+$SRC_H5DUMP_OUTFILES/tbinregR.ddl
+$SRC_H5DUMP_OUTFILES/tbigdims.ddl
+$SRC_H5DUMP_OUTFILES/tbitnopaque_be.ddl
+$SRC_H5DUMP_OUTFILES/tbitnopaque_le.ddl
+$SRC_H5DUMP_OUTFILES/tboot1.ddl
+$SRC_H5DUMP_OUTFILES/tboot2.ddl
+$SRC_H5DUMP_OUTFILES/tboot2A.ddl
+$SRC_H5DUMP_OUTFILES/tboot2B.ddl
+$SRC_H5DUMP_OUTFILES/tchar1.ddl
+$SRC_H5DUMP_OUTFILES/tchunked.ddl
+$SRC_H5DUMP_OUTFILES/tcmpdattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tcmpdintsize.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-1.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-2.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-3.ddl
+$SRC_H5DUMP_OUTFILES/tcomp-4.ddl
+$SRC_H5DUMP_OUTFILES/tcompound_complex2.ddl
+$SRC_H5DUMP_OUTFILES/tcompact.ddl
+$SRC_H5DUMP_OUTFILES/tcontents.ddl
+$SRC_H5DUMP_OUTFILES/tcontiguos.ddl
+$SRC_H5DUMP_OUTFILES/tdatareg.ddl
+$SRC_H5DUMP_OUTFILES/tdataregR.ddl
+$SRC_H5DUMP_OUTFILES/tdeflate.ddl
+$SRC_H5DUMP_OUTFILES/tdset-1.ddl
+$SRC_H5DUMP_OUTFILES/tdset-2.ddl
+$SRC_H5DUMP_OUTFILES/tdset-3s.ddl
+$SRC_H5DUMP_OUTFILES/tempty.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubstart.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubcount.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubstride.ddl
+$SRC_H5DUMP_OUTFILES/texceedsubblock.ddl
+$SRC_H5DUMP_OUTFILES/texternal.ddl
+$SRC_H5DUMP_OUTFILES/textlinksrc.ddl
+$SRC_H5DUMP_OUTFILES/textlinkfar.ddl
+$SRC_H5DUMP_OUTFILES/textlink.ddl
+$SRC_H5DUMP_OUTFILES/tfamily.ddl
+$SRC_H5DUMP_OUTFILES/tfill.ddl
+$SRC_H5DUMP_OUTFILES/tfletcher32.ddl
+$SRC_H5DUMP_OUTFILES/tfloatsattrs.ddl
+$SRC_H5DUMP_OUTFILES/tfpformat.ddl
+$SRC_H5DUMP_OUTFILES/tgroup-1.ddl
+$SRC_H5DUMP_OUTFILES/tgroup-2.ddl
+$SRC_H5DUMP_OUTFILES/tgrp_comments.ddl
+$SRC_H5DUMP_OUTFILES/tgrpnullspace.ddl
+$SRC_H5DUMP_OUTFILES/thlink-1.ddl
+$SRC_H5DUMP_OUTFILES/thlink-2.ddl
+$SRC_H5DUMP_OUTFILES/thlink-3.ddl
+$SRC_H5DUMP_OUTFILES/thlink-4.ddl
+$SRC_H5DUMP_OUTFILES/thlink-5.ddl
+$SRC_H5DUMP_OUTFILES/thyperslab.ddl
+$SRC_H5DUMP_OUTFILES/tindicesno.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub1.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub2.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub3.ddl
+$SRC_H5DUMP_OUTFILES/tindicessub4.ddl
+$SRC_H5DUMP_OUTFILES/tindicesyes.ddl
+$SRC_H5DUMP_OUTFILES/tints4dims.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsBlock2.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsBlockEq.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsCount2.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsCountEq.ddl
+$SRC_H5DUMP_OUTFILES/tints4dimsStride2.ddl
+$SRC_H5DUMP_OUTFILES/tintsattrs.ddl
+$SRC_H5DUMP_OUTFILES/tlarge_objname.ddl
+$SRC_H5DUMP_OUTFILES/tldouble.ddl
+$SRC_H5DUMP_OUTFILES/tldouble_scalar.ddl
+$SRC_H5DUMP_OUTFILES/tlonglinks.ddl
+$SRC_H5DUMP_OUTFILES/tloop-1.ddl
+$SRC_H5DUMP_OUTFILES/tmulti.ddl
+$SRC_H5DUMP_OUTFILES/tmultifile.ddl
+$SRC_H5DUMP_OUTFILES/tqmarkfile.ddl
+$SRC_H5DUMP_OUTFILES/tstarfile.ddl
+$SRC_H5DUMP_OUTFILES/tnamed_dtype_attr.ddl
+$SRC_H5DUMP_OUTFILES/tnestcomp-1.ddl
+$SRC_H5DUMP_OUTFILES/tnestedcmpddt.ddl
+$SRC_H5DUMP_OUTFILES/tnbit.ddl
+$SRC_H5DUMP_OUTFILES/tnoattrdata.ddl
+$SRC_H5DUMP_OUTFILES/tnoattrddl.ddl
+$SRC_H5DUMP_OUTFILES/tnodata.ddl
+$SRC_H5DUMP_OUTFILES/tnoddl.ddl
+$SRC_H5DUMP_OUTFILES/tnoddlfile.ddl
+$SRC_H5DUMP_OUTFILES/tno-subset.ddl
+$SRC_H5DUMP_OUTFILES/tnullspace.ddl
+$SRC_H5DUMP_OUTFILES/trawdatafile.ddl
+$SRC_H5DUMP_OUTFILES/trawssetfile.ddl
+$SRC_H5DUMP_OUTFILES/zerodim.ddl
+$SRC_H5DUMP_OUTFILES/tordergr1.ddl
+$SRC_H5DUMP_OUTFILES/tordergr2.ddl
+$SRC_H5DUMP_OUTFILES/tordergr3.ddl
+$SRC_H5DUMP_OUTFILES/tordergr4.ddl
+$SRC_H5DUMP_OUTFILES/tordergr5.ddl
+$SRC_H5DUMP_OUTFILES/torderattr1.ddl
+$SRC_H5DUMP_OUTFILES/torderattr2.ddl
+$SRC_H5DUMP_OUTFILES/torderattr3.ddl
+$SRC_H5DUMP_OUTFILES/torderattr4.ddl
+$SRC_H5DUMP_OUTFILES/tordercontents1.ddl
+$SRC_H5DUMP_OUTFILES/tordercontents2.ddl
+$SRC_H5DUMP_OUTFILES/torderlinks1.ddl
+$SRC_H5DUMP_OUTFILES/torderlinks2.ddl
+$SRC_H5DUMP_OUTFILES/tperror.ddl
+$SRC_H5DUMP_OUTFILES/treadfilter.ddl
+$SRC_H5DUMP_OUTFILES/treadintfilter.ddl
+$SRC_H5DUMP_OUTFILES/treference.ddl
+$SRC_H5DUMP_OUTFILES/tsaf.ddl
+$SRC_H5DUMP_OUTFILES/tscalarattrintsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarintattrsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarintsize.ddl
+$SRC_H5DUMP_OUTFILES/tscalarstring.ddl
+$SRC_H5DUMP_OUTFILES/tscaleoffset.ddl
+$SRC_H5DUMP_OUTFILES/tshuffle.ddl
+$SRC_H5DUMP_OUTFILES/tslink-1.ddl
+$SRC_H5DUMP_OUTFILES/tslink-2.ddl
+$SRC_H5DUMP_OUTFILES/tslink-D.ddl
+$SRC_H5DUMP_OUTFILES/tsplit_file.ddl
+$SRC_H5DUMP_OUTFILES/tstr-1.ddl
+$SRC_H5DUMP_OUTFILES/tstr-2.ddl
+$SRC_H5DUMP_OUTFILES/tstring.ddl
+$SRC_H5DUMP_OUTFILES/tstring2.ddl
+$SRC_H5DUMP_OUTFILES/tstringe.ddl
+$SRC_H5DUMP_OUTFILES/tszip.ddl
+$SRC_H5DUMP_OUTFILES/tudlink-1.ddl
+$SRC_H5DUMP_OUTFILES/tudlink-2.ddl
+$SRC_H5DUMP_OUTFILES/tuserfilter.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes1.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes2.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes3.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes4.ddl
+$SRC_H5DUMP_OUTFILES/tvldtypes5.ddl
+$SRC_H5DUMP_OUTFILES/tvlenstr_array.ddl
+$SRC_H5DUMP_OUTFILES/tvlstr.ddl
+$SRC_H5DUMP_OUTFILES/tvms.ddl
+$SRC_H5DUMP_OUTFILES/twidedisplay.ddl
+$SRC_H5DUMP_OUTFILES/twithddlfile.ddl
+$SRC_H5DUMP_OUTFILES/h5dump-help.txt
+$SRC_H5DUMP_OUTFILES/out3.h5import
+$SRC_H5DUMP_OUTFILES/err_attr_dspace.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_objs.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_dset_ext.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_dset_1d.ddl
+$SRC_H5DUMP_OUTFILES/tst_onion_revision_count.ddl
+"
+
+LIST_EXPORT_TEST_FILES="
+$SRC_H5DUMP_EXPFILES/tall-6.exp
+$SRC_H5DUMP_EXPFILES/tbinregR.exp
+$SRC_H5DUMP_EXPFILES/tnoddlfile.exp
+$SRC_H5DUMP_EXPFILES/trawdatafile.exp
+$SRC_H5DUMP_EXPFILES/trawssetfile.exp
+$SRC_H5DUMP_EXPFILES/tstr2bin2.exp
+$SRC_H5DUMP_EXPFILES/tstr2bin6.exp
+$SRC_H5DUMP_EXPFILES/twithddl.exp
+$SRC_H5DUMP_EXPFILES/twithddlfile.exp
 "
 
 LIST_ERROR_TEST_FILES="
@@ -415,7 +419,7 @@ ${SRC_H5DUMP_ERRORFILES}/tslink-D.err
 #
 # copy test files and expected output files from source dirs to test dir
 #
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_ERROR_TEST_FILES"
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_OTHER_TEST_FILES $LIST_EXPORT_TEST_FILES $LIST_ERROR_TEST_FILES"
 
 COPY_TESTFILES_TO_TESTDIR()
 {
diff --git a/tools/test/h5dump/testh5dumppbits.sh.in b/tools/test/h5dump/testh5dumppbits.sh.in
index e638bb9..4094bfc 100644
--- a/tools/test/h5dump/testh5dumppbits.sh.in
+++ b/tools/test/h5dump/testh5dumppbits.sh.in
@@ -45,11 +45,11 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
+SRC_H5DUMP_ERRORFILES="$SRC_TOOLS/test/h5dump/errfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -78,75 +78,75 @@ $SRC_H5DUMP_TESTFILES/tcompound.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/pbits/tnofilename-with-packed-bits.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsArray.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCompound.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIncomplete.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongLengthExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLengthPositive.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsMax.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsMaxExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsCharOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsIntOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsLongOffsetExceeded.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOffsetNegative.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsOverlapped.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedIntWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong32.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSigned2.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsigned2.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedInt4.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLong8.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsSignedLongLong16.ddl
-$SRC_H5DUMP_TESTFILES/pbits/tpbitsUnsignedLongLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tnofilename-with-packed-bits.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsArray.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCompound.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIncomplete.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongLengthExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLengthPositive.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsMax.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsMaxExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsCharOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsIntOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsLongOffsetExceeded.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOffsetNegative.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsOverlapped.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedIntWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedIntWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole1.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole1.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLongWhole63.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLongWhole63.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong32.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong32.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSigned2.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsigned2.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedInt4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedInt4.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLong8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLong8.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsSignedLongLong16.ddl
+$SRC_H5DUMP_OUTFILES/pbits/tpbitsUnsignedLongLong16.ddl
 "
 
 LIST_ERROR_TEST_FILES="
-${SRC_H5DUMP_ERRORFILES}/tnofilename-with-packed-bits.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsCharLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsCharOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIncomplete.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIntLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsIntOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLengthPositive.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLongLengthExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsLongOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsMaxExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetExceeded.err
-${SRC_H5DUMP_ERRORFILES}/tpbitsOffsetNegative.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tnofilename-with-packed-bits.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsCharOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIncomplete.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsIntOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLengthPositive.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongLengthExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsLongOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsMaxExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetExceeded.err
+${SRC_H5DUMP_ERRORFILES}/pbits/tpbitsOffsetNegative.err
 "
 
 #
diff --git a/tools/test/h5dump/testh5dumpvds.sh.in b/tools/test/h5dump/testh5dumpvds.sh.in
index 00e01e5..e09e429 100644
--- a/tools/test/h5dump/testh5dumpvds.sh.in
+++ b/tools/test/h5dump/testh5dumpvds.sh.in
@@ -45,10 +45,10 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 SRC_H5DUMP_ERRORFILES="$srcdir/errfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
@@ -106,23 +106,23 @@ $SRC_H5DUMP_TESTFILES/vds/vds-eiger.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5DUMP_TESTFILES/vds/tvds-1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-3_1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-3_2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-4.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds-5.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_1.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-3_2.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-4.ddl
-$SRC_H5DUMP_TESTFILES/vds/tvds_layout-5.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-first.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap1.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds-gap2.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-eiger.ddl
-$SRC_H5DUMP_TESTFILES/vds/vds_layout-maxmin.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-3_1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-3_2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-4.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds-5.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_1.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-3_2.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-4.ddl
+$SRC_H5DUMP_OUTFILES/vds/tvds_layout-5.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-first.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-gap1.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds-gap2.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds_layout-eiger.ddl
+$SRC_H5DUMP_OUTFILES/vds/vds_layout-maxmin.ddl
 "
 
 LIST_ERROR_TEST_FILES="
diff --git a/tools/test/h5dump/testh5dumpxml.sh.in b/tools/test/h5dump/testh5dumpxml.sh.in
index cebdb97..b433fa2 100644
--- a/tools/test/h5dump/testh5dumpxml.sh.in
+++ b/tools/test/h5dump/testh5dumpxml.sh.in
@@ -37,16 +37,16 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5DUMP_OUTFILES="$SRC_TOOLS/test/h5dump/expected"
 
 TEST_P_DIR=./testfiles
 TESTDIR=./testfiles/xml
@@ -63,6 +63,30 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES_XML="
+$SRC_H5DUMP_TESTFILES/xml/tbitfields.h5
+$SRC_H5DUMP_TESTFILES/xml/tcompound2.h5
+$SRC_H5DUMP_TESTFILES/xml/tdset2.h5
+$SRC_H5DUMP_TESTFILES/xml/tenum.h5
+$SRC_H5DUMP_TESTFILES/xml/test35.nc
+$SRC_H5DUMP_TESTFILES/xml/tloop2.h5
+$SRC_H5DUMP_TESTFILES/xml/tmany.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-amp.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-apos.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-gt.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-lt.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-quot.h5
+$SRC_H5DUMP_TESTFILES/xml/tname-sp.h5
+$SRC_H5DUMP_TESTFILES/xml/tnodata.h5
+$SRC_H5DUMP_TESTFILES/xml/tobjref.h5
+$SRC_H5DUMP_TESTFILES/xml/topaque.h5
+$SRC_H5DUMP_TESTFILES/xml/tref.h5
+$SRC_H5DUMP_TESTFILES/xml/tref-escapes.h5
+$SRC_H5DUMP_TESTFILES/xml/tref-escapes-at.h5
+$SRC_H5DUMP_TESTFILES/xml/tstring.h5
+$SRC_H5DUMP_TESTFILES/xml/tstring-at.h5
+"
+
+LIST_HDF5_TEST_FILES="
 $SRC_H5DUMP_TESTFILES/tall.h5
 $SRC_H5DUMP_TESTFILES/tarray1.h5
 $SRC_H5DUMP_TESTFILES/tarray2.h5
@@ -70,43 +94,22 @@ $SRC_H5DUMP_TESTFILES/tarray3.h5
 $SRC_H5DUMP_TESTFILES/tarray6.h5
 $SRC_H5DUMP_TESTFILES/tarray7.h5
 $SRC_H5DUMP_TESTFILES/tattr.h5
-$SRC_H5DUMP_TESTFILES/tbitfields.h5
 $SRC_H5DUMP_TESTFILES/tcompound.h5
-$SRC_H5DUMP_TESTFILES/tcompound2.h5
 $SRC_H5DUMP_TESTFILES/tcompound_complex.h5
 $SRC_H5DUMP_TESTFILES/tdatareg.h5
 $SRC_H5DUMP_TESTFILES/tdset.h5
-$SRC_H5DUMP_TESTFILES/tdset2.h5
 $SRC_H5DUMP_TESTFILES/tempty.h5
-$SRC_H5DUMP_TESTFILES/tenum.h5
-$SRC_H5DUMP_TESTFILES/test35.nc
 $SRC_H5DUMP_TESTFILES/textlink.h5
 $SRC_H5DUMP_TESTFILES/tfpformat.h5
 $SRC_H5DUMP_TESTFILES/tgroup.h5
 $SRC_H5DUMP_TESTFILES/thlink.h5
 $SRC_H5DUMP_TESTFILES/tloop.h5
-$SRC_H5DUMP_TESTFILES/tloop2.h5
-$SRC_H5DUMP_TESTFILES/tmany.h5
-$SRC_H5DUMP_TESTFILES/tname-amp.h5
-$SRC_H5DUMP_TESTFILES/tname-apos.h5
-$SRC_H5DUMP_TESTFILES/tname-gt.h5
-$SRC_H5DUMP_TESTFILES/tname-lt.h5
-$SRC_H5DUMP_TESTFILES/tname-quot.h5
-$SRC_H5DUMP_TESTFILES/tname-sp.h5
 $SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5
 $SRC_H5DUMP_TESTFILES/tnestedcomp.h5
-$SRC_H5DUMP_TESTFILES/tnodata.h5
 $SRC_H5DUMP_TESTFILES/tnullspace.h5
-$SRC_H5DUMP_TESTFILES/tobjref.h5
-$SRC_H5DUMP_TESTFILES/topaque.h5
 $SRC_H5DUMP_TESTFILES/torderattr.h5
-$SRC_H5DUMP_TESTFILES/tref.h5
-$SRC_H5DUMP_TESTFILES/tref-escapes.h5
-$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5
 $SRC_H5DUMP_TESTFILES/tsaf.h5
 $SRC_H5DUMP_TESTFILES/tslink.h5
-$SRC_H5DUMP_TESTFILES/tstring.h5
-$SRC_H5DUMP_TESTFILES/tstring-at.h5
 $SRC_H5DUMP_TESTFILES/tstr.h5
 $SRC_H5DUMP_TESTFILES/tstr2.h5
 $SRC_H5DUMP_TESTFILES/tudlink.h5
@@ -119,78 +122,78 @@ $SRC_H5DUMP_TESTFILES/tvlstr.h5
 "
 
 LIST_OTHER_TEST_FILES_XML="
-$SRC_H5DUMP_TESTFILES/tall.h5.xml
-$SRC_H5DUMP_TESTFILES/tall-2A.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray1.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray2.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray3.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray6.h5.xml
-$SRC_H5DUMP_TESTFILES/tarray7.h5.xml
-$SRC_H5DUMP_TESTFILES/tattr.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields_be.h5.xml
-$SRC_H5DUMP_TESTFILES/tbitfields_le.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound_complex.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound.h5.xml
-$SRC_H5DUMP_TESTFILES/tcompound2.h5.xml
-$SRC_H5DUMP_TESTFILES/tdatareg.h5.xml
-$SRC_H5DUMP_TESTFILES/tdset.h5.xml
-$SRC_H5DUMP_TESTFILES/tdset2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-dtd-uri.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-nons-uri.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-ns.h5.xml
-$SRC_H5DUMP_TESTFILES/tempty-ns-2.h5.xml
-$SRC_H5DUMP_TESTFILES/tenum.h5.xml
-$SRC_H5DUMP_TESTFILES/test35.nc.xml
-$SRC_H5DUMP_TESTFILES/textlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tfpformat.h5.xml
-$SRC_H5DUMP_TESTFILES/tgroup.h5.xml
-$SRC_H5DUMP_TESTFILES/thlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tloop.h5.xml
-$SRC_H5DUMP_TESTFILES/tloop2.h5.xml
-$SRC_H5DUMP_TESTFILES/tmany.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-amp.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-apos.h5.xml
-$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-gt.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-lt.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-quot.h5.xml
-$SRC_H5DUMP_TESTFILES/tname-sp.h5.xml
-$SRC_H5DUMP_TESTFILES/tnestedcomp.h5.xml
-$SRC_H5DUMP_TESTFILES/tnodata.h5.xml
-$SRC_H5DUMP_TESTFILES/tnullspace.h5.xml
-$SRC_H5DUMP_TESTFILES/tobjref.h5.xml
-$SRC_H5DUMP_TESTFILES/topaque.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr1.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr2.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr3.h5.xml
-$SRC_H5DUMP_TESTFILES/torderattr4.h5.xml
-$SRC_H5DUMP_TESTFILES/tref.h5.xml
-$SRC_H5DUMP_TESTFILES/tref-escapes.h5.xml
-$SRC_H5DUMP_TESTFILES/tref-escapes-at.h5.xml
-$SRC_H5DUMP_TESTFILES/tsaf.h5.xml
-$SRC_H5DUMP_TESTFILES/tslink.h5.xml
-$SRC_H5DUMP_TESTFILES/tstr.h5.xml
-$SRC_H5DUMP_TESTFILES/tstr2.h5.xml
-$SRC_H5DUMP_TESTFILES/tstring.h5.xml
-$SRC_H5DUMP_TESTFILES/tstring-at.h5.xml
-$SRC_H5DUMP_TESTFILES/tudlink.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes1.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes2.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes3.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes4.h5.xml
-$SRC_H5DUMP_TESTFILES/tvldtypes5.h5.xml
-$SRC_H5DUMP_TESTFILES/tvlstr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tall.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tall-2A.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray6.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tarray7.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tattr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tbitfields_be.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tbitfields_le.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound_complex.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tcompound2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdatareg.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdset.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tdset2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-dtd-uri.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-nons-uri.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-ns.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tempty-ns-2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tenum.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/test35.nc.xml
+$SRC_H5DUMP_OUTFILES/xml/textlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tfpformat.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tgroup.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/thlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tloop.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tloop2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tmany.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-amp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-apos.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnamed_dtype_attr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-gt.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-lt.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-quot.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tname-sp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnestedcomp.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnodata.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tnullspace.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tobjref.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/topaque.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/torderattr4.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref-escapes.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tref-escapes-at.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tsaf.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tslink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstr.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstr2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstring.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tstring-at.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tudlink.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes1.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes2.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes3.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes4.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvldtypes5.h5.xml
+$SRC_H5DUMP_OUTFILES/xml/tvlstr.h5.xml
 "
 
 #
 # copy test files and expected output files from source dirs to test dir
 #
-COPY_TESTFILES="$LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML"
+COPY_TESTFILES="$LIST_HDF5_TEST_FILES $LIST_HDF5_TEST_FILES_XML $LIST_OTHER_TEST_FILES_XML"
 
 COPY_TESTFILES_TO_TESTDIR()
 {
diff --git a/tools/test/h5format_convert/CMakeTests.cmake b/tools/test/h5format_convert/CMakeTests.cmake
index 73cb2ee..3046521 100644
--- a/tools/test/h5format_convert/CMakeTests.cmake
+++ b/tools/test/h5format_convert/CMakeTests.cmake
@@ -79,15 +79,15 @@
   add_custom_target(h5fc-files ALL COMMENT "Copying files needed by h5fc tests")
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}" "${PROJECT_BINARY_DIR}/testfiles/${ddl_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5FC_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5fc_files")
   endforeach ()
   add_custom_target(h5fc_files ALL COMMENT "Copying files needed by h5fc tests" DEPENDS ${h5fc_files_list})
 
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file-d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file-d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
index ceb0fe4..ceb0fe4 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_d_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_d_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl b/tools/test/h5format_convert/expected/h5fc_dname.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_dname.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_dname.err b/tools/test/h5format_convert/expected/h5fc_dname.err
index 361d8a9..361d8a9 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_dname.err
+++ b/tools/test/h5format_convert/expected/h5fc_dname.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
index f788913..f788913 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
index 6564031..6564031 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
index 746de2b..746de2b 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
index 57781ec..57781ec 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
index 8fd061d..8fd061d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
index 435ed46..435ed46 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
index 57a78d3..57a78d3 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_help.ddl b/tools/test/h5format_convert/expected/h5fc_help.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_help.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_help.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
index 39450c0..39450c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistdset_file.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistdset_file.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
index 706ea9d..706ea9d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nonexistfile.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_nonexistfile.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
index bc0229c..bc0229c 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_nooption.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_nooption.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
index c5e55c7..c5e55c7 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
index 23f775d..23f775d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
index 066f2d5..066f2d5 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
index e72892d..e72892d 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_err.ddl.err
+++ b/tools/test/h5format_convert/expected/h5fc_v_err.ddl.err
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
index 1c6d7fb..1c6d7fb 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_1d.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_1d.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
index ad00d92..ad00d92 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_n_all.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_n_all.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
index e79b11a..e79b11a 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_ndata_bt1.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_ndata_bt1.ddl
diff --git a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
index 50575c0..50575c0 100644
--- a/tools/test/h5format_convert/testfiles/h5fc_v_non_chunked.ddl
+++ b/tools/test/h5format_convert/expected/h5fc_v_non_chunked.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
index 45fa3fb..45fa3fb 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_f.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_f.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
index 67a7116..67a7116 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_i.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_i.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
index 7f67d9f..7f67d9f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext1_s.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext1_s.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
index 350d3ba..350d3ba 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_if.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_if.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
index 6b2b2c3..6b2b2c3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_is.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_is.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
index 4a038e3..4a038e3 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext2_sf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext2_sf.ddl
diff --git a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
index 602627f..602627f 100644
--- a/tools/test/h5format_convert/testfiles/old_h5fc_ext3_isf.ddl
+++ b/tools/test/h5format_convert/expected/old_h5fc_ext3_isf.ddl
diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c
index 49fbbab..7adc33d 100644
--- a/tools/test/h5format_convert/h5fc_chk_idx.c
+++ b/tools/test/h5format_convert/h5fc_chk_idx.c
@@ -55,11 +55,11 @@ main(int argc, char *argv[])
     } /* end if */
 
     /* Duplicate the file name  & dataset name */
-    fname = HDstrdup(argv[1]);
-    dname = HDstrdup(argv[2]);
+    fname = strdup(argv[1]);
+    dname = strdup(argv[2]);
 
     /* Try opening the file */
-    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
+    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, false, NULL, (size_t)0)) < 0) {
         fprintf(stderr, "h5fc_chk_idx: unable to open the file\n");
         exit(EXIT_FAILURE);
     } /* end if */
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 5b8bfce..7a31e58 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -136,7 +136,6 @@ gen_non(const char *fname)
      */
 
     /* Create dataspace */
-    max_dims[0] = 10;
     max_dims[0] = H5S_UNLIMITED;
     max_dims[1] = H5S_UNLIMITED;
     if ((sid = H5Screate_simple(2, dims2, max_dims)) < 0)
@@ -572,7 +571,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
             H5Pset_shared_mesg_nindexes(fcpl, 4);
             break;
         case 2:
-            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)1);
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)1);
             break;
         case 3:
             H5Pset_istore_k(fcpl, ISTORE_IK);
@@ -580,7 +579,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
             break;
         case 4:
             H5Pset_istore_k(fcpl, ISTORE_IK);
-            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1);
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1);
             break;
         case 5:
             H5Pset_shared_mesg_nindexes(fcpl, 4);
@@ -589,7 +588,7 @@ gen_ext(const char *fname, unsigned new_format, unsigned what)
         case 6:
             H5Pset_istore_k(fcpl, ISTORE_IK);
             H5Pset_shared_mesg_nindexes(fcpl, 4);
-            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1);
+            H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1);
             break;
         default:
             break;
@@ -793,14 +792,14 @@ main(void)
     gen_err_level(ERR_LEVEL_FILE);
 
     /* Generate old/new format file with/without messages in the superblock extension */
-    for (new_format = FALSE; new_format <= TRUE; new_format++) {
+    for (new_format = false; new_format <= true; new_format++) {
         for (i = 0; i < 8; i++) {
             char filename[50];
 
             memset(filename, 0, sizeof(filename));
             if (!new_format)
-                HDstrcat(filename, "old_");
-            HDstrcat(filename, FILENAME[i]);
+                strcat(filename, "old_");
+            strcat(filename, FILENAME[i]);
 
             gen_ext(filename, new_format, i);
         } /* end for */
diff --git a/tools/test/h5format_convert/testh5fc.sh.in b/tools/test/h5format_convert/testh5fc.sh.in
index cd2b801..4ba46cb 100644
--- a/tools/test/h5format_convert/testh5fc.sh.in
+++ b/tools/test/h5format_convert/testh5fc.sh.in
@@ -49,11 +49,10 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -61,6 +60,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5FORMCONV_TESTFILES="$SRC_TOOLS/test/h5format_convert/testfiles"
+SRC_H5FORMCONV_OUTFILES="$SRC_TOOLS/test/h5format_convert/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -103,39 +103,39 @@ $SRC_H5FORMCONV_TESTFILES/h5fc_err_level.h5
 "
 
 LIST_ERR_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistfile.ddl.err
-$SRC_H5FORMCONV_TESTFILES/h5fc_nonexistdset_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistfile.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_nonexistdset_file.ddl.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5FORMCONV_TESTFILES/h5fc_help.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_nooption.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_d_file.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_dname.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_non_chunked.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_ndata_bt1.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_1d.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_n_all.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_i.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_s.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext1_f.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_if.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_is.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext2_sf.ddl
-$SRC_H5FORMCONV_TESTFILES/old_h5fc_ext3_isf.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl
-$SRC_H5FORMCONV_TESTFILES/h5fc_v_err.ddl.err
+$SRC_H5FORMCONV_OUTFILES/h5fc_help.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_nooption.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_d_file.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_dname.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_non_chunked.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_ndata_bt1.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_1d.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_n_all.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_i.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_s.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext1_f.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_if.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_is.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext2_sf.ddl
+$SRC_H5FORMCONV_OUTFILES/old_h5fc_ext3_isf.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl
+$SRC_H5FORMCONV_OUTFILES/h5fc_v_err.ddl.err
 "
 
 #
diff --git a/tools/test/h5import/CMakeTests.cmake b/tools/test/h5import/CMakeTests.cmake
index 7506116..c3bbd79 100644
--- a/tools/test/h5import/CMakeTests.cmake
+++ b/tools/test/h5import/CMakeTests.cmake
@@ -45,6 +45,8 @@
       dbinuin16.h5.txt
       dbinuin32.h5.txt
       dtxtstr.h5.txt
+  )
+  set (HDF5_REFERENCE_DDL_FILES
       tall_fp32.ddl
       tall_i32.ddl
       tintsattrs_u32.ddl
@@ -74,19 +76,23 @@
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (conf_file ${HDF5_REFERENCE_CONF_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${conf_file}" "${PROJECT_BINARY_DIR}/testfiles/${conf_file}" "h5import_files")
   endforeach ()
 
   foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
+  endforeach ()
+
+  foreach (txt_file ${HDF5_REFERENCE_DDL_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5import_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5IMPORT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_TOOLS_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5import_files")
   endforeach ()
   add_custom_target(h5import_files ALL COMMENT "Copying files needed by h5import tests" DEPENDS ${h5import_files_list})
 
diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c
index 003c343..b11fe10 100644
--- a/tools/test/h5import/h5importtest.c
+++ b/tools/test/h5import/h5importtest.c
@@ -68,9 +68,9 @@ main(void)
     volatile uint32_t ibyte = 0x01234567;
     /* 0 for big endian, 1 for little endian. */
     if ((*((volatile uint8_t *)(&ibyte))) == 0x67)
-        HDstrcpy(machine_order, "LE");
+        strcpy(machine_order, "LE");
     else
-        HDstrcpy(machine_order, "BE");
+        strcpy(machine_order, "BE");
 
     /*
      * initialize the row, column, and plane vectors
diff --git a/tools/test/h5import/h5importtestutil.sh.in b/tools/test/h5import/h5importtestutil.sh.in
index ba91ee5..65b899f 100644
--- a/tools/test/h5import/h5importtestutil.sh.in
+++ b/tools/test/h5import/h5importtestutil.sh.in
@@ -41,11 +41,10 @@ nerrors=0
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -82,8 +81,8 @@ $SRC_H5IMPORT_TESTFILES/txtuin16.h5
 $SRC_H5IMPORT_TESTFILES/txtuin32.h5
 $SRC_H5IMPORT_TESTFILES/txtstr.h5
 $SRC_H5IMPORT_TESTFILES/textpfe.h5
-$SRC_TOOLS_TESTFILES/tall.h5
-$SRC_TOOLS_TESTFILES/tintsattrs.h5
+$SRC_H5DUMP_TESTFILES/tall.h5
+$SRC_H5DUMP_TESTFILES/tintsattrs.h5
 "
 
 LIST_OTHER_TEST_FILES="
diff --git a/tools/test/h5jam/CMakeTests.cmake b/tools/test/h5jam/CMakeTests.cmake
index e19ec86..eb6070e 100644
--- a/tools/test/h5jam/CMakeTests.cmake
+++ b/tools/test/h5jam/CMakeTests.cmake
@@ -33,11 +33,11 @@
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5jam_files")
   endforeach ()
 
   foreach (txt_file ${HDF5_REFERENCE_TXT_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5JAM_SOURCE_DIR}/testfiles/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${txt_file}" "${PROJECT_BINARY_DIR}/testfiles/${txt_file}" "h5jam_files")
   endforeach ()
   add_custom_target(h5jam_files ALL COMMENT "Copying files needed by h5jam tests" DEPENDS ${h5jam_files_list})
 
diff --git a/tools/test/h5jam/testfiles/h5jam-help.txt b/tools/test/h5jam/expected/h5jam-help.txt
index ce97c22..ce97c22 100644
--- a/tools/test/h5jam/testfiles/h5jam-help.txt
+++ b/tools/test/h5jam/expected/h5jam-help.txt
diff --git a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt
index 72c0b17..72c0b17 100644
--- a/tools/test/h5jam/testfiles/h5jam-ub-nohdf5.txt
+++ b/tools/test/h5jam/expected/h5jam-ub-nohdf5.txt
diff --git a/tools/test/h5jam/testfiles/h5unjam-help.txt b/tools/test/h5jam/expected/h5unjam-help.txt
index f0d92e9..f0d92e9 100644
--- a/tools/test/h5jam/testfiles/h5unjam-help.txt
+++ b/tools/test/h5jam/expected/h5unjam-help.txt
diff --git a/tools/test/h5jam/testfiles/u10.txt b/tools/test/h5jam/expected/u10.txt
index c76a964..c76a964 100644
--- a/tools/test/h5jam/testfiles/u10.txt
+++ b/tools/test/h5jam/expected/u10.txt
diff --git a/tools/test/h5jam/testfiles/u511.txt b/tools/test/h5jam/expected/u511.txt
index bff1736..bff1736 100644
--- a/tools/test/h5jam/testfiles/u511.txt
+++ b/tools/test/h5jam/expected/u511.txt
diff --git a/tools/test/h5jam/testfiles/u512.txt b/tools/test/h5jam/expected/u512.txt
index 33a36c9..33a36c9 100644
--- a/tools/test/h5jam/testfiles/u512.txt
+++ b/tools/test/h5jam/expected/u512.txt
diff --git a/tools/test/h5jam/testfiles/u513.txt b/tools/test/h5jam/expected/u513.txt
index 6b46ebf..6b46ebf 100644
--- a/tools/test/h5jam/testfiles/u513.txt
+++ b/tools/test/h5jam/expected/u513.txt
diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c
index b90ddeb..8878a69 100644
--- a/tools/test/h5jam/getub.c
+++ b/tools/test/h5jam/getub.c
@@ -59,7 +59,7 @@ parse_command_line(int argc, const char *const *argv)
     while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'c':
-                nbytes = HDstrdup(H5_optarg);
+                nbytes = strdup(H5_optarg);
                 break;
             case '?':
             default:
@@ -105,10 +105,10 @@ main(int argc, char *argv[])
         goto error;
     } /* end if */
 
-    filename = HDstrdup(argv[H5_optind]);
+    filename = strdup(argv[H5_optind]);
 
     size = 0;
-    if (EOF == (res = HDsscanf(nbytes, "%u", &size))) {
+    if (EOF == (res = sscanf(nbytes, "%u", &size))) {
         /* fail */
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index d3b7388..0ab29c3 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -151,7 +151,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
         goto error;
     if ((attr = H5Acreate2(group, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
-    if (HDsnprintf(buf, sizeof(buf), "abcdefghi") < 0)
+    if (snprintf(buf, sizeof(buf), "abcdefghi") < 0)
         goto error;
     if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
         goto error;
@@ -205,7 +205,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
         goto error;
     if ((attr = H5Acreate2(dataset, "attr1", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
-    if (HDsnprintf(buf, sizeof(buf), "1st attribute of dset1.1.1") < 0)
+    if (snprintf(buf, sizeof(buf), "1st attribute of dset1.1.1") < 0)
         goto error;
     if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
         goto error;
@@ -219,7 +219,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
         goto error;
     if ((attr = H5Acreate2(dataset, "attr2", H5T_STD_I8BE, space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         goto error;
-    if (HDsnprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1") < 0)
+    if (snprintf(buf, sizeof(buf), "2nd attribute of dset1.1.1") < 0)
         goto error;
     if (H5Awrite(attr, H5T_NATIVE_SCHAR, buf) < 0)
         goto error;
@@ -412,7 +412,7 @@ main(void)
 
     if (gent_ub(FILE7, 0, 0) < 0)
         goto error;
-    if (gent_ub(FILE8, 512, HDstrlen(pattern)) < 0)
+    if (gent_ub(FILE8, 512, strlen(pattern)) < 0)
         goto error;
     if (gent_ub(FILE9, 1024, 513) < 0)
         goto error;
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 501ecc5..61ea896 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -124,7 +124,7 @@ main(int argc, char *argv[])
         goto done;
     }
 
-    ifname = HDstrdup(argv[H5_optind]);
+    ifname = strdup(argv[H5_optind]);
 
     testval = H5Fis_accessible(ifname, H5P_DEFAULT);
 
diff --git a/tools/test/h5jam/testh5jam.sh.in b/tools/test/h5jam/testh5jam.sh.in
index 805ce11..49598da 100644
--- a/tools/test/h5jam/testh5jam.sh.in
+++ b/tools/test/h5jam/testh5jam.sh.in
@@ -43,17 +43,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5JAM_OUTFILES="$SRC_TOOLS/test/h5jam/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -73,13 +73,13 @@ $SRC_H5JAM_TESTFILES/twithub.h5
 $SRC_H5JAM_TESTFILES/twithub513.h5
 "
 LIST_OTHER_TEST_FILES="
-$SRC_H5JAM_TESTFILES/u10.txt
-$SRC_H5JAM_TESTFILES/u511.txt
-$SRC_H5JAM_TESTFILES/u512.txt
-$SRC_H5JAM_TESTFILES/u513.txt
-$SRC_H5JAM_TESTFILES/h5jam-help.txt
-$SRC_H5JAM_TESTFILES/h5unjam-help.txt
-$SRC_H5JAM_TESTFILES/h5jam-ub-nohdf5.txt
+$SRC_H5JAM_OUTFILES/u10.txt
+$SRC_H5JAM_OUTFILES/u511.txt
+$SRC_H5JAM_OUTFILES/u512.txt
+$SRC_H5JAM_OUTFILES/u513.txt
+$SRC_H5JAM_OUTFILES/h5jam-help.txt
+$SRC_H5JAM_OUTFILES/h5unjam-help.txt
+$SRC_H5JAM_OUTFILES/h5jam-ub-nohdf5.txt
 "
 
 # Source in the output filter function definitions.
diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake
index 15f18b5..14a7e5d 100644
--- a/tools/test/h5ls/CMakeTests.cmake
+++ b/tools/test/h5ls/CMakeTests.cmake
@@ -19,112 +19,119 @@
   # --------------------------------------------------------------------
   # Copy all the test files from source directory to test directory
   # --------------------------------------------------------------------
+  set (LIST_HDF5_TESTLS_FILES
+      tdset_idx.h5
+  )
+
   set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/tall.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tcompound.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.h5
-      ${HDF5_TOOLS_DIR}/testfiles/thlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tloop.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tnestedcomp.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tslink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tstr.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.h5
+      tall.h5
+      tarray1.h5
+      tattr2.h5
+      tattrreg.h5
+      tcompound.h5
+      tdatareg.h5
+      tdset.h5
+      tempty.h5
+      textlink.h5
+      textlinksrc.h5
+      textlinktar.h5
+      tgroup.h5
+      tgrp_comments.h5
+      tgrpnullspace.h5
+      thlink.h5
+      tloop.h5
+      tnestedcomp.h5
+      tsaf.h5
+      tslink.h5
+      tsoftlinks.h5
+      tstr.h5
+      tudfilter.h5
+      tudlink.h5
+      tvldtypes1.h5
   )
 
   set (LIST_ERR_TEST_FILES
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/nosuchfile.err
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/textlinksrc-nodangle-1.err
-      ${HDF5_TOOLS_DIR}/test/h5ls/errfiles/tgroup-1.err
+      nosuchfile.err
+      textlinksrc-nodangle-1.err
+      tgroup-1.err
   )
 
   set (LIST_OTHER_TEST_FILES
-      ${HDF5_TOOLS_DIR}/testfiles/help-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/help-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/help-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/nosuchfile.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tall-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tall-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tarray1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattr2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_le.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg_be.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tcomp-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregbe.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdataregle.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdset-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tempty.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-5.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-1-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-2-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-3-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-6-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-7-old.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-5.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc-nodangle-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgrp_comments.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/thlinks-nodangle-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgroup-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tgrpnullspace.ls
-      ${HDF5_TOOLS_DIR}/testfiles/thlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tloop-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tmultifile.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-2.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-3.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tnestcomp-4.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tsaf.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tslink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tstr-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tudfilter.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tudlink-1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes1.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2le.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tvldtypes2be.ls
-      ${HDF5_TOOLS_DIR}/testfiles/tdset_idx.ls
+      help-1.ls
+      help-2.ls
+      help-3.ls
+      nosuchfile.ls
+      tall-1.ls
+      tall-2.ls
+      tarray1.ls
+      tattr2.ls
+      tattrreg_le.ls
+      tattrreg_be.ls
+      tcomp-1.ls
+      tdataregbe.ls
+      tdataregle.ls
+      tdset-1.ls
+      tdset_idx.ls
+      tempty.ls
+      textlink-1.ls
+      textlinksrc-1.ls
+      textlinksrc-2.ls
+      textlinksrc-3.ls
+      textlinksrc-4.ls
+      textlinksrc-5.ls
+      textlinksrc-6.ls
+      textlinksrc-7.ls
+      textlinksrc-1-old.ls
+      textlinksrc-2-old.ls
+      textlinksrc-3-old.ls
+      textlinksrc-6-old.ls
+      textlinksrc-7-old.ls
+      textlinksrc-nodangle-1.ls
+      textlinksrc-nodangle-2.ls
+      tgroup.ls
+      tgroup-1.ls
+      tgroup-2.ls
+      tgroup-3.ls
+      tgrpnullspace.ls
+      tgrp_comments.ls
+      thlinks-nodangle-1.ls
+      thlink-1.ls
+      tloop-1.ls
+      tmultifile.ls
+      tnestcomp-1.ls
+      tnestcomp-2.ls
+      tnestcomp-3.ls
+      tnestcomp-4.ls
+      tsaf.ls
+      tslink-1.ls
+      tsoftlinks-1.ls
+      tsoftlinks-2.ls
+      tsoftlinks-3.ls
+      tsoftlinks-4.ls
+      tsoftlinks-5.ls
+      tsoftlinks-nodangle-1.ls
+      tstr-1.ls
+      tudfilter.ls
+      tudlink-1.ls
+      tvldtypes1.ls
+      tvldtypes2le.ls
+      tvldtypes2be.ls
   )
 
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   # copy the list of test files
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files")
+  foreach (listlsfiles ${LIST_HDF5_TESTLS_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${listlsfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listlsfiles}" "h5ls_files")
+  endforeach ()
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listfiles}" "h5ls_files")
+  endforeach ()
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/${listothers}" "h5ls_files")
   endforeach ()
-  foreach (listfiles ${LIST_ERR_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5ls_files")
+  foreach (listerrfiles ${LIST_ERR_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/errfiles/${listerrfiles}" "${PROJECT_BINARY_DIR}/testfiles/${listerrfiles}" "h5ls_files")
   endforeach ()
   add_custom_target(h5ls_files ALL COMMENT "Copying files needed by h5ls tests" DEPENDS ${h5ls_files_list})
 
diff --git a/tools/test/h5ls/CMakeTestsVDS.cmake b/tools/test/h5ls/CMakeTestsVDS.cmake
index 5ef21ab..3718f64 100644
--- a/tools/test/h5ls/CMakeTestsVDS.cmake
+++ b/tools/test/h5ls/CMakeTestsVDS.cmake
@@ -57,19 +57,20 @@
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   # copy the list of test files
-  foreach (listfiles ${LIST_HDF5_TEST_FILES} ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${fname}" "h5ls_vds_files")
+  foreach (listfiles ${LIST_HDF5_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listfiles}" "h5ls_vds_files")
+  endforeach ()
+
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/vds/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/${listothers}" "h5ls_vds_files")
   endforeach ()
 
   foreach (listfiles ${LIST_HDF5_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listfiles}" "h5ls_vds_files")
   endforeach ()
 
-  foreach (listfiles ${LIST_OTHER_TEST_FILES})
-    get_filename_component(fname "${listfiles}" NAME)
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5LS_SOURCE_DIR}/vds_prefix/${listfiles}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${fname}" "h5ls_vds_files")
+  foreach (listothers ${LIST_OTHER_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/vds_prefix/${listothers}" "${PROJECT_BINARY_DIR}/testfiles/vds/prefix/${listothers}" "h5ls_vds_files")
   endforeach ()
 
   add_custom_target(h5ls_vds_files ALL COMMENT "Copying files needed by h5ls_vds tests" DEPENDS ${h5ls_vds_files_list})
diff --git a/tools/testfiles/help-1.ls b/tools/test/h5ls/expected/help-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-1.ls
+++ b/tools/test/h5ls/expected/help-1.ls
diff --git a/tools/testfiles/help-2.ls b/tools/test/h5ls/expected/help-2.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-2.ls
+++ b/tools/test/h5ls/expected/help-2.ls
diff --git a/tools/testfiles/help-3.ls b/tools/test/h5ls/expected/help-3.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/help-3.ls
+++ b/tools/test/h5ls/expected/help-3.ls
diff --git a/tools/testfiles/nosuchfile.ls b/tools/test/h5ls/expected/nosuchfile.ls
index e69de29..e69de29 100644
--- a/tools/testfiles/nosuchfile.ls
+++ b/tools/test/h5ls/expected/nosuchfile.ls
diff --git a/tools/testfiles/tall-1.ls b/tools/test/h5ls/expected/tall-1.ls
index 91b89e6..91b89e6 100644
--- a/tools/testfiles/tall-1.ls
+++ b/tools/test/h5ls/expected/tall-1.ls
diff --git a/tools/testfiles/tall-2.ls b/tools/test/h5ls/expected/tall-2.ls
index eb6c3de..eb6c3de 100644
--- a/tools/testfiles/tall-2.ls
+++ b/tools/test/h5ls/expected/tall-2.ls
diff --git a/tools/testfiles/tarray1.ls b/tools/test/h5ls/expected/tarray1.ls
index e7cb9e1..e7cb9e1 100644
--- a/tools/testfiles/tarray1.ls
+++ b/tools/test/h5ls/expected/tarray1.ls
diff --git a/tools/testfiles/tattr2.ls b/tools/test/h5ls/expected/tattr2.ls
index f07f867..f07f867 100644
--- a/tools/testfiles/tattr2.ls
+++ b/tools/test/h5ls/expected/tattr2.ls
diff --git a/tools/testfiles/tattrreg_be.ls b/tools/test/h5ls/expected/tattrreg_be.ls
index b94d291..b94d291 100644
--- a/tools/testfiles/tattrreg_be.ls
+++ b/tools/test/h5ls/expected/tattrreg_be.ls
diff --git a/tools/testfiles/tattrreg_le.ls b/tools/test/h5ls/expected/tattrreg_le.ls
index 471c24c..471c24c 100644
--- a/tools/testfiles/tattrreg_le.ls
+++ b/tools/test/h5ls/expected/tattrreg_le.ls
diff --git a/tools/testfiles/tcomp-1.ls b/tools/test/h5ls/expected/tcomp-1.ls
index 38f4228..38f4228 100644
--- a/tools/testfiles/tcomp-1.ls
+++ b/tools/test/h5ls/expected/tcomp-1.ls
diff --git a/tools/testfiles/tdataregbe.ls b/tools/test/h5ls/expected/tdataregbe.ls
index ae5e629..ae5e629 100644
--- a/tools/testfiles/tdataregbe.ls
+++ b/tools/test/h5ls/expected/tdataregbe.ls
diff --git a/tools/testfiles/tdataregle.ls b/tools/test/h5ls/expected/tdataregle.ls
index 586b385..586b385 100644
--- a/tools/testfiles/tdataregle.ls
+++ b/tools/test/h5ls/expected/tdataregle.ls
diff --git a/tools/testfiles/tdset-1.ls b/tools/test/h5ls/expected/tdset-1.ls
index f214ba5..f214ba5 100644
--- a/tools/testfiles/tdset-1.ls
+++ b/tools/test/h5ls/expected/tdset-1.ls
diff --git a/tools/testfiles/tdset_idx.ls b/tools/test/h5ls/expected/tdset_idx.ls
index db59632..db59632 100644
--- a/tools/testfiles/tdset_idx.ls
+++ b/tools/test/h5ls/expected/tdset_idx.ls
diff --git a/tools/testfiles/tempty.ls b/tools/test/h5ls/expected/tempty.ls
index a9d1e07..a9d1e07 100644
--- a/tools/testfiles/tempty.ls
+++ b/tools/test/h5ls/expected/tempty.ls
diff --git a/tools/testfiles/textlink-1.ls b/tools/test/h5ls/expected/textlink-1.ls
index a49001f..a49001f 100644
--- a/tools/testfiles/textlink-1.ls
+++ b/tools/test/h5ls/expected/textlink-1.ls
diff --git a/tools/testfiles/textlinksrc-1-old.ls b/tools/test/h5ls/expected/textlinksrc-1-old.ls
index ef26cc4..ef26cc4 100644
--- a/tools/testfiles/textlinksrc-1-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-1-old.ls
diff --git a/tools/testfiles/textlinksrc-1.ls b/tools/test/h5ls/expected/textlinksrc-1.ls
index ef26cc4..ef26cc4 100644
--- a/tools/testfiles/textlinksrc-1.ls
+++ b/tools/test/h5ls/expected/textlinksrc-1.ls
diff --git a/tools/testfiles/textlinksrc-2-old.ls b/tools/test/h5ls/expected/textlinksrc-2-old.ls
index a3044dd..a3044dd 100644
--- a/tools/testfiles/textlinksrc-2-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-2-old.ls
diff --git a/tools/testfiles/textlinksrc-2.ls b/tools/test/h5ls/expected/textlinksrc-2.ls
index a3044dd..a3044dd 100644
--- a/tools/testfiles/textlinksrc-2.ls
+++ b/tools/test/h5ls/expected/textlinksrc-2.ls
diff --git a/tools/testfiles/textlinksrc-3-old.ls b/tools/test/h5ls/expected/textlinksrc-3-old.ls
index 75f3421..75f3421 100644
--- a/tools/testfiles/textlinksrc-3-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-3-old.ls
diff --git a/tools/testfiles/textlinksrc-3.ls b/tools/test/h5ls/expected/textlinksrc-3.ls
index 75f3421..75f3421 100644
--- a/tools/testfiles/textlinksrc-3.ls
+++ b/tools/test/h5ls/expected/textlinksrc-3.ls
diff --git a/tools/testfiles/textlinksrc-4.ls b/tools/test/h5ls/expected/textlinksrc-4.ls
index 449830f..449830f 100644
--- a/tools/testfiles/textlinksrc-4.ls
+++ b/tools/test/h5ls/expected/textlinksrc-4.ls
diff --git a/tools/testfiles/textlinksrc-5.ls b/tools/test/h5ls/expected/textlinksrc-5.ls
index 8cba586..8cba586 100644
--- a/tools/testfiles/textlinksrc-5.ls
+++ b/tools/test/h5ls/expected/textlinksrc-5.ls
diff --git a/tools/testfiles/textlinksrc-6-old.ls b/tools/test/h5ls/expected/textlinksrc-6-old.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-6-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-6-old.ls
diff --git a/tools/testfiles/textlinksrc-6.ls b/tools/test/h5ls/expected/textlinksrc-6.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-6.ls
+++ b/tools/test/h5ls/expected/textlinksrc-6.ls
diff --git a/tools/testfiles/textlinksrc-7-old.ls b/tools/test/h5ls/expected/textlinksrc-7-old.ls
index e9a5a03..e9a5a03 100644
--- a/tools/testfiles/textlinksrc-7-old.ls
+++ b/tools/test/h5ls/expected/textlinksrc-7-old.ls
diff --git a/tools/testfiles/textlinksrc-7.ls b/tools/test/h5ls/expected/textlinksrc-7.ls
index e9a5a03..e9a5a03 100644
--- a/tools/testfiles/textlinksrc-7.ls
+++ b/tools/test/h5ls/expected/textlinksrc-7.ls
diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/textlinksrc-nodangle-1.ls
+++ b/tools/test/h5ls/expected/textlinksrc-nodangle-1.ls
diff --git a/tools/testfiles/textlinksrc-nodangle-2.ls b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls
index ae70721..ae70721 100644
--- a/tools/testfiles/textlinksrc-nodangle-2.ls
+++ b/tools/test/h5ls/expected/textlinksrc-nodangle-2.ls
diff --git a/tools/testfiles/tgroup-1.ls b/tools/test/h5ls/expected/tgroup-1.ls
index 1cf733b..1cf733b 100644
--- a/tools/testfiles/tgroup-1.ls
+++ b/tools/test/h5ls/expected/tgroup-1.ls
diff --git a/tools/testfiles/tgroup-2.ls b/tools/test/h5ls/expected/tgroup-2.ls
index 464d4d7..464d4d7 100644
--- a/tools/testfiles/tgroup-2.ls
+++ b/tools/test/h5ls/expected/tgroup-2.ls
diff --git a/tools/testfiles/tgroup-3.ls b/tools/test/h5ls/expected/tgroup-3.ls
index 959415f..959415f 100644
--- a/tools/testfiles/tgroup-3.ls
+++ b/tools/test/h5ls/expected/tgroup-3.ls
diff --git a/tools/testfiles/tgroup.ls b/tools/test/h5ls/expected/tgroup.ls
index 549b166..549b166 100644
--- a/tools/testfiles/tgroup.ls
+++ b/tools/test/h5ls/expected/tgroup.ls
diff --git a/tools/testfiles/tgrp_comments.ls b/tools/test/h5ls/expected/tgrp_comments.ls
index c36a819..c36a819 100644
--- a/tools/testfiles/tgrp_comments.ls
+++ b/tools/test/h5ls/expected/tgrp_comments.ls
diff --git a/tools/testfiles/tgrpnullspace.ls b/tools/test/h5ls/expected/tgrpnullspace.ls
index 62689c0..62689c0 100644
--- a/tools/testfiles/tgrpnullspace.ls
+++ b/tools/test/h5ls/expected/tgrpnullspace.ls
diff --git a/tools/testfiles/thlink-1.ls b/tools/test/h5ls/expected/thlink-1.ls
index adcd38a..adcd38a 100644
--- a/tools/testfiles/thlink-1.ls
+++ b/tools/test/h5ls/expected/thlink-1.ls
diff --git a/tools/testfiles/thlinks-nodangle-1.ls b/tools/test/h5ls/expected/thlinks-nodangle-1.ls
index adcd38a..adcd38a 100644
--- a/tools/testfiles/thlinks-nodangle-1.ls
+++ b/tools/test/h5ls/expected/thlinks-nodangle-1.ls
diff --git a/tools/testfiles/tloop-1.ls b/tools/test/h5ls/expected/tloop-1.ls
index a68bd3b..a68bd3b 100644
--- a/tools/testfiles/tloop-1.ls
+++ b/tools/test/h5ls/expected/tloop-1.ls
diff --git a/tools/testfiles/tmultifile.ls b/tools/test/h5ls/expected/tmultifile.ls
index 3fee937..3fee937 100644
--- a/tools/testfiles/tmultifile.ls
+++ b/tools/test/h5ls/expected/tmultifile.ls
diff --git a/tools/testfiles/tnestcomp-1.ls b/tools/test/h5ls/expected/tnestcomp-1.ls
index c6342e1..c6342e1 100644
--- a/tools/testfiles/tnestcomp-1.ls
+++ b/tools/test/h5ls/expected/tnestcomp-1.ls
diff --git a/tools/testfiles/tnestcomp-2.ls b/tools/test/h5ls/expected/tnestcomp-2.ls
index 64be630..64be630 100644
--- a/tools/testfiles/tnestcomp-2.ls
+++ b/tools/test/h5ls/expected/tnestcomp-2.ls
diff --git a/tools/testfiles/tnestcomp-3.ls b/tools/test/h5ls/expected/tnestcomp-3.ls
index d9a6a1f..d9a6a1f 100644
--- a/tools/testfiles/tnestcomp-3.ls
+++ b/tools/test/h5ls/expected/tnestcomp-3.ls
diff --git a/tools/testfiles/tnestcomp-4.ls b/tools/test/h5ls/expected/tnestcomp-4.ls
index d937e86..d937e86 100644
--- a/tools/testfiles/tnestcomp-4.ls
+++ b/tools/test/h5ls/expected/tnestcomp-4.ls
diff --git a/tools/testfiles/tsaf.ls b/tools/test/h5ls/expected/tsaf.ls
index c62d6d0..c62d6d0 100644
--- a/tools/testfiles/tsaf.ls
+++ b/tools/test/h5ls/expected/tsaf.ls
diff --git a/tools/testfiles/tslink-1.ls b/tools/test/h5ls/expected/tslink-1.ls
index 7afc8a5..7afc8a5 100644
--- a/tools/testfiles/tslink-1.ls
+++ b/tools/test/h5ls/expected/tslink-1.ls
diff --git a/tools/testfiles/tsoftlinks-1.ls b/tools/test/h5ls/expected/tsoftlinks-1.ls
index d7d98a3..d7d98a3 100644
--- a/tools/testfiles/tsoftlinks-1.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-1.ls
diff --git a/tools/testfiles/tsoftlinks-2.ls b/tools/test/h5ls/expected/tsoftlinks-2.ls
index 52c5265..52c5265 100644
--- a/tools/testfiles/tsoftlinks-2.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-2.ls
diff --git a/tools/testfiles/tsoftlinks-3.ls b/tools/test/h5ls/expected/tsoftlinks-3.ls
index 6b958ac..6b958ac 100644
--- a/tools/testfiles/tsoftlinks-3.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-3.ls
diff --git a/tools/testfiles/tsoftlinks-4.ls b/tools/test/h5ls/expected/tsoftlinks-4.ls
index 092d8a5..092d8a5 100644
--- a/tools/testfiles/tsoftlinks-4.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-4.ls
diff --git a/tools/testfiles/tsoftlinks-5.ls b/tools/test/h5ls/expected/tsoftlinks-5.ls
index cc1f130..cc1f130 100644
--- a/tools/testfiles/tsoftlinks-5.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-5.ls
diff --git a/tools/testfiles/tsoftlinks-nodangle-1.ls b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls
index d7d98a3..d7d98a3 100644
--- a/tools/testfiles/tsoftlinks-nodangle-1.ls
+++ b/tools/test/h5ls/expected/tsoftlinks-nodangle-1.ls
diff --git a/tools/testfiles/tstr-1.ls b/tools/test/h5ls/expected/tstr-1.ls
index 5c68d1a..5c68d1a 100644
--- a/tools/testfiles/tstr-1.ls
+++ b/tools/test/h5ls/expected/tstr-1.ls
diff --git a/tools/testfiles/tudfilter.ls b/tools/test/h5ls/expected/tudfilter.ls
index 1db5fcf..1db5fcf 100644
--- a/tools/testfiles/tudfilter.ls
+++ b/tools/test/h5ls/expected/tudfilter.ls
diff --git a/tools/testfiles/tudlink-1.ls b/tools/test/h5ls/expected/tudlink-1.ls
index 487e4bc..487e4bc 100644
--- a/tools/testfiles/tudlink-1.ls
+++ b/tools/test/h5ls/expected/tudlink-1.ls
diff --git a/tools/testfiles/tvldtypes1.ls b/tools/test/h5ls/expected/tvldtypes1.ls
index 804459e..804459e 100644
--- a/tools/testfiles/tvldtypes1.ls
+++ b/tools/test/h5ls/expected/tvldtypes1.ls
diff --git a/tools/testfiles/tvldtypes2be.ls b/tools/test/h5ls/expected/tvldtypes2be.ls
index 2f7def3..2f7def3 100644
--- a/tools/testfiles/tvldtypes2be.ls
+++ b/tools/test/h5ls/expected/tvldtypes2be.ls
diff --git a/tools/testfiles/tvldtypes2le.ls b/tools/test/h5ls/expected/tvldtypes2le.ls
index f99ad18..f99ad18 100644
--- a/tools/testfiles/tvldtypes2le.ls
+++ b/tools/test/h5ls/expected/tvldtypes2le.ls
diff --git a/tools/testfiles/vds/tvds-1.ls b/tools/test/h5ls/expected/vds/tvds-1.ls
index 61c9e46..61c9e46 100644
--- a/tools/testfiles/vds/tvds-1.ls
+++ b/tools/test/h5ls/expected/vds/tvds-1.ls
diff --git a/tools/testfiles/vds/tvds-2.ls b/tools/test/h5ls/expected/vds/tvds-2.ls
index 49fe05f..49fe05f 100644
--- a/tools/testfiles/vds/tvds-2.ls
+++ b/tools/test/h5ls/expected/vds/tvds-2.ls
diff --git a/tools/testfiles/vds/tvds-3_1.ls b/tools/test/h5ls/expected/vds/tvds-3_1.ls
index fe24002..fe24002 100644
--- a/tools/testfiles/vds/tvds-3_1.ls
+++ b/tools/test/h5ls/expected/vds/tvds-3_1.ls
diff --git a/tools/testfiles/vds/tvds-3_2.ls b/tools/test/h5ls/expected/vds/tvds-3_2.ls
index a4ad84f..a4ad84f 100644
--- a/tools/testfiles/vds/tvds-3_2.ls
+++ b/tools/test/h5ls/expected/vds/tvds-3_2.ls
diff --git a/tools/testfiles/vds/tvds-4.ls b/tools/test/h5ls/expected/vds/tvds-4.ls
index 176529b..176529b 100644
--- a/tools/testfiles/vds/tvds-4.ls
+++ b/tools/test/h5ls/expected/vds/tvds-4.ls
diff --git a/tools/testfiles/vds/tvds-5.ls b/tools/test/h5ls/expected/vds/tvds-5.ls
index 5f98e84..5f98e84 100644
--- a/tools/testfiles/vds/tvds-5.ls
+++ b/tools/test/h5ls/expected/vds/tvds-5.ls
diff --git a/tools/test/h5ls/h5ls_plugin.sh.in b/tools/test/h5ls/h5ls_plugin.sh.in
index 02e0cf7..3408876 100644
--- a/tools/test/h5ls/h5ls_plugin.sh.in
+++ b/tools/test/h5ls/h5ls_plugin.sh.in
@@ -45,8 +45,9 @@ AWK='awk'
 SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TESTDIR=./testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -61,8 +62,8 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_TOOLS_TESTFILES/tudfilter.h5
-$SRC_TOOLS_TESTFILES/tudfilter.ls
+$SRC_H5DUMP_TESTFILES/tudfilter.h5
+$SRC_H5LS_OUTFILES/tudfilter.ls
 "
 
 # RUNSERIAL is used. Check if it can return exit code from executable correctly.
diff --git a/tools/testfiles/tdset_idx.h5 b/tools/test/h5ls/testfiles/tdset_idx.h5
index b31d5c3..b31d5c3 100644
--- a/tools/testfiles/tdset_idx.h5
+++ b/tools/test/h5ls/testfiles/tdset_idx.h5
diff --git a/tools/test/h5ls/testh5ls.sh.in b/tools/test/h5ls/testh5ls.sh.in
index 9b0e5cb..fc6daab 100644
--- a/tools/test/h5ls/testh5ls.sh.in
+++ b/tools/test/h5ls/testh5ls.sh.in
@@ -41,11 +41,10 @@ h5haveexitcode=yes      # default is yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
@@ -53,6 +52,7 @@ SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
 SRC_H5LS_ERRFILES="$SRC_TOOLS/test/h5ls/errfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -67,29 +67,29 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_H5LS_TESTFILES/tall.h5
-$SRC_H5LS_TESTFILES/tarray1.h5
-$SRC_H5LS_TESTFILES/tattr2.h5
-$SRC_H5LS_TESTFILES/tattrreg.h5
-$SRC_H5LS_TESTFILES/tcompound.h5
-$SRC_H5LS_TESTFILES/tdatareg.h5
-$SRC_H5LS_TESTFILES/tdset.h5
-$SRC_H5LS_TESTFILES/tempty.h5
-$SRC_H5LS_TESTFILES/textlink.h5
-$SRC_H5LS_TESTFILES/textlinksrc.h5
-$SRC_H5LS_TESTFILES/textlinktar.h5
-$SRC_H5LS_TESTFILES/tgroup.h5
-$SRC_H5LS_TESTFILES/tgrp_comments.h5
-$SRC_H5LS_TESTFILES/tgrpnullspace.h5
-$SRC_H5LS_TESTFILES/thlink.h5
-$SRC_H5LS_TESTFILES/tloop.h5
-$SRC_H5LS_TESTFILES/tnestedcomp.h5
-$SRC_H5LS_TESTFILES/tsaf.h5
-$SRC_H5LS_TESTFILES/tslink.h5
-$SRC_H5LS_TESTFILES/tsoftlinks.h5
-$SRC_H5LS_TESTFILES/tstr.h5
-$SRC_H5LS_TESTFILES/tudlink.h5
-$SRC_H5LS_TESTFILES/tvldtypes1.h5
+$SRC_H5DUMP_TESTFILES/tall.h5
+$SRC_H5DUMP_TESTFILES/tarray1.h5
+$SRC_H5DUMP_TESTFILES/tattr2.h5
+$SRC_H5DUMP_TESTFILES/tattrreg.h5
+$SRC_H5DUMP_TESTFILES/tcompound.h5
+$SRC_H5DUMP_TESTFILES/tdatareg.h5
+$SRC_H5DUMP_TESTFILES/tdset.h5
+$SRC_H5DUMP_TESTFILES/tempty.h5
+$SRC_H5DUMP_TESTFILES/textlink.h5
+$SRC_H5DUMP_TESTFILES/textlinksrc.h5
+$SRC_H5DUMP_TESTFILES/textlinktar.h5
+$SRC_H5DUMP_TESTFILES/tgroup.h5
+$SRC_H5DUMP_TESTFILES/tgrp_comments.h5
+$SRC_H5DUMP_TESTFILES/tgrpnullspace.h5
+$SRC_H5DUMP_TESTFILES/thlink.h5
+$SRC_H5DUMP_TESTFILES/tloop.h5
+$SRC_H5DUMP_TESTFILES/tnestedcomp.h5
+$SRC_H5DUMP_TESTFILES/tsaf.h5
+$SRC_H5DUMP_TESTFILES/tslink.h5
+$SRC_H5DUMP_TESTFILES/tsoftlinks.h5
+$SRC_H5DUMP_TESTFILES/tstr.h5
+$SRC_H5DUMP_TESTFILES/tudlink.h5
+$SRC_H5DUMP_TESTFILES/tvldtypes1.h5
 $SRC_H5LS_TESTFILES/tdset_idx.h5
 "
 
@@ -100,64 +100,64 @@ $SRC_H5LS_ERRFILES/tgroup-1.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5LS_TESTFILES/help-1.ls
-$SRC_H5LS_TESTFILES/help-2.ls
-$SRC_H5LS_TESTFILES/help-3.ls
-$SRC_H5LS_TESTFILES/nosuchfile.ls
-$SRC_H5LS_TESTFILES/tall-1.ls
-$SRC_H5LS_TESTFILES/tall-2.ls
-$SRC_H5LS_TESTFILES/tarray1.ls
-$SRC_H5LS_TESTFILES/tattr2.ls
-$SRC_H5LS_TESTFILES/tattrreg_le.ls
-$SRC_H5LS_TESTFILES/tattrreg_be.ls
-$SRC_H5LS_TESTFILES/tcomp-1.ls
-$SRC_H5LS_TESTFILES/tdataregbe.ls
-$SRC_H5LS_TESTFILES/tdataregle.ls
-$SRC_H5LS_TESTFILES/tdset-1.ls
-$SRC_H5LS_TESTFILES/tempty.ls
-$SRC_H5LS_TESTFILES/textlink-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-2.ls
-$SRC_H5LS_TESTFILES/textlinksrc-3.ls
-$SRC_H5LS_TESTFILES/textlinksrc-4.ls
-$SRC_H5LS_TESTFILES/textlinksrc-5.ls
-$SRC_H5LS_TESTFILES/textlinksrc-6.ls
-$SRC_H5LS_TESTFILES/textlinksrc-7.ls
-$SRC_H5LS_TESTFILES/textlinksrc-1-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-2-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-3-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-6-old.ls
-$SRC_H5LS_TESTFILES/textlinksrc-7-old.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-1.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-2.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-3.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-4.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-5.ls
-$SRC_H5LS_TESTFILES/textlinksrc-nodangle-1.ls
-$SRC_H5LS_TESTFILES/textlinksrc-nodangle-2.ls
-$SRC_H5LS_TESTFILES/tgrp_comments.ls
-$SRC_H5LS_TESTFILES/tsoftlinks-nodangle-1.ls
-$SRC_H5LS_TESTFILES/thlinks-nodangle-1.ls
-$SRC_H5LS_TESTFILES/tgroup.ls
-$SRC_H5LS_TESTFILES/tgroup-1.ls
-$SRC_H5LS_TESTFILES/tgroup-2.ls
-$SRC_H5LS_TESTFILES/tgroup-3.ls
-$SRC_H5LS_TESTFILES/tgrpnullspace.ls
-$SRC_H5LS_TESTFILES/thlink-1.ls
-$SRC_H5LS_TESTFILES/tloop-1.ls
-$SRC_H5LS_TESTFILES/tmultifile.ls
-$SRC_H5LS_TESTFILES/tnestcomp-1.ls
-$SRC_H5LS_TESTFILES/tnestcomp-2.ls
-$SRC_H5LS_TESTFILES/tnestcomp-3.ls
-$SRC_H5LS_TESTFILES/tnestcomp-4.ls
-$SRC_H5LS_TESTFILES/tsaf.ls
-$SRC_H5LS_TESTFILES/tslink-1.ls
-$SRC_H5LS_TESTFILES/tstr-1.ls
-$SRC_H5LS_TESTFILES/tudlink-1.ls
-$SRC_H5LS_TESTFILES/tvldtypes1.ls
-$SRC_H5LS_TESTFILES/tvldtypes2le.ls
-$SRC_H5LS_TESTFILES/tvldtypes2be.ls
-$SRC_H5LS_TESTFILES/tdset_idx.ls
+$SRC_H5LS_OUTFILES/help-1.ls
+$SRC_H5LS_OUTFILES/help-2.ls
+$SRC_H5LS_OUTFILES/help-3.ls
+$SRC_H5LS_OUTFILES/nosuchfile.ls
+$SRC_H5LS_OUTFILES/tall-1.ls
+$SRC_H5LS_OUTFILES/tall-2.ls
+$SRC_H5LS_OUTFILES/tarray1.ls
+$SRC_H5LS_OUTFILES/tattr2.ls
+$SRC_H5LS_OUTFILES/tattrreg_le.ls
+$SRC_H5LS_OUTFILES/tattrreg_be.ls
+$SRC_H5LS_OUTFILES/tcomp-1.ls
+$SRC_H5LS_OUTFILES/tdataregbe.ls
+$SRC_H5LS_OUTFILES/tdataregle.ls
+$SRC_H5LS_OUTFILES/tdset-1.ls
+$SRC_H5LS_OUTFILES/tempty.ls
+$SRC_H5LS_OUTFILES/textlink-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-2.ls
+$SRC_H5LS_OUTFILES/textlinksrc-3.ls
+$SRC_H5LS_OUTFILES/textlinksrc-4.ls
+$SRC_H5LS_OUTFILES/textlinksrc-5.ls
+$SRC_H5LS_OUTFILES/textlinksrc-6.ls
+$SRC_H5LS_OUTFILES/textlinksrc-7.ls
+$SRC_H5LS_OUTFILES/textlinksrc-1-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-2-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-3-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-6-old.ls
+$SRC_H5LS_OUTFILES/textlinksrc-7-old.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-1.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-2.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-3.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-4.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-5.ls
+$SRC_H5LS_OUTFILES/textlinksrc-nodangle-1.ls
+$SRC_H5LS_OUTFILES/textlinksrc-nodangle-2.ls
+$SRC_H5LS_OUTFILES/tgrp_comments.ls
+$SRC_H5LS_OUTFILES/tsoftlinks-nodangle-1.ls
+$SRC_H5LS_OUTFILES/thlinks-nodangle-1.ls
+$SRC_H5LS_OUTFILES/tgroup.ls
+$SRC_H5LS_OUTFILES/tgroup-1.ls
+$SRC_H5LS_OUTFILES/tgroup-2.ls
+$SRC_H5LS_OUTFILES/tgroup-3.ls
+$SRC_H5LS_OUTFILES/tgrpnullspace.ls
+$SRC_H5LS_OUTFILES/thlink-1.ls
+$SRC_H5LS_OUTFILES/tloop-1.ls
+$SRC_H5LS_OUTFILES/tmultifile.ls
+$SRC_H5LS_OUTFILES/tnestcomp-1.ls
+$SRC_H5LS_OUTFILES/tnestcomp-2.ls
+$SRC_H5LS_OUTFILES/tnestcomp-3.ls
+$SRC_H5LS_OUTFILES/tnestcomp-4.ls
+$SRC_H5LS_OUTFILES/tsaf.ls
+$SRC_H5LS_OUTFILES/tslink-1.ls
+$SRC_H5LS_OUTFILES/tstr-1.ls
+$SRC_H5LS_OUTFILES/tudlink-1.ls
+$SRC_H5LS_OUTFILES/tvldtypes1.ls
+$SRC_H5LS_OUTFILES/tvldtypes2le.ls
+$SRC_H5LS_OUTFILES/tvldtypes2be.ls
+$SRC_H5LS_OUTFILES/tdset_idx.ls
 "
 
 
diff --git a/tools/test/h5ls/testh5lsvds.sh.in b/tools/test/h5ls/testh5lsvds.sh.in
index beba73f..2408ee2 100644
--- a/tools/test/h5ls/testh5lsvds.sh.in
+++ b/tools/test/h5ls/testh5lsvds.sh.in
@@ -38,17 +38,17 @@ h5haveexitcode=yes      # default is yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5LS_OUTFILES="$SRC_TOOLS/test/h5ls/expected"
 
 TEST_P_DIR=./testfiles
 TESTDIR=./testfiles/vds
@@ -65,38 +65,38 @@ test -d $TESTDIR || mkdir $TESTDIR
 #       Comment '#' without space can be used.
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
-$SRC_H5LS_TESTFILES/vds/1_a.h5
-$SRC_H5LS_TESTFILES/vds/1_b.h5
-$SRC_H5LS_TESTFILES/vds/1_c.h5
-$SRC_H5LS_TESTFILES/vds/1_d.h5
-$SRC_H5LS_TESTFILES/vds/1_e.h5
-$SRC_H5LS_TESTFILES/vds/1_f.h5
-$SRC_H5LS_TESTFILES/vds/1_vds.h5
-$SRC_H5LS_TESTFILES/vds/2_a.h5
-$SRC_H5LS_TESTFILES/vds/2_b.h5
-$SRC_H5LS_TESTFILES/vds/2_c.h5
-$SRC_H5LS_TESTFILES/vds/2_d.h5
-$SRC_H5LS_TESTFILES/vds/2_e.h5
-$SRC_H5LS_TESTFILES/vds/2_vds.h5
-$SRC_H5LS_TESTFILES/vds/3_1_vds.h5
-$SRC_H5LS_TESTFILES/vds/3_2_vds.h5
-$SRC_H5LS_TESTFILES/vds/4_0.h5
-$SRC_H5LS_TESTFILES/vds/4_1.h5
-$SRC_H5LS_TESTFILES/vds/4_2.h5
-$SRC_H5LS_TESTFILES/vds/4_vds.h5
-$SRC_H5LS_TESTFILES/vds/5_a.h5
-$SRC_H5LS_TESTFILES/vds/5_b.h5
-$SRC_H5LS_TESTFILES/vds/5_c.h5
-$SRC_H5LS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5LS_TESTFILES/vds/tvds-1.ls
-$SRC_H5LS_TESTFILES/vds/tvds-2.ls
-$SRC_H5LS_TESTFILES/vds/tvds-3_1.ls
-$SRC_H5LS_TESTFILES/vds/tvds-3_2.ls
-$SRC_H5LS_TESTFILES/vds/tvds-4.ls
-$SRC_H5LS_TESTFILES/vds/tvds-5.ls
+$SRC_H5LS_OUTFILES/vds/tvds-1.ls
+$SRC_H5LS_OUTFILES/vds/tvds-2.ls
+$SRC_H5LS_OUTFILES/vds/tvds-3_1.ls
+$SRC_H5LS_OUTFILES/vds/tvds-3_2.ls
+$SRC_H5LS_OUTFILES/vds/tvds-4.ls
+$SRC_H5LS_OUTFILES/vds/tvds-5.ls
 "
 
 
diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index bd2cb9b..5c41254 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -19,203 +19,224 @@
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the source directory into the test directory
   # --------------------------------------------------------------------
-  set (LIST_HDF5_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/bounds_latest_latest.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_attr_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_deflate.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_early.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_ext.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_f32le_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fill.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fletcher.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_hlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_1d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_2d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_int32le_3d_ex.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layouto.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout2.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout3.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_named_dtypes.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nested_8bit_enum_deflated.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-17432.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_CVE-2018-14460.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_nbit.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_objs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_refs.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_shuffle.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_soffset.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_szip.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-0.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-1.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-2.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex-3.dat
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_uint8be_ex.h5
+  set (LIST_REPACK_TEST_FILES
+      bounds_latest_latest.h5
+      h5repack_attr.h5
+      h5repack_attr_refs.h5
+      h5repack_deflate.h5
+      h5repack_early.h5
+      h5repack_ext.h5
+      h5repack_f32le.h5
+      h5repack_f32le_ex-0.dat
+      h5repack_f32le_ex.h5
+      h5repack_fill.h5
+      h5repack_filters.h5
+      h5repack_fletcher.h5
+      h5repack_hlink.h5
+      h5repack_int32le_1d.h5
+      h5repack_int32le_1d_ex-0.dat
+      h5repack_int32le_1d_ex-1.dat
+      h5repack_int32le_1d_ex.h5
+      h5repack_int32le_2d.h5
+      h5repack_int32le_2d_ex-0.dat
+      h5repack_int32le_2d_ex.h5
+      h5repack_int32le_3d.h5
+      h5repack_int32le_3d_ex-0.dat
+      h5repack_int32le_3d_ex.h5
+      h5repack_layout.h5
+      h5repack_layouto.h5
+      h5repack_layout2.h5
+      h5repack_layout3.h5
+      h5repack_layout.UD.h5
+      h5repack_named_dtypes.h5
+      h5repack_nested_8bit_enum.h5
+      h5repack_nested_8bit_enum_deflated.h5
+      h5repack_CVE-2018-17432.h5
+      h5repack_CVE-2018-14460.h5
+      h5repack_nbit.h5
+      h5repack_objs.h5
+      h5repack_refs.h5
+      h5repack_shuffle.h5
+      h5repack_soffset.h5
+      h5repack_szip.h5
+      h5repack_uint8be.h5
+      h5repack_uint8be_ex-0.dat
+      h5repack_uint8be_ex-1.dat
+      h5repack_uint8be_ex-2.dat
+      h5repack_uint8be_ex-3.dat
+      h5repack_uint8be_ex.h5
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_paged_persist.h5
-      # h5diff/testfile
-      ${HDF5_TOOLS_TEST_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr1.h5
+      h5repack_aggr.h5
+      h5repack_fsm_aggr_nopersist.h5
+      h5repack_fsm_aggr_persist.h5
+      h5repack_none.h5
+      h5repack_paged_nopersist.h5
+      h5repack_paged_persist.h5
+  )
+  # h5diff/testfile
+  set (LIST_DIFF_TEST_FILES
+      h5diff_attr1.h5
+  )
+  # tools/testfiles/vds
+  set (LIST_VDS_TEST_FILES
+      1_a.h5
+      1_b.h5
+      1_c.h5
+      1_d.h5
+      1_e.h5
+      1_f.h5
+      1_vds.h5
+      2_a.h5
+      2_b.h5
+      2_c.h5
+      2_d.h5
+      2_e.h5
+      2_vds.h5
+      3_1_vds.h5
+      3_2_vds.h5
+      4_0.h5
+      4_1.h5
+      4_2.h5
+      4_vds.h5
+      5_a.h5
+      5_b.h5
+      5_c.h5
+      5_vds.h5
+  )
+  set (LIST_COPY_TEST_FILES
+      h5copy_extlinks_src.h5
+      h5copy_extlinks_trg.h5
+  )
+  set (LIST_HDF5_TEST_FILES
       # tools/testfiles for external links
-      ${HDF5_TOOLS_DIR}/testfiles/tsoftlinks.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinkfar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinksrc.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlinktar.h5
-      ${HDF5_TOOLS_DIR}/testfiles/textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_trg.h5
+      tsoftlinks.h5
+      textlinkfar.h5
+      textlinksrc.h5
+      textlinktar.h5
+      textlink.h5
       # tools/testfiles
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00000.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00001.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00002.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00003.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00004.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00005.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00006.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00007.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00008.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00009.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tfamily00010.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tordergr.h5
+      tfamily00000.h5
+      tfamily00001.h5
+      tfamily00002.h5
+      tfamily00003.h5
+      tfamily00004.h5
+      tfamily00005.h5
+      tfamily00006.h5
+      tfamily00007.h5
+      tfamily00008.h5
+      tfamily00009.h5
+      tfamily00010.h5
+      tordergr.h5
       # reference conversion files
-      ${HDF5_TOOLS_DIR}/testfiles/tattrreg.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tdatareg.h5
-      # tools/testfiles/vds
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_f.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_e.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_1_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/3_2_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_0.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_1.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_2.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/4_vds.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_a.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_b.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_c.h5
-      ${HDF5_TOOLS_DIR}/testfiles/vds/5_vds.h5
+      tattrreg.h5
+      tdatareg.h5
       # tools/testfiles onion VFD files
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_1d.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_dset_ext.h5.onion
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5
-      ${HDF5_TOOLS_DIR}/testfiles/tst_onion_objs.h5.onion
+      tst_onion_dset_1d.h5
+      tst_onion_dset_1d.h5.onion
+      tst_onion_dset_ext.h5
+      tst_onion_dset_ext.h5.onion
+      tst_onion_objs.h5
+      tst_onion_objs.h5.onion
   )
 
   set (LIST_OTHER_TEST_FILES
-      h5repack-help.txt
       h5repack_ext.bin
       h5repack.info
       ublock.bin
   )
 
   set (LIST_TST_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_filters.h5-gzip_verbose_filters
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_version_test.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_zero.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/plugin_none.h5repack_layout.UD.h5
+      h5repack-help.txt
+      h5repack_filters.h5-gzip_verbose_filters.tst
+      h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+      plugin_test.h5repack_layout.h5.tst
+      plugin_version_test.h5repack_layout.h5.tst
+      plugin_zero.h5repack_layout.h5.tst
+      plugin_none.h5repack_layout.UD.h5.tst
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-merge.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-merge.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-merge.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-merge.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-merge.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5
+      tsoftlinks-merge.tsoftlinks.h5.tst
+      textlinkfar-merge.textlinkfar.h5.tst
+      textlinksrc-merge.textlinksrc.h5.tst
+      textlinktar-merge.textlinktar.h5.tst
+      textlink-merge.textlink.h5.tst
+      h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
   )
 
   set (LIST_DDL_TEST_FILES
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/crtorder.tordergr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/deflate_limit.h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_version_test
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.h5-plugin_zero
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5repack_layout.UD.h5-plugin_none
+      crtorder.tordergr.h5.ddl
+      deflate_limit.h5repack_layout.h5.ddl
+      h5repack_layout.h5.ddl
+      h5repack_layout.h5-plugin_test.ddl
+      h5repack_layout.h5-plugin_version_test.ddl
+      h5repack_layout.h5-plugin_zero.ddl
+      h5repack_layout.UD.h5-plugin_none.ddl
       # fsm
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/STG.h5repack_none.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SPT.h5repack_aggr.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_fsm_aggr_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/S.h5repack_fsm_aggr_persist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/GS.h5repack_paged_nopersist.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/SP.h5repack_paged_persist.h5
+      STG.h5repack_none.h5.ddl
+      SPT.h5repack_aggr.h5.ddl
+      SP.h5repack_fsm_aggr_nopersist.h5.ddl
+      S.h5repack_fsm_aggr_persist.h5.ddl
+      GS.h5repack_paged_nopersist.h5.ddl
+      SP.h5repack_paged_persist.h5.ddl
       # vds
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/2_vds.h5-vds_chunk3x6x9-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/3_1_vds.h5-vds_chunk2x5x8-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_compa-v
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/4_vds.h5-vds_conti-v
+      1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+      2_vds.h5-vds_chunk3x6x9-v.ddl
+      3_1_vds.h5-vds_chunk2x5x8-v.ddl
+      4_vds.h5-vds_compa-v.ddl
+      4_vds.h5-vds_conti-v.ddl
       # refs
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/attrregion.tattrreg.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/dataregion.tdatareg.h5
+      attrregion.tattrreg.h5.ddl
+      dataregion.tdatareg.h5.ddl
       # tools/testfiles for external links
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-base.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-base.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-base.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-base.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-base.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-prune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-prune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-prune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-prune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-prune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinkfar-mergeprune.textlinkfar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinksrc-mergeprune.textlinksrc.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlinktar-mergeprune.textlinktar.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/textlink-mergeprune.textlink.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5
-      ${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5
+      textlinkfar-base.textlinkfar.h5.ddl
+      textlinksrc-base.textlinksrc.h5.ddl
+      textlinktar-base.textlinktar.h5.ddl
+      textlink-base.textlink.h5.ddl
+      tsoftlinks-base.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+      textlinkfar-prune.textlinkfar.h5.ddl
+      textlinksrc-prune.textlinksrc.h5.ddl
+      textlinktar-prune.textlinktar.h5.ddl
+      textlink-prune.textlink.h5.ddl
+      tsoftlinks-prune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+      textlinkfar-mergeprune.textlinkfar.h5.ddl
+      textlinksrc-mergeprune.textlinksrc.h5.ddl
+      textlinktar-mergeprune.textlinktar.h5.ddl
+      textlink-mergeprune.textlink.h5.ddl
+      tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+      h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
   )
 
+  foreach (h5_file ${LIST_REPACK_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_COPY_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5copy/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_DIFF_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5diff/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
+  foreach (h5_file ${LIST_VDS_TEST_FILES})
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/vds/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+  endforeach ()
+
   foreach (h5_file ${LIST_HDF5_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${fname}" "h5repack_files")
+    HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_OTHER_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5REPACK_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_TST_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.tst" "${PROJECT_BINARY_DIR}/testfiles/${fname}.tst" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
 
   foreach (h5_file ${LIST_DDL_TEST_FILES})
-    get_filename_component(fname "${h5_file}" NAME)
-    HDFTEST_COPY_FILE("${h5_file}.ddl" "${PROJECT_BINARY_DIR}/testfiles/${fname}.ddl" "h5repack_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5repack_files")
   endforeach ()
   add_custom_target(h5repack_files ALL COMMENT "Copying files needed by h5repack tests" DEPENDS ${h5repack_files_list})
 
diff --git a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
index fab9494..fab9494 100644
--- a/tools/test/h5repack/testfiles/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+++ b/tools/test/h5repack/expected/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
diff --git a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
index 51df9dd..51df9dd 100644
--- a/tools/test/h5repack/testfiles/2_vds.h5-vds_chunk3x6x9-v.ddl
+++ b/tools/test/h5repack/expected/2_vds.h5-vds_chunk3x6x9-v.ddl
diff --git a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
index dcd172c..dcd172c 100644
--- a/tools/test/h5repack/testfiles/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+++ b/tools/test/h5repack/expected/3_1_vds.h5-vds_chunk2x5x8-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
index 1e8927c..1e8927c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_compa-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_compa-v.ddl
diff --git a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
index 54bf26c..54bf26c 100644
--- a/tools/test/h5repack/testfiles/4_vds.h5-vds_conti-v.ddl
+++ b/tools/test/h5repack/expected/4_vds.h5-vds_conti-v.ddl
diff --git a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
index d8ca992..d8ca992 100644
--- a/tools/test/h5repack/testfiles/GS.h5repack_paged_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/GS.h5repack_paged_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
index 87ccbc4..87ccbc4 100644
--- a/tools/test/h5repack/testfiles/S.h5repack_fsm_aggr_persist.h5.ddl
+++ b/tools/test/h5repack/expected/S.h5repack_fsm_aggr_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
index e78c5e2..e78c5e2 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_fsm_aggr_nopersist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
index 1084090..1084090 100644
--- a/tools/test/h5repack/testfiles/SP.h5repack_paged_persist.h5.ddl
+++ b/tools/test/h5repack/expected/SP.h5repack_paged_persist.h5.ddl
diff --git a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
index 3ecf9b1..3ecf9b1 100644
--- a/tools/test/h5repack/testfiles/SPT.h5repack_aggr.h5.ddl
+++ b/tools/test/h5repack/expected/SPT.h5repack_aggr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
index 51cd7e5..51cd7e5 100644
--- a/tools/test/h5repack/testfiles/STG.h5repack_none.h5.ddl
+++ b/tools/test/h5repack/expected/STG.h5repack_none.h5.ddl
diff --git a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
index 7cab02b..7cab02b 100644
--- a/tools/test/h5repack/testfiles/attrregion.tattrreg.h5.ddl
+++ b/tools/test/h5repack/expected/attrregion.tattrreg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
index 870d154..870d154 100644
--- a/tools/test/h5repack/testfiles/crtorder.tordergr.h5.ddl
+++ b/tools/test/h5repack/expected/crtorder.tordergr.h5.ddl
diff --git a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
index bd31118..bd31118 100644
--- a/tools/test/h5repack/testfiles/dataregion.tdatareg.h5.ddl
+++ b/tools/test/h5repack/expected/dataregion.tdatareg.h5.ddl
diff --git a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
index 75f54fa..75f54fa 100644
--- a/tools/test/h5repack/testfiles/deflate_limit.h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/deflate_limit.h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
index 52f215d..52f215d 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
index ad8a320..ad8a320 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
index b7d7bca..b7d7bca 100644
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+++ b/tools/test/h5repack/expected/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack-help.txt b/tools/test/h5repack/expected/h5repack-help.txt
index bff70af..bff70af 100644
--- a/tools/test/h5repack/testfiles/h5repack-help.txt
+++ b/tools/test/h5repack/expected/h5repack-help.txt
diff --git a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
index cb12172..cb12172 100644
--- a/tools/test/h5repack/testfiles/h5repack_filters.h5-gzip_verbose_filters.tst
+++ b/tools/test/h5repack/expected/h5repack_filters.h5-gzip_verbose_filters.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
index 66c4c69..66c4c69 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.UD.h5-plugin_none.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.UD.h5-plugin_none.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 3d9f0c2..3d9f0c2 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
index a8b4562..a8b4562 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
index f42d333..f42d333 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
index e4ffaf1..e4ffaf1 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_zero.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5-plugin_zero.ddl
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
index 00c74f4..00c74f4 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5.ddl
+++ b/tools/test/h5repack/expected/h5repack_layout.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
index 06ecf1a..06ecf1a 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_1d.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_1d.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
index 39c1900..39c1900 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_dset_ext.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_dset_ext.h5.ddl
diff --git a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
index fa4ab4f..fa4ab4f 100644
--- a/tools/test/h5repack/testfiles/onion.tst_onion_objs.h5.ddl
+++ b/tools/test/h5repack/expected/onion.tst_onion_objs.h5.ddl
diff --git a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
index 30aa8ad..30aa8ad 100644
--- a/tools/test/h5repack/testfiles/plugin_none.h5repack_layout.UD.h5.tst
+++ b/tools/test/h5repack/expected/plugin_none.h5repack_layout.UD.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
index 62ea1cc..62ea1cc 100644
--- a/tools/test/h5repack/testfiles/plugin_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
index f5c4736..f5c4736 100644
--- a/tools/test/h5repack/testfiles/plugin_version_test.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_version_test.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
index 54c873c..54c873c 100644
--- a/tools/test/h5repack/testfiles/plugin_zero.h5repack_layout.h5.tst
+++ b/tools/test/h5repack/expected/plugin_zero.h5repack_layout.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
index b87a17d..b87a17d 100644
--- a/tools/test/h5repack/testfiles/textlink-base.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-base.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
index a7ff71d..a7ff71d 100644
--- a/tools/test/h5repack/testfiles/textlink-merge.textlink.h5.tst
+++ b/tools/test/h5repack/expected/textlink-merge.textlink.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
index 7206ae9..7206ae9 100644
--- a/tools/test/h5repack/testfiles/textlink-mergeprune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-mergeprune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
index 83db344..83db344 100644
--- a/tools/test/h5repack/testfiles/textlink-prune.textlink.h5.ddl
+++ b/tools/test/h5repack/expected/textlink-prune.textlink.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
index a5eb497..a5eb497 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-base.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-base.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
index 6673d39..6673d39 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-merge.textlinkfar.h5.tst
+++ b/tools/test/h5repack/expected/textlinkfar-merge.textlinkfar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
index 7ba3308..7ba3308 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-mergeprune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-mergeprune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
index 30f8f1b..30f8f1b 100644
--- a/tools/test/h5repack/testfiles/textlinkfar-prune.textlinkfar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinkfar-prune.textlinkfar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
index 9a9a9aa..9a9a9aa 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-base.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-base.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
index d5a5902..d5a5902 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-merge.textlinksrc.h5.tst
+++ b/tools/test/h5repack/expected/textlinksrc-merge.textlinksrc.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
index 5b3c740..5b3c740 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-mergeprune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-mergeprune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
index 65d35ef..65d35ef 100644
--- a/tools/test/h5repack/testfiles/textlinksrc-prune.textlinksrc.h5.ddl
+++ b/tools/test/h5repack/expected/textlinksrc-prune.textlinksrc.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
index 3f02ff2..3f02ff2 100644
--- a/tools/test/h5repack/testfiles/textlinktar-base.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-base.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
index ccf4f7b..ccf4f7b 100644
--- a/tools/test/h5repack/testfiles/textlinktar-merge.textlinktar.h5.tst
+++ b/tools/test/h5repack/expected/textlinktar-merge.textlinktar.h5.tst
diff --git a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
index c52e34d..c52e34d 100644
--- a/tools/test/h5repack/testfiles/textlinktar-mergeprune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-mergeprune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
index 6787784..6787784 100644
--- a/tools/test/h5repack/testfiles/textlinktar-prune.textlinktar.h5.ddl
+++ b/tools/test/h5repack/expected/textlinktar-prune.textlinktar.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
index b0cd32d..b0cd32d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-base.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-base.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
index 27c33d7..27c33d7 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-merge.tsoftlinks.h5.tst
+++ b/tools/test/h5repack/expected/tsoftlinks-merge.tsoftlinks.h5.tst
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
index fa4e12d..fa4e12d 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
index de58ef2..de58ef2 100644
--- a/tools/test/h5repack/testfiles/tsoftlinks-prune.tsoftlinks.h5.ddl
+++ b/tools/test/h5repack/expected/tsoftlinks-prune.tsoftlinks.h5.ddl
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index 9b58965..f3b8d3e 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -56,17 +56,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=./testpack
 test -d $TESTDIR || mkdir $TESTDIR
@@ -127,62 +127,62 @@ $SRC_H5DIFF_TESTFILES/h5diff_attr1.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-17432.h5
 $SRC_H5REPACK_TESTFILES/h5repack_CVE-2018-14460.h5
 ########tools/testfiles#for#external#links########
-$SRC_TOOLS_TESTFILES/tsoftlinks.h5
-$SRC_TOOLS_TESTFILES/textlinkfar.h5
-$SRC_TOOLS_TESTFILES/textlinksrc.h5
-$SRC_TOOLS_TESTFILES/textlinktar.h5
-$SRC_TOOLS_TESTFILES/textlink.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src.h5
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_trg.h5
+$SRC_H5DUMP_TESTFILES/tsoftlinks.h5
+$SRC_H5DUMP_TESTFILES/textlinkfar.h5
+$SRC_H5DUMP_TESTFILES/textlinksrc.h5
+$SRC_H5DUMP_TESTFILES/textlinktar.h5
+$SRC_H5DUMP_TESTFILES/textlink.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_src.h5
+$SRC_H5COPY_TESTFILES/h5copy_extlinks_trg.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tfamily00000.h5
-$SRC_TOOLS_TESTFILES/tfamily00001.h5
-$SRC_TOOLS_TESTFILES/tfamily00002.h5
-$SRC_TOOLS_TESTFILES/tfamily00003.h5
-$SRC_TOOLS_TESTFILES/tfamily00004.h5
-$SRC_TOOLS_TESTFILES/tfamily00005.h5
-$SRC_TOOLS_TESTFILES/tfamily00006.h5
-$SRC_TOOLS_TESTFILES/tfamily00007.h5
-$SRC_TOOLS_TESTFILES/tfamily00008.h5
-$SRC_TOOLS_TESTFILES/tfamily00009.h5
-$SRC_TOOLS_TESTFILES/tfamily00010.h5
-$SRC_TOOLS_TESTFILES/tordergr.h5
+$SRC_H5DUMP_TESTFILES/tfamily00000.h5
+$SRC_H5DUMP_TESTFILES/tfamily00001.h5
+$SRC_H5DUMP_TESTFILES/tfamily00002.h5
+$SRC_H5DUMP_TESTFILES/tfamily00003.h5
+$SRC_H5DUMP_TESTFILES/tfamily00004.h5
+$SRC_H5DUMP_TESTFILES/tfamily00005.h5
+$SRC_H5DUMP_TESTFILES/tfamily00006.h5
+$SRC_H5DUMP_TESTFILES/tfamily00007.h5
+$SRC_H5DUMP_TESTFILES/tfamily00008.h5
+$SRC_H5DUMP_TESTFILES/tfamily00009.h5
+$SRC_H5DUMP_TESTFILES/tfamily00010.h5
+$SRC_H5DUMP_TESTFILES/tordergr.h5
 ########reference#conversion#files########
 ########tools/testfiles/vds########
-$SRC_TOOLS_TESTFILES/vds/1_a.h5
-$SRC_TOOLS_TESTFILES/vds/1_b.h5
-$SRC_TOOLS_TESTFILES/vds/1_c.h5
-$SRC_TOOLS_TESTFILES/vds/1_d.h5
-$SRC_TOOLS_TESTFILES/vds/1_e.h5
-$SRC_TOOLS_TESTFILES/vds/1_f.h5
-$SRC_TOOLS_TESTFILES/vds/1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/2_a.h5
-$SRC_TOOLS_TESTFILES/vds/2_b.h5
-$SRC_TOOLS_TESTFILES/vds/2_c.h5
-$SRC_TOOLS_TESTFILES/vds/2_d.h5
-$SRC_TOOLS_TESTFILES/vds/2_e.h5
-$SRC_TOOLS_TESTFILES/vds/2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_1_vds.h5
-$SRC_TOOLS_TESTFILES/vds/3_2_vds.h5
-$SRC_TOOLS_TESTFILES/vds/4_0.h5
-$SRC_TOOLS_TESTFILES/vds/4_1.h5
-$SRC_TOOLS_TESTFILES/vds/4_2.h5
-$SRC_TOOLS_TESTFILES/vds/4_vds.h5
-$SRC_TOOLS_TESTFILES/vds/5_a.h5
-$SRC_TOOLS_TESTFILES/vds/5_b.h5
-$SRC_TOOLS_TESTFILES/vds/5_c.h5
-$SRC_TOOLS_TESTFILES/vds/5_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/1_a.h5
+$SRC_H5DUMP_TESTFILES/vds/1_b.h5
+$SRC_H5DUMP_TESTFILES/vds/1_c.h5
+$SRC_H5DUMP_TESTFILES/vds/1_d.h5
+$SRC_H5DUMP_TESTFILES/vds/1_e.h5
+$SRC_H5DUMP_TESTFILES/vds/1_f.h5
+$SRC_H5DUMP_TESTFILES/vds/1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/2_a.h5
+$SRC_H5DUMP_TESTFILES/vds/2_b.h5
+$SRC_H5DUMP_TESTFILES/vds/2_c.h5
+$SRC_H5DUMP_TESTFILES/vds/2_d.h5
+$SRC_H5DUMP_TESTFILES/vds/2_e.h5
+$SRC_H5DUMP_TESTFILES/vds/2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_1_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/3_2_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/4_0.h5
+$SRC_H5DUMP_TESTFILES/vds/4_1.h5
+$SRC_H5DUMP_TESTFILES/vds/4_2.h5
+$SRC_H5DUMP_TESTFILES/vds/4_vds.h5
+$SRC_H5DUMP_TESTFILES/vds/5_a.h5
+$SRC_H5DUMP_TESTFILES/vds/5_b.h5
+$SRC_H5DUMP_TESTFILES/vds/5_c.h5
+$SRC_H5DUMP_TESTFILES/vds/5_vds.h5
 ########tools/testfiles########
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_1d.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5
-$SRC_TOOLS_TESTFILES/tst_onion_dset_ext.h5.onion
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5
-$SRC_TOOLS_TESTFILES/tst_onion_objs.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_1d.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_dset_ext.h5.onion
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5
+$SRC_H5DUMP_TESTFILES/tst_onion_objs.h5.onion
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5REPACK_TESTFILES/h5repack-help.txt
+$SRC_H5REPACK_OUTFILES/h5repack-help.txt
 $SRC_H5REPACK_TESTFILES/h5repack_ext.bin
 $SRC_H5REPACK_TESTFILES/ublock.bin
 $SRC_H5REPACK_TESTFILES/h5repack.info
@@ -197,66 +197,66 @@ $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-1.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-2.dat
 $SRC_H5REPACK_TESTFILES/h5repack_uint8be_ex-3.dat
 ###############
-$SRC_H5REPACK_TESTFILES/crtorder.tordergr.h5.ddl
-$SRC_H5REPACK_TESTFILES/deflate_limit.h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/crtorder.tordergr.h5.ddl
+$SRC_H5REPACK_OUTFILES/deflate_limit.h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
 ########fsm#files########
-$SRC_H5REPACK_TESTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/STG.h5repack_none.h5.ddl
-$SRC_H5REPACK_TESTFILES/GS.h5repack_paged_nopersist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SP.h5repack_paged_persist.h5.ddl
-$SRC_H5REPACK_TESTFILES/SPT.h5repack_aggr.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_fsm_aggr_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/S.h5repack_fsm_aggr_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/STG.h5repack_none.h5.ddl
+$SRC_H5REPACK_OUTFILES/GS.h5repack_paged_nopersist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SP.h5repack_paged_persist.h5.ddl
+$SRC_H5REPACK_OUTFILES/SPT.h5repack_aggr.h5.ddl
 ########vds#files########
-$SRC_H5REPACK_TESTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
-$SRC_H5REPACK_TESTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
-$SRC_H5REPACK_TESTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_compa-v.ddl
-$SRC_H5REPACK_TESTFILES/4_vds.h5-vds_conti-v.ddl
+$SRC_H5REPACK_OUTFILES/1_vds.h5-vds_dset_chunk20x10x5-v.ddl
+$SRC_H5REPACK_OUTFILES/2_vds.h5-vds_chunk3x6x9-v.ddl
+$SRC_H5REPACK_OUTFILES/3_1_vds.h5-vds_chunk2x5x8-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_compa-v.ddl
+$SRC_H5REPACK_OUTFILES/4_vds.h5-vds_conti-v.ddl
 ########refs#files########
-$SRC_H5REPACK_TESTFILES/attrregion.tattrreg.h5.ddl
-$SRC_H5REPACK_TESTFILES/dataregion.tdatareg.h5.ddl
+$SRC_H5REPACK_OUTFILES/attrregion.tattrreg.h5.ddl
+$SRC_H5REPACK_OUTFILES/dataregion.tdatareg.h5.ddl
 ########external#links#files########
-$SRC_H5REPACK_TESTFILES/textlinkfar-base.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-base.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-base.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-base.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-prune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-prune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-prune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-prune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
-$SRC_H5REPACK_TESTFILES/textlink-mergeprune.textlink.h5.ddl
-$SRC_H5REPACK_TESTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-base.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-base.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-base.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-base.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-base.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-base.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-prune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-prune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-prune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-prune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-prune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-prune.h5copy_extlinks_src.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinkfar-mergeprune.textlinkfar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinksrc-mergeprune.textlinksrc.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlinktar-mergeprune.textlinktar.h5.ddl
+$SRC_H5REPACK_OUTFILES/textlink-mergeprune.textlink.h5.ddl
+$SRC_H5REPACK_OUTFILES/tsoftlinks-mergeprune.tsoftlinks.h5.ddl
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-mergeprune.h5copy_extlinks_src.h5.ddl
 ########tst#files########
-$SRC_H5REPACK_TESTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_filters.h5-gzip_verbose_filters.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
 ########external#links#tst#files########
-$SRC_H5REPACK_TESTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinkfar-merge.textlinkfar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinksrc-merge.textlinksrc.h5.tst
-$SRC_H5REPACK_TESTFILES/textlinktar-merge.textlinktar.h5.tst
-$SRC_H5REPACK_TESTFILES/textlink-merge.textlink.h5.tst
-$SRC_H5REPACK_TESTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
+$SRC_H5REPACK_OUTFILES/tsoftlinks-merge.tsoftlinks.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinkfar-merge.textlinkfar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinksrc-merge.textlinksrc.h5.tst
+$SRC_H5REPACK_OUTFILES/textlinktar-merge.textlinktar.h5.tst
+$SRC_H5REPACK_OUTFILES/textlink-merge.textlink.h5.tst
+$SRC_H5REPACK_OUTFILES/h5copy_extlinks_src-merge.h5copy_extlinks_src.h5.tst
 ########onion#files########
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_1d.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_dset_ext.h5.ddl
-$SRC_H5REPACK_TESTFILES/onion.tst_onion_objs.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_1d.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_dset_ext.h5.ddl
+$SRC_H5REPACK_OUTFILES/onion.tst_onion_objs.h5.ddl
 "
 
 #
diff --git a/tools/test/h5repack/h5repack_plugin.sh.in b/tools/test/h5repack/h5repack_plugin.sh.in
index bd7c3a1..43be1ee 100644
--- a/tools/test/h5repack/h5repack_plugin.sh.in
+++ b/tools/test/h5repack/h5repack_plugin.sh.in
@@ -47,6 +47,7 @@ SRC_TOOLS="$srcdir/../.."
 
 # testfiles source dirs for tools
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
+SRC_H5REPACK_OUTFILES="$SRC_TOOLS/test/h5repack/expected"
 
 TESTDIR=testplug
 test -d $TESTDIR || mkdir $TESTDIR
@@ -62,14 +63,14 @@ test -d $TESTDIR || mkdir $TESTDIR
 # --------------------------------------------------------------------
 LIST_HDF5_TEST_FILES="
 $SRC_H5REPACK_TESTFILES/h5repack_layout.h5
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_test.h5repack_layout.h5.tst
-$SRC_H5REPACK_TESTFILES/h5repack_layout.h5-plugin_version_test.ddl
-$SRC_H5REPACK_TESTFILES/plugin_version_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_test.h5repack_layout.h5.tst
+$SRC_H5REPACK_OUTFILES/h5repack_layout.h5-plugin_version_test.ddl
+$SRC_H5REPACK_OUTFILES/plugin_version_test.h5repack_layout.h5.tst
 "
 #$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5
-#$SRC_H5REPACK_TESTFILES/h5repack_layout.UD.h5-plugin_none.ddl
-#$SRC_H5REPACK_TESTFILES/plugin_none.h5repack_layout.UD.h5.tst
+#$SRC_H5REPACK_OUTFILES/h5repack_layout.UD.h5-plugin_none.ddl
+#$SRC_H5REPACK_OUTFILES/plugin_none.h5repack_layout.UD.h5.tst
 #"
 
 #
diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c
index 7c73e91..8fbfab5 100644
--- a/tools/test/h5repack/h5repackgentest.c
+++ b/tools/test/h5repack/h5repackgentest.c
@@ -115,7 +115,7 @@ set_dcpl_external_list(hid_t dcpl, const char *filename, unsigned n_elts_per_fil
         return -1;
 
     for (i = 0; i < n_external_files; i++) {
-        if (HDsnprintf(name, MAX_NAME_SIZE, "%s_ex-%u.dat", filename, i) >= MAX_NAME_SIZE)
+        if (snprintf(name, MAX_NAME_SIZE, "%s_ex-%u.dat", filename, i) >= MAX_NAME_SIZE)
             return -1;
 
         if (H5Pset_external(dcpl, name, 0, n_elts_per_file * elt_size) < 0)
@@ -140,7 +140,7 @@ make_file(const char *basename, struct external_def *ext, hid_t type_id, hsize_t
     hid_t space_id  = H5I_INVALID_HID;
     int   ret_value = 0;
 
-    if (HDsnprintf(filename, MAX_NAME_SIZE, "%s%s.h5", basename, (NULL != ext) ? "_ex" : "") >= MAX_NAME_SIZE)
+    if (snprintf(filename, MAX_NAME_SIZE, "%s%s.h5", basename, (NULL != ext) ? "_ex" : "") >= MAX_NAME_SIZE)
         H5REPACKGENTEST_OOPS;
 
     if (NULL != ext) {
@@ -173,7 +173,7 @@ done:
  * Returns 0 on success, -1 on failure.
  */
 static int
-generate_int32le_1d(hbool_t external)
+generate_int32le_1d(bool external)
 {
     int32_t              wdata[12];
     hsize_t              dims[]    = {12};
@@ -188,7 +188,7 @@ generate_int32le_1d(hbool_t external)
         wdata[n] = n - 6;
     }
 
-    def_ptr = (TRUE == external) ? (&def) : NULL;
+    def_ptr = (true == external) ? (&def) : NULL;
     if (make_file(FILE_INT32LE_1, def_ptr, H5T_STD_I32LE, 1, dims, wdata) < 0)
         ret_value = -1;
 
@@ -199,7 +199,7 @@ generate_int32le_1d(hbool_t external)
  * Returns 0 on success, -1 on failure.
  */
 static int
-generate_int32le_2d(hbool_t external)
+generate_int32le_2d(bool external)
 {
     int32_t              wdata[64];
     hsize_t              dims[]    = {8, 8};
@@ -214,7 +214,7 @@ generate_int32le_2d(hbool_t external)
         wdata[n] = n - 32;
     }
 
-    def_ptr = (TRUE == external) ? (&def) : NULL;
+    def_ptr = (true == external) ? (&def) : NULL;
     if (make_file(FILE_INT32LE_2, def_ptr, H5T_STD_I32LE, 2, dims, wdata) < 0)
         ret_value = -1;
 
@@ -225,7 +225,7 @@ generate_int32le_2d(hbool_t external)
  * Returns 0 on success, -1 on failure.
  */
 static int
-generate_int32le_3d(hbool_t external)
+generate_int32le_3d(bool external)
 {
     hsize_t              dims[] = {8, 8, 8};
     int32_t              wdata[512]; /* 8^3, from dims */
@@ -247,7 +247,7 @@ generate_int32le_3d(hbool_t external)
         }
     }
 
-    def_ptr = (TRUE == external) ? (&def) : NULL;
+    def_ptr = (true == external) ? (&def) : NULL;
     if (make_file(FILE_INT32LE_3, def_ptr, H5T_STD_I32LE, 3, dims, wdata) < 0)
         ret_value = -1;
 
@@ -258,7 +258,7 @@ generate_int32le_3d(hbool_t external)
  * Returns 0 on success, -1 on failure.
  */
 static int
-generate_uint8be(hbool_t external)
+generate_uint8be(bool external)
 {
     hsize_t              dims[] = {4, 8, 8};
     uint8_t              wdata[256]; /* 4*8*8, from dims */
@@ -280,7 +280,7 @@ generate_uint8be(hbool_t external)
         }
     }
 
-    def_ptr = (TRUE == external) ? (&def) : NULL;
+    def_ptr = (true == external) ? (&def) : NULL;
     if (make_file(FILE_UINT8BE, def_ptr, H5T_STD_U8BE, 3, dims, wdata) < 0)
         ret_value = -1;
 
@@ -291,7 +291,7 @@ generate_uint8be(hbool_t external)
  * Returns 0 on success, -1 on failure.
  */
 static int
-generate_f32le(hbool_t external)
+generate_f32le(bool external)
 {
     hsize_t              dims[] = {12, 6};
     float                wdata[72]; /* 12*6, from dims */
@@ -310,7 +310,7 @@ generate_f32le(hbool_t external)
         }
     }
 
-    def_ptr = (TRUE == external) ? (&def) : NULL;
+    def_ptr = (true == external) ? (&def) : NULL;
     if (make_file(FILE_F32LE, def_ptr, H5T_IEEE_F32LE, 2, dims, wdata) < 0)
         ret_value = -1;
 
@@ -327,7 +327,7 @@ main(void)
     int i = 0;
 
     for (i = 0; i < 2; i++) {
-        hbool_t external = (i & 1) ? TRUE : FALSE;
+        bool external = (i & 1) ? true : false;
         if (generate_int32le_1d(external) < 0)
             printf("A generate_int32le_1d failed!\n");
 
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index 00a7ae2..98d5362 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -182,7 +182,7 @@ main(void)
 
     h5_stat_t      file_stat;
     h5_stat_size_t fsize1, fsize2; /* file sizes */
-    hbool_t        driver_is_parallel;
+    bool           driver_is_parallel;
 #if defined(H5_HAVE_FILTER_SZIP)
     int szip_can_encode = 0;
 #endif
@@ -224,7 +224,7 @@ main(void)
     j = 0; /* #0 */
     assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
     fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
 
     if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
@@ -241,10 +241,10 @@ main(void)
     ++j; /* #1 */
     assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
     fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_NONE;
-    pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
+    pack_options.fs_persist   = -1; /* "false" is set via -P 0 */
     pack_options.fs_threshold = 1;
     pack_options.fs_pagesize  = 8192;
     if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
@@ -261,7 +261,7 @@ main(void)
     ++j; /* #2 */
     assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
     fname = H5REPACK_FSPACE_FNAMES[j];
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     pack_options.fs_strategy  = (H5F_fspace_strategy_t)-1; /* "FSM_AGGR" specified via -S FSM_AGGR */
     pack_options.fs_threshold = -1;                        /* "0" specified via -T 0 */
@@ -280,10 +280,10 @@ main(void)
         ++j; /* #3 */
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         fname = H5REPACK_FSPACE_FNAMES[j];
-        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+        if (h5repack_init(&pack_options, 0, true) < 0)
             GOERROR;
         pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE; /* "PAGE" specified via -S */
-        pack_options.fs_persist  = TRUE;
+        pack_options.fs_persist  = true;
         if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
             GOERROR;
         if (h5diff(fname, FSPACE_OUT, NULL, NULL, &diff_options) > 0)
@@ -298,9 +298,9 @@ main(void)
         ++j; /* #4 */
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         fname = H5REPACK_FSPACE_FNAMES[j];
-        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+        if (h5repack_init(&pack_options, 0, true) < 0)
             GOERROR;
-        pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
+        pack_options.fs_persist   = -1; /* "false" is set via -P 0 */
         pack_options.fs_threshold = 2;
         if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
             GOERROR;
@@ -316,7 +316,7 @@ main(void)
         ++j; /* #5 */
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         fname = H5REPACK_FSPACE_FNAMES[j];
-        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+        if (h5repack_init(&pack_options, 0, true) < 0)
             GOERROR;
         pack_options.fs_strategy = H5F_FSPACE_STRATEGY_PAGE;
         pack_options.fs_pagesize = 8192;
@@ -334,10 +334,10 @@ main(void)
         ++j; /* #6 */
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         fname = H5REPACK_FSPACE_FNAMES[j];
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_NONE;
-        pack_options.fs_persist   = -1; /* "FALSE" is set via -P 0 */
+        pack_options.fs_persist   = -1; /* "false" is set via -P 0 */
         pack_options.fs_threshold = 1;
         pack_options.fs_pagesize  = 8192;
         if (h5repack(fname, FSPACE_OUT, &pack_options) < 0)
@@ -354,7 +354,7 @@ main(void)
         ++j; /* #7 */
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         fname = H5REPACK_FSPACE_FNAMES[j];
-        if (h5repack_init(&pack_options, 0, TRUE) < 0)
+        if (h5repack_init(&pack_options, 0, true) < 0)
             GOERROR;
         pack_options.fs_strategy  = H5F_FSPACE_STRATEGY_AGGR;
         pack_options.fs_threshold = 1;
@@ -376,7 +376,7 @@ main(void)
      */
     TESTING("    copy of datasets (fill values)");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME0, FNAME0OUT, &pack_options) < 0)
         GOERROR;
@@ -396,7 +396,7 @@ main(void)
      */
     if (!driver_is_parallel) {
         TESTING("    copy of datasets (all datatypes)");
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack(FNAME1, FNAME1OUT, &pack_options) < 0)
             GOERROR;
@@ -416,7 +416,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
     TESTING("    copy of datasets (attributes)");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME2, FNAME2OUT, &pack_options) < 0)
         GOERROR;
@@ -435,7 +435,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
     TESTING("    copy of datasets (hardlinks)");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME3, FNAME3OUT, &pack_options) < 0)
         GOERROR;
@@ -455,7 +455,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
     TESTING("    copy of allocation early file");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME5, FNAME5OUT, &pack_options) < 0)
         GOERROR;
@@ -485,7 +485,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:GZIP=9", &pack_options) < 0)
         GOERROR;
@@ -512,7 +512,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
+    if (h5repack_init(&pack_options, 0, true) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:GZIP=9", &pack_options) < 0)
         GOERROR;
@@ -540,7 +540,7 @@ main(void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("GZIP=1", &pack_options) < 0)
         GOERROR;
@@ -577,7 +577,7 @@ main(void)
      */
 
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack_addfilter("dset2:SZIP=8,EC", &pack_options) < 0)
             GOERROR;
@@ -609,7 +609,7 @@ main(void)
 
 #if defined(H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack_addfilter("SZIP=8,NN", &pack_options) < 0)
             GOERROR;
@@ -638,7 +638,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:SHUF", &pack_options) < 0)
         GOERROR;
@@ -662,7 +662,7 @@ main(void)
 
     TESTING("    adding shuffle filter to all");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("SHUF", &pack_options) < 0)
         GOERROR;
@@ -685,7 +685,7 @@ main(void)
      * test an individual object option
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset1:FLET", &pack_options) < 0)
         GOERROR;
@@ -708,7 +708,7 @@ main(void)
      */
     TESTING("    adding checksum filter to all");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("FLET", &pack_options) < 0)
         GOERROR;
@@ -732,7 +732,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CHUNK 20x10", &pack_options) < 0)
         GOERROR;
@@ -771,7 +771,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
@@ -793,7 +793,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, TRUE) < 0)
+    if (h5repack_init(&pack_options, 0, true) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CHUNK=20x10", &pack_options) < 0)
         GOERROR;
@@ -813,7 +813,7 @@ main(void)
      */
     TESTING("    adding layout chunked to all");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("CHUNK=20x10", &pack_options) < 0)
         GOERROR;
@@ -834,7 +834,7 @@ main(void)
      * test an individual object option
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:CONTI", &pack_options) < 0)
         GOERROR;
@@ -855,7 +855,7 @@ main(void)
      * test all objects option
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("CONTI", &pack_options) < 0)
         GOERROR;
@@ -872,7 +872,7 @@ main(void)
      * do the same test for a file with filters (chunked)
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("CONTI", &pack_options) < 0)
         GOERROR;
@@ -894,7 +894,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset1:COMPA", &pack_options) < 0)
         GOERROR;
@@ -915,7 +915,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("COMPA", &pack_options) < 0)
         GOERROR;
@@ -936,7 +936,7 @@ main(void)
      * layout compact to contiguous conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:CONTI", &pack_options) < 0)
         GOERROR;
@@ -956,7 +956,7 @@ main(void)
      * layout compact to chunk conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:CHUNK=2x5", &pack_options) < 0)
         GOERROR;
@@ -976,7 +976,7 @@ main(void)
      * layout compact to compact conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_compact:COMPA", &pack_options) < 0)
         GOERROR;
@@ -995,7 +995,7 @@ main(void)
      * layout contiguous to compact conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:COMPA", &pack_options) < 0)
         GOERROR;
@@ -1014,7 +1014,7 @@ main(void)
      * layout contiguous to chunk conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:CHUNK=3x6", &pack_options) < 0)
         GOERROR;
@@ -1034,7 +1034,7 @@ main(void)
      * layout contiguous to contiguous conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_contiguous:CONTI", &pack_options) < 0)
         GOERROR;
@@ -1053,7 +1053,7 @@ main(void)
      * layout chunked to compact conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:COMPA", &pack_options) < 0)
         GOERROR;
@@ -1073,7 +1073,7 @@ main(void)
      * layout chunked to contiguous conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:CONTI", &pack_options) < 0)
         GOERROR;
@@ -1092,7 +1092,7 @@ main(void)
      * layout chunked to chunked conversion
      *-------------------------------------------------------------------------
      */
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addlayout("dset_chunk:CHUNK=18x13", &pack_options) < 0)
         GOERROR;
@@ -1119,7 +1119,7 @@ main(void)
 
 #if defined(H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack(FNAME7, FNAME7OUT, &pack_options) < 0)
             GOERROR;
@@ -1145,7 +1145,7 @@ main(void)
 
 #if defined(H5_HAVE_FILTER_SZIP)
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_szip:NONE", &pack_options) < 0)
             GOERROR;
@@ -1170,7 +1170,7 @@ main(void)
     TESTING("    copy of deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME8, FNAME8OUT, &pack_options) < 0)
         GOERROR;
@@ -1189,7 +1189,7 @@ main(void)
     TESTING("    removing deflate filter");
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_deflate:NONE", &pack_options) < 0)
         GOERROR;
@@ -1209,7 +1209,7 @@ main(void)
 
     TESTING("    copy of shuffle filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME9, FNAME9OUT, &pack_options) < 0)
         GOERROR;
@@ -1224,7 +1224,7 @@ main(void)
 
     TESTING("    removing shuffle filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_shuffle:NONE", &pack_options) < 0)
         GOERROR;
@@ -1241,7 +1241,7 @@ main(void)
 
     TESTING("    copy of fletcher filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME10, FNAME10OUT, &pack_options) < 0)
         GOERROR;
@@ -1256,7 +1256,7 @@ main(void)
 
     TESTING("    removing fletcher filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_fletcher32:NONE", &pack_options) < 0)
         GOERROR;
@@ -1273,7 +1273,7 @@ main(void)
 
     TESTING("    copy of nbit filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME12, FNAME12OUT, &pack_options) < 0)
         GOERROR;
@@ -1288,7 +1288,7 @@ main(void)
 
     TESTING("    removing nbit filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_nbit:NONE", &pack_options) < 0)
         GOERROR;
@@ -1305,7 +1305,7 @@ main(void)
 
     TESTING("    adding nbit filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_int31:NBIT", &pack_options) < 0)
         GOERROR;
@@ -1322,7 +1322,7 @@ main(void)
 
     TESTING("    copy of scaleoffset filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME13, FNAME13OUT, &pack_options) < 0)
         GOERROR;
@@ -1337,7 +1337,7 @@ main(void)
 
     TESTING("    removing scaleoffset filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_scaleoffset:NONE", &pack_options) < 0)
         GOERROR;
@@ -1354,7 +1354,7 @@ main(void)
 
     TESTING("    adding scaleoffset filter");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("dset_none:SOFF=31,IN", &pack_options) < 0)
         GOERROR;
@@ -1383,7 +1383,7 @@ main(void)
 #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE)
 
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_deflate:SZIP=8,NN", &pack_options) < 0)
             GOERROR;
@@ -1410,7 +1410,7 @@ main(void)
 #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE)
 
     if (szip_can_encode) {
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack_addfilter("dset_szip:GZIP=1", &pack_options) < 0)
             GOERROR;
@@ -1441,7 +1441,7 @@ main(void)
 
 #if defined(H5_HAVE_FILTER_SZIP) && defined(H5_HAVE_FILTER_DEFLATE)
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("NONE", &pack_options) < 0)
         GOERROR;
@@ -1465,7 +1465,7 @@ main(void)
      */
     TESTING("    big file");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME14, FNAME14OUT, &pack_options) < 0)
         GOERROR;
@@ -1482,7 +1482,7 @@ main(void)
      *-------------------------------------------------------------------------
      */
     TESTING("    external datasets");
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack(FNAME15, FNAME15OUT, &pack_options) < 0)
         GOERROR;
@@ -1500,7 +1500,7 @@ main(void)
          *-------------------------------------------------------------------------
          */
         TESTING("    file with userblock");
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack(FNAME16, FNAME16OUT, &pack_options) < 0)
             GOERROR;
@@ -1521,7 +1521,7 @@ main(void)
      */
     if (!driver_is_parallel) {
         TESTING("    latest file format options");
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         pack_options.latest      = 1;
         pack_options.grp_compact = 10;
@@ -1551,7 +1551,7 @@ main(void)
 
 #if defined(H5_HAVE_FILTER_DEFLATE)
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
     if (h5repack_addfilter("GZIP=1", &pack_options) < 0)
         GOERROR;
@@ -1580,7 +1580,7 @@ main(void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
 
         /* add the options for a user block size and user block filename */
@@ -1612,7 +1612,7 @@ main(void)
 
 #ifdef H5_HAVE_FILTER_DEFLATE
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
 
     /* add the options for alignment */
@@ -1663,7 +1663,7 @@ main(void)
      */
     TESTING("    file with committed datatypes");
 
-    if (h5repack_init(&pack_options, 0, FALSE) < 0)
+    if (h5repack_init(&pack_options, 0, false) < 0)
         GOERROR;
 
     if (h5repack(FNAME17, FNAME17OUT, &pack_options) < 0)
@@ -1690,7 +1690,7 @@ main(void)
         /* First run without metadata option. No need to verify the correctness */
         /* since this has been verified by earlier tests. Just record the file */
         /* size of the output file. */
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
             GOERROR;
@@ -1701,7 +1701,7 @@ main(void)
             GOERROR;
 
         /* run it again with metadata option */
-        if (h5repack_init(&pack_options, 0, FALSE) < 0)
+        if (h5repack_init(&pack_options, 0, false) < 0)
             GOERROR;
         pack_options.meta_block_size = 8192;
         if (h5repack(FNAME4, FNAME4OUT, &pack_options) < 0)
@@ -1762,7 +1762,7 @@ make_testfiles(void)
     hid_t    fcpl = H5I_INVALID_HID; /* File creation property list */
     hid_t    fapl = H5I_INVALID_HID; /* File access property list */
     unsigned j;                      /* Local index variable */
-    hbool_t  driver_is_parallel;
+    bool     driver_is_parallel;
 
     if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
         return -1;
@@ -2026,7 +2026,7 @@ make_testfiles(void)
 
     /*
      * #0 -- h5repack_latest.h5
-     * default: strategy=FSM_AGGR, persist=FALSE, threshold=1
+     * default: strategy=FSM_AGGR, persist=false, threshold=1
      * default: inpage=4096
      */
     j = 0;
@@ -2037,7 +2037,7 @@ make_testfiles(void)
 
     /*
      * #1 -- h5repack_default.h5
-     * default: strategy=FSM_AGGR, persist=FALSE, threshold=1
+     * default: strategy=FSM_AGGR, persist=false, threshold=1
      * default: inpage=4096
      */
     assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
@@ -2050,7 +2050,7 @@ make_testfiles(void)
         /*
          * #2 -- h5repack_page_persist.h5
          * Setting:
-         *    strategy=PAGE, persist=TRUE, threshold=1
+         *    strategy=PAGE, persist=true, threshold=1
          *    inpage=512
          *  latest format
          */
@@ -2059,7 +2059,7 @@ make_testfiles(void)
             return -1;
         if (H5Pset_file_space_page_size(fcpl, (hsize_t)512) < 0)
             return -1;
-        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, TRUE, (hsize_t)1) < 0)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, true, (hsize_t)1) < 0)
             return -1;
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
@@ -2072,13 +2072,13 @@ make_testfiles(void)
         /*
          * #3 -- h5repack_fsm_aggr_persist.h5
          * Setting:
-         *    strategy=FSM_AGGR, persist=TRUE, threshold=1
+         *    strategy=FSM_AGGR, persist=true, threshold=1
          *  default: inpage=4096
          */
         /* Create file creation property list */
         if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
             return -1;
-        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0)
             return -1;
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, H5P_DEFAULT)) < 0)
@@ -2091,7 +2091,7 @@ make_testfiles(void)
         /*
          * #4 -- h5repack_page_threshold.h5
          * Setting:
-         *    strategy=PAGE, persist=FALSE, threshold=3
+         *    strategy=PAGE, persist=false, threshold=3
          *  inpage=8192
          *  latest format
          */
@@ -2099,7 +2099,7 @@ make_testfiles(void)
         /* Create file creation property list */
         if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
             return -1;
-        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, FALSE, (hsize_t)3) < 0)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_PAGE, false, (hsize_t)3) < 0)
             return -1;
         if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0)
             return -1;
@@ -2114,14 +2114,14 @@ make_testfiles(void)
         /*
          * #5 -- h5repack_fsm_aggr_threshold.h5
          * Setting:
-         *    strategy=FSM_AGGR, persist=FALSE, threshold=3
+         *    strategy=FSM_AGGR, persist=false, threshold=3
          *    inpage=4096
          */
 
         /* Create file creation property list */
         if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
             return -1;
-        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, FALSE, (hsize_t)3) < 0)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, false, (hsize_t)3) < 0)
             return -1;
         if (H5Pset_file_space_page_size(fcpl, (hsize_t)FS_PAGESIZE_DEF) < 0)
             return -1;
@@ -2136,14 +2136,14 @@ make_testfiles(void)
         /*
          * #6 -- h5repack_aggr.h5
          * Setting:
-         *     strategy=AGGR, persist=FALSE, threshold=1
+         *     strategy=AGGR, persist=false, threshold=1
          *  latest format
          */
 
         /* Create file creation property list */
         if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
             return -1;
-        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, FALSE, (hsize_t)1) < 0)
+        if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_AGGR, false, (hsize_t)1) < 0)
             return -1;
         assert(j < NELMTS(H5REPACK_FSPACE_FNAMES));
         if ((fid = H5Fcreate(H5REPACK_FSPACE_FNAMES[++j], H5F_ACC_TRUNC, fcpl, fapl)) < 0)
@@ -2157,14 +2157,14 @@ make_testfiles(void)
     /*
      * #7 -- h5repack_none.h5
      * Setting:
-     *    strategy=NONE, persist=FALSE, threshold=1
+     *    strategy=NONE, persist=false, threshold=1
      *     inpage=8192
      */
 
     /* Create file creation property list */
     if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0)
         return -1;
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, FALSE, (hsize_t)1) < 0)
+    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_NONE, false, (hsize_t)1) < 0)
         return -1;
     if (H5Pset_file_space_page_size(fcpl, (hsize_t)8192) < 0)
         return -1;
@@ -2788,7 +2788,7 @@ make_nbit(hid_t loc_id)
 
 #ifdef H5_HAVE_PARALLEL
     {
-        hbool_t driver_is_parallel;
+        bool driver_is_parallel;
 
         /* Set up collective writes for parallel driver */
         if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
@@ -2896,7 +2896,7 @@ make_scaleoffset(hid_t loc_id)
 
 #ifdef H5_HAVE_PARALLEL
     {
-        hbool_t driver_is_parallel;
+        bool driver_is_parallel;
 
         if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
             goto error;
@@ -3005,7 +3005,7 @@ make_all_filters(hid_t loc_id)
 
 #ifdef H5_HAVE_PARALLEL
     {
-        hbool_t driver_is_parallel;
+        bool driver_is_parallel;
 
         if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
             goto error;
@@ -3186,7 +3186,7 @@ make_early(void)
             goto out;
         if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
-        HDsnprintf(name, sizeof(name), "%d", i);
+        snprintf(name, sizeof(name), "%d", i);
         if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if (H5Tclose(tid) < 0)
@@ -3210,7 +3210,7 @@ make_early(void)
     for (i = 0; i < iter; i++) {
         if ((tid = H5Tcopy(H5T_NATIVE_DOUBLE)) < 0)
             goto out;
-        HDsnprintf(name, sizeof(name), "%d", i);
+        snprintf(name, sizeof(name), "%d", i);
         if ((H5Tcommit2(fid, name, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto out;
         if (H5Tclose(tid) < 0)
@@ -3269,7 +3269,7 @@ make_layout(hid_t loc_id)
      *-------------------------------------------------------------------------
      */
     for (i = 0; i < 4; i++) {
-        HDsnprintf(name, sizeof(name), "dset%d", i + 1);
+        snprintf(name, sizeof(name), "dset%d", i + 1);
         if (write_dset(loc_id, RANK, dims, name, H5T_NATIVE_INT, buf) < 0)
             goto error;
     }
@@ -5914,7 +5914,7 @@ make_dset(hid_t loc_id, const char *name, hid_t sid, hid_t dcpl, void *buf)
 
 #ifdef H5_HAVE_PARALLEL
     {
-        hbool_t driver_is_parallel;
+        bool driver_is_parallel;
 
         if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
             goto out;
@@ -5966,7 +5966,7 @@ write_dset(hid_t loc_id, int rank, hsize_t *dims, const char *dset_name, hid_t t
     if (buf) {
 #ifdef H5_HAVE_PARALLEL
         {
-            hbool_t driver_is_parallel;
+            bool driver_is_parallel;
 
             if (h5_using_parallel_driver(H5P_DEFAULT, &driver_is_parallel) < 0)
                 goto out;
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
deleted file mode 100644
index 7b8621e..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_src.h5
+++ /dev/null
diff --git a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5 b/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
deleted file mode 100644
index 3a0242d..0000000
--- a/tools/test/h5repack/testfiles/h5copy_extlinks_trg.h5
+++ /dev/null
diff --git a/tools/test/h5stat/CMakeTests.cmake b/tools/test/h5stat/CMakeTests.cmake
index 8802d0d..9035eaf 100644
--- a/tools/test/h5stat/CMakeTests.cmake
+++ b/tools/test/h5stat/CMakeTests.cmake
@@ -75,15 +75,15 @@
   )
 
   foreach (ddl_file ${HDF5_REFERENCE_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${ddl_file}.ddl" "${PROJECT_BINARY_DIR}/${ddl_file}.ddl" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}.err" "${PROJECT_BINARY_DIR}/${h5_file}.err" "h5stat_files")
   endforeach ()
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_H5STAT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5stat_files")
   endforeach ()
   add_custom_target(h5stat_files ALL COMMENT "Copying files needed by h5stat tests" DEPENDS ${h5stat_files_list})
 
diff --git a/tools/test/h5stat/testfiles/h5stat_dims1.ddl b/tools/test/h5stat/expected/h5stat_dims1.ddl
index 07b2900..07b2900 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims1.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_dims2.ddl b/tools/test/h5stat/expected/h5stat_dims2.ddl
index dbccd05..dbccd05 100644
--- a/tools/test/h5stat/testfiles/h5stat_dims2.ddl
+++ b/tools/test/h5stat/expected/h5stat_dims2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_dims.err b/tools/test/h5stat/expected/h5stat_err1_dims.err
index 86d375b..86d375b 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_dims.err
+++ b/tools/test/h5stat/expected/h5stat_err1_dims.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_links.err b/tools/test/h5stat/expected/h5stat_err1_links.err
index d43207c..d43207c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_links.err
+++ b/tools/test/h5stat/expected/h5stat_err1_links.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err1_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err1_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
index 01b6c18..01b6c18 100644
--- a/tools/test/h5stat/testfiles/h5stat_err2_numattrs.err
+++ b/tools/test/h5stat/expected/h5stat_err2_numattrs.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
index 5cc1e32..5cc1e32 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err b/tools/test/h5stat/expected/h5stat_err_old_fill.err
index 8b886d2..8b886d2 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_fill.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_fill.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
index 112190c..112190c 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err b/tools/test/h5stat/expected/h5stat_err_old_layout.err
index 7aa2fa7..7aa2fa7 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_old_layout.err
+++ b/tools/test/h5stat/expected/h5stat_err_old_layout.err
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
index 41e533e..41e533e 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.ddl
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_err_refcount.err b/tools/test/h5stat/expected/h5stat_err_refcount.err
index d176996..d176996 100644
--- a/tools/test/h5stat/testfiles/h5stat_err_refcount.err
+++ b/tools/test/h5stat/expected/h5stat_err_refcount.err
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl b/tools/test/h5stat/expected/h5stat_filters-F.ddl
index d44445b..d44445b 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-F.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
index 4efafd1..4efafd1 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UD.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UD.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
index d8de31f..d8de31f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-UT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-UT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl b/tools/test/h5stat/expected/h5stat_filters-d.ddl
index 6e6dd61..6e6dd61 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-d.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-d.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
index b14ca9f..b14ca9f 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-dT.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-dT.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl b/tools/test/h5stat/expected/h5stat_filters-file.ddl
index 5f7eff9..5f7eff9 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-file.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl b/tools/test/h5stat/expected/h5stat_filters-g.ddl
index 290c82a..290c82a 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters-g.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters-g.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_filters.ddl b/tools/test/h5stat/expected/h5stat_filters.ddl
index 9f9e146..9f9e146 100644
--- a/tools/test/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/test/h5stat/expected/h5stat_filters.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help1.ddl b/tools/test/h5stat/expected/h5stat_help1.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/test/h5stat/expected/h5stat_help1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_help2.ddl b/tools/test/h5stat/expected/h5stat_help2.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/test/h5stat/expected/h5stat_help2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_idx.ddl b/tools/test/h5stat/expected/h5stat_idx.ddl
index 1b6ae0c..1b6ae0c 100644
--- a/tools/test/h5stat/testfiles/h5stat_idx.ddl
+++ b/tools/test/h5stat/expected/h5stat_idx.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links1.ddl b/tools/test/h5stat/expected/h5stat_links1.ddl
index c650f15..c650f15 100644
--- a/tools/test/h5stat/testfiles/h5stat_links1.ddl
+++ b/tools/test/h5stat/expected/h5stat_links1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links2.ddl b/tools/test/h5stat/expected/h5stat_links2.ddl
index 9fc82cd..9fc82cd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links2.ddl
+++ b/tools/test/h5stat/expected/h5stat_links2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links3.ddl b/tools/test/h5stat/expected/h5stat_links3.ddl
index f80471a..f80471a 100644
--- a/tools/test/h5stat/testfiles/h5stat_links3.ddl
+++ b/tools/test/h5stat/expected/h5stat_links3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links4.ddl b/tools/test/h5stat/expected/h5stat_links4.ddl
index 94feffd..94feffd 100644
--- a/tools/test/h5stat/testfiles/h5stat_links4.ddl
+++ b/tools/test/h5stat/expected/h5stat_links4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_links5.ddl b/tools/test/h5stat/expected/h5stat_links5.ddl
index 6f33bed..6f33bed 100644
--- a/tools/test/h5stat/testfiles/h5stat_links5.ddl
+++ b/tools/test/h5stat/expected/h5stat_links5.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
index a5ee7e8..a5ee7e8 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UA.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UA.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
index 41195ac..41195ac 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat-UG.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat-UG.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl b/tools/test/h5stat/expected/h5stat_newgrat.ddl
index 130fe2f..130fe2f 100644
--- a/tools/test/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/test/h5stat/expected/h5stat_newgrat.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.ddl b/tools/test/h5stat/expected/h5stat_nofile.ddl
index 54d6a31..54d6a31 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.ddl
+++ b/tools/test/h5stat/expected/h5stat_nofile.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_nofile.err b/tools/test/h5stat/expected/h5stat_nofile.err
index 3b7e979..3b7e979 100644
--- a/tools/test/h5stat/testfiles/h5stat_nofile.err
+++ b/tools/test/h5stat/expected/h5stat_nofile.err
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.ddl b/tools/test/h5stat/expected/h5stat_notexist.ddl
index 7f71941..7f71941 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.ddl
+++ b/tools/test/h5stat/expected/h5stat_notexist.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_notexist.err b/tools/test/h5stat/expected/h5stat_notexist.err
index c1d9e54..c1d9e54 100644
--- a/tools/test/h5stat/testfiles/h5stat_notexist.err
+++ b/tools/test/h5stat/expected/h5stat_notexist.err
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
index af53776..af53776 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs1.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs1.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
index 638781b..638781b 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs2.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs2.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
index de8d6a3..de8d6a3 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs3.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs3.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
index 2b0122a..2b0122a 100644
--- a/tools/test/h5stat/testfiles/h5stat_numattrs4.ddl
+++ b/tools/test/h5stat/expected/h5stat_numattrs4.ddl
diff --git a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl b/tools/test/h5stat/expected/h5stat_tsohm.ddl
index 9369950..9369950 100644
--- a/tools/test/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/test/h5stat/expected/h5stat_tsohm.ddl
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index 44428fe..787c2e1 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -87,7 +87,7 @@ gen_newgrat_file(const char *fname)
 
     /* Create NUM_GRPS groups in the root group */
     for (i = 1; i <= NUM_GRPS; i++) {
-        HDsnprintf(name, sizeof(name), "%s%d", GROUP_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", GROUP_NAME, i);
         if ((gid = H5Gcreate2(fid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if (H5Gclose(gid) < 0)
@@ -108,7 +108,7 @@ gen_newgrat_file(const char *fname)
 
     /* Create NUM_ATTRS for the dataset */
     for (i = 1; i <= NUM_ATTRS; i++) {
-        HDsnprintf(attrname, sizeof(attrname), "%s%d", ATTR_NAME, i);
+        snprintf(attrname, sizeof(attrname), "%s%d", ATTR_NAME, i);
         if ((attr_id = H5Acreate2(did, attrname, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if (H5Aclose(attr_id) < 0)
@@ -210,7 +210,7 @@ gen_threshold_file(const char *fname)
 
     /* Create 11 attributes for the dataset */
     for (i = 1; i <= (THRES_NUM + 1); i++) {
-        HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
         if ((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if (H5Aclose(attr_id) < 0)
@@ -239,7 +239,7 @@ gen_threshold_file(const char *fname)
 
     /* Create 10 attributes for the 2-D dataset */
     for (i = 1; i <= THRES_NUM; i++) {
-        HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", THRES_ATTR_NAME, i);
         if ((attr_id = H5Acreate2(did, name, H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             goto error;
         if (H5Aclose(attr_id) < 0)
@@ -263,7 +263,7 @@ gen_threshold_file(const char *fname)
     /* Create 10 1-D datasets with non-zero dimension size for the group */
     for (i = 1; i <= THRES_NUM; i++) {
         /* set up dataset name */
-        HDsnprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
 
         /* Create the dataset */
         if ((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -285,7 +285,7 @@ gen_threshold_file(const char *fname)
     /* Create 25 attributes for the group */
     for (i = 1; i <= THRES_NUM_25; i++) {
         /* Set up attribute name */
-        HDsnprintf(name, sizeof(name), "%s%d", THRES_ATTR_GRP_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", THRES_ATTR_GRP_NAME, i);
 
         /* Create the attribute */
         if ((attr_id = H5Acreate2(gid, name, H5T_NATIVE_INT, sid2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -307,7 +307,7 @@ gen_threshold_file(const char *fname)
     /* Create 9 1-D datasets with non-zero dimension size for the group */
     for (i = 1; i < THRES_NUM; i++) {
         /* set up dataset name */
-        HDsnprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
+        snprintf(name, sizeof(name), "%s%d", THRES_DSET_NAME, i);
 
         /* Create the dataset */
         if ((did = H5Dcreate2(gid, name, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
diff --git a/tools/test/h5stat/testh5stat.sh.in b/tools/test/h5stat/testh5stat.sh.in
index 9ea6adc..7ce0ad4 100644
--- a/tools/test/h5stat/testh5stat.sh.in
+++ b/tools/test/h5stat/testh5stat.sh.in
@@ -39,17 +39,17 @@ verbose=yes
 
 # source dirs
 SRC_TOOLS="$srcdir/../.."
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 
 # testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
 SRC_H5DIFF_TESTFILES="$SRC_TOOLS/test/h5diff/testfiles"
 SRC_H5COPY_TESTFILES="$SRC_TOOLS/test/h5copy/testfiles"
 SRC_H5REPACK_TESTFILES="$SRC_TOOLS/test/h5repack/testfiles"
 SRC_H5JAM_TESTFILES="$SRC_TOOLS/test/h5jam/testfiles"
 SRC_H5STAT_TESTFILES="$SRC_TOOLS/test/h5stat/testfiles"
 SRC_H5IMPORT_TESTFILES="$SRC_TOOLS/test/h5import/testfiles"
+SRC_H5STAT_OUTFILES="$SRC_TOOLS/test/h5stat/expected"
 
 TESTDIR=./testfiles
 test -d $TESTDIR || mkdir $TESTDIR
@@ -75,49 +75,49 @@ $SRC_H5STAT_TESTFILES/h5stat_threshold.h5
 "
 
 LIST_ERR_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.err
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_links.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_dims.err
-$SRC_H5STAT_TESTFILES/h5stat_err1_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_err2_numattrs.err
-$SRC_H5STAT_TESTFILES/h5stat_notexist.err
-$SRC_H5STAT_TESTFILES/h5stat_nofile.err
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.err
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_links.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_dims.err
+$SRC_H5STAT_OUTFILES/h5stat_err1_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_err2_numattrs.err
+$SRC_H5STAT_OUTFILES/h5stat_notexist.err
+$SRC_H5STAT_OUTFILES/h5stat_nofile.err
 "
 
 LIST_OTHER_TEST_FILES="
-$SRC_H5STAT_TESTFILES/h5stat_err_refcount.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_layout.ddl
-$SRC_H5STAT_TESTFILES/h5stat_err_old_fill.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_help2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_notexist.ddl
-$SRC_H5STAT_TESTFILES/h5stat_nofile.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-file.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-F.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-d.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-g.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-dT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UD.ddl
-$SRC_H5STAT_TESTFILES/h5stat_filters-UT.ddl
-$SRC_H5STAT_TESTFILES/h5stat_tsohm.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UG.ddl
-$SRC_H5STAT_TESTFILES/h5stat_newgrat-UA.ddl
-$SRC_H5STAT_TESTFILES/h5stat_idx.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links4.ddl
-$SRC_H5STAT_TESTFILES/h5stat_links5.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_dims2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs1.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs2.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs3.ddl
-$SRC_H5STAT_TESTFILES/h5stat_numattrs4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_refcount.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_layout.ddl
+$SRC_H5STAT_OUTFILES/h5stat_err_old_fill.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_help2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_notexist.ddl
+$SRC_H5STAT_OUTFILES/h5stat_nofile.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-file.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-F.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-d.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-g.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-dT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UD.ddl
+$SRC_H5STAT_OUTFILES/h5stat_filters-UT.ddl
+$SRC_H5STAT_OUTFILES/h5stat_tsohm.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UG.ddl
+$SRC_H5STAT_OUTFILES/h5stat_newgrat-UA.ddl
+$SRC_H5STAT_OUTFILES/h5stat_idx.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links4.ddl
+$SRC_H5STAT_OUTFILES/h5stat_links5.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_dims2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs1.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs2.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs3.ddl
+$SRC_H5STAT_OUTFILES/h5stat_numattrs4.ddl
 "
 
 #
diff --git a/tools/test/misc/CMakeTestsClear.cmake b/tools/test/misc/CMakeTestsClear.cmake
index a554972..2f3c62f 100644
--- a/tools/test/misc/CMakeTestsClear.cmake
+++ b/tools/test/misc/CMakeTestsClear.cmake
@@ -63,11 +63,14 @@
       h5clear_open_fail.err
   )
 
-  foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES} ${HDF5_REFERENCE_TEST_FILES})
+  foreach (h5_file ${HDF5_TEST_FILES} ${HDF5_SEC2_TEST_FILES})
     HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
   endforeach ()
+  foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
+  endforeach ()
   foreach (h5_file ${HDF5_REFERENCE_ERR_FILES})
-    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_file}" "h5clear_files")
   endforeach ()
   # make second copy of h5clear_sec2.h5
   foreach (h5_file ${HDF5_SEC2_TEST_FILES})
diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake
index b4d1a56..9e4f739 100644
--- a/tools/test/misc/CMakeTestsMkgrp.cmake
+++ b/tools/test/misc/CMakeTestsMkgrp.cmake
@@ -40,10 +40,10 @@
   file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles")
 
   foreach (h5_mkgrp_file ${HDF5_MKGRP_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/${h5_mkgrp_file}" "${PROJECT_BINARY_DIR}/testfiles/${h5_mkgrp_file}" "h5mkgrp_files")
   endforeach ()
 
-  HDFTEST_COPY_FILE("${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files")
+  HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/expected/h5mkgrp_help.txt" "${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_help.txt" "h5mkgrp_files")
   add_custom_target(h5mkgrp_files ALL COMMENT "Copying files needed by h5mkgrp tests" DEPENDS ${h5mkgrp_files_list})
 
   configure_file (${HDF5_TOOLS_TEST_MISC_SOURCE_DIR}/testfiles/h5mkgrp_version.txt.in ${PROJECT_BINARY_DIR}/testfiles/h5mkgrp_version.txt @ONLY)
diff --git a/tools/test/misc/CMakeTestsRepart.cmake b/tools/test/misc/CMakeTestsRepart.cmake
index 04c74ec..764778e 100644
--- a/tools/test/misc/CMakeTestsRepart.cmake
+++ b/tools/test/misc/CMakeTestsRepart.cmake
@@ -41,7 +41,7 @@
   )
 
   foreach (h5_file ${HDF5_REFERENCE_TEST_FILES})
-    HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files")
+    HDFTEST_COPY_FILE("${PROJECT_SOURCE_DIR}/testfiles/${h5_file}" "${PROJECT_BINARY_DIR}/${h5_file}" "h5repart_files")
   endforeach ()
   add_custom_target(h5repart_files ALL COMMENT "Copying files needed by h5repart tests" DEPENDS ${h5repart_files_list})
 
diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c
index 3095618..8abd4e5 100644
--- a/tools/test/misc/clear_open_chk.c
+++ b/tools/test/misc/clear_open_chk.c
@@ -47,10 +47,10 @@ main(int argc, char *argv[])
     }
 
     /* Get the file name */
-    fname = HDstrdup(argv[1]);
+    fname = strdup(argv[1]);
 
     /* Try opening the file */
-    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) {
+    if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, false, NULL, (size_t)0)) < 0) {
         fprintf(stderr, "clear_open_chk: unable to open the file\n");
         free(fname);
         exit(EXIT_FAILURE);
diff --git a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl b/tools/test/misc/expected/h5clear_equal_after_size.ddl
index 1b9a4e4..1b9a4e4 100644
--- a/tools/test/misc/testfiles/h5clear_equal_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_equal_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl b/tools/test/misc/expected/h5clear_equal_before_size.ddl
index 9beed42..9beed42 100644
--- a/tools/test/misc/testfiles/h5clear_equal_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_equal_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl b/tools/test/misc/expected/h5clear_greater_after_size.ddl
index 74c8f19..74c8f19 100644
--- a/tools/test/misc/testfiles/h5clear_greater_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_greater_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl b/tools/test/misc/expected/h5clear_greater_before_size.ddl
index 03b22fb..03b22fb 100644
--- a/tools/test/misc/testfiles/h5clear_greater_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_greater_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_less_after_size.ddl b/tools/test/misc/expected/h5clear_less_after_size.ddl
index bedf0d2..bedf0d2 100644
--- a/tools/test/misc/testfiles/h5clear_less_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_less_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_less_before_size.ddl b/tools/test/misc/expected/h5clear_less_before_size.ddl
index 50ba4c4..50ba4c4 100644
--- a/tools/test/misc/testfiles/h5clear_less_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_less_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_missing_file.ddl b/tools/test/misc/expected/h5clear_missing_file.ddl
index c7a2118..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_missing_file.ddl
+++ b/tools/test/misc/expected/h5clear_missing_file.ddl
diff --git a/tools/test/misc/testfiles/h5clear_missing_file.err b/tools/test/misc/expected/h5clear_missing_file.err
index ea21b76..ea21b76 100644
--- a/tools/test/misc/testfiles/h5clear_missing_file.err
+++ b/tools/test/misc/expected/h5clear_missing_file.err
diff --git a/tools/test/misc/testfiles/h5clear_no_mdc_image.err b/tools/test/misc/expected/h5clear_no_mdc_image.err
index f5acd71..f5acd71 100644
--- a/tools/test/misc/testfiles/h5clear_no_mdc_image.err
+++ b/tools/test/misc/expected/h5clear_no_mdc_image.err
diff --git a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_noclose_after_size.ddl
index 7846b47..7846b47 100644
--- a/tools/test/misc/testfiles/h5clear_noclose_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_noclose_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl b/tools/test/misc/expected/h5clear_noclose_before_size.ddl
index f294a6d..f294a6d 100644
--- a/tools/test/misc/testfiles/h5clear_noclose_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_noclose_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_open_fail.err b/tools/test/misc/expected/h5clear_open_fail.err
index 895ecd4..895ecd4 100644
--- a/tools/test/misc/testfiles/h5clear_open_fail.err
+++ b/tools/test/misc/expected/h5clear_open_fail.err
diff --git a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl
index 7846b47..7846b47 100644
--- a/tools/test/misc/testfiles/h5clear_status_noclose_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_status_noclose_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_usage.ddl b/tools/test/misc/expected/h5clear_usage.ddl
index c7a2118..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_usage.ddl
+++ b/tools/test/misc/expected/h5clear_usage.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl
index 028e134..028e134 100644
--- a/tools/test/misc/testfiles/h5clear_user_equal_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_equal_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl
index ef7c391..ef7c391 100644
--- a/tools/test/misc/testfiles/h5clear_user_equal_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_equal_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl
index 9d7de6f..9d7de6f 100644
--- a/tools/test/misc/testfiles/h5clear_user_greater_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_greater_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl
index c3fe625..c3fe625 100644
--- a/tools/test/misc/testfiles/h5clear_user_greater_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_greater_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl b/tools/test/misc/expected/h5clear_user_less_after_size.ddl
index 02c0d2a..02c0d2a 100644
--- a/tools/test/misc/testfiles/h5clear_user_less_after_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_less_after_size.ddl
diff --git a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl b/tools/test/misc/expected/h5clear_user_less_before_size.ddl
index 0651c2b..0651c2b 100644
--- a/tools/test/misc/testfiles/h5clear_user_less_before_size.ddl
+++ b/tools/test/misc/expected/h5clear_user_less_before_size.ddl
diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/expected/h5mkgrp_help.txt
index d01fbee..d01fbee 100644
--- a/tools/test/misc/testfiles/h5mkgrp_help.txt
+++ b/tools/test/misc/expected/h5mkgrp_help.txt
diff --git a/tools/testfiles/h5mkgrp_nested_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_lp.ls
index 1fe8ce8..1fe8ce8 100644
--- a/tools/testfiles/h5mkgrp_nested_lp.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_lp.ls
diff --git a/tools/testfiles/h5mkgrp_nested_mult_lp.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls
index 50380ec..50380ec 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_lp.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_mult_lp.ls
diff --git a/tools/testfiles/h5mkgrp_nested_mult_p.ls b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls
index f2b3b4b..f2b3b4b 100644
--- a/tools/testfiles/h5mkgrp_nested_mult_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_mult_p.ls
diff --git a/tools/testfiles/h5mkgrp_nested_p.ls b/tools/test/misc/expected/h5mkgrp_nested_p.ls
index 3034dbb..3034dbb 100644
--- a/tools/testfiles/h5mkgrp_nested_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_nested_p.ls
diff --git a/tools/testfiles/h5mkgrp_several.ls b/tools/test/misc/expected/h5mkgrp_several.ls
index 68a3f9c..68a3f9c 100644
--- a/tools/testfiles/h5mkgrp_several.ls
+++ b/tools/test/misc/expected/h5mkgrp_several.ls
diff --git a/tools/testfiles/h5mkgrp_several_l.ls b/tools/test/misc/expected/h5mkgrp_several_l.ls
index 5e1b4be..5e1b4be 100644
--- a/tools/testfiles/h5mkgrp_several_l.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_l.ls
diff --git a/tools/testfiles/h5mkgrp_several_p.ls b/tools/test/misc/expected/h5mkgrp_several_p.ls
index 43f1ce5..43f1ce5 100644
--- a/tools/testfiles/h5mkgrp_several_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_p.ls
diff --git a/tools/testfiles/h5mkgrp_several_v.ls b/tools/test/misc/expected/h5mkgrp_several_v.ls
index a6df87b..a6df87b 100644
--- a/tools/testfiles/h5mkgrp_several_v.ls
+++ b/tools/test/misc/expected/h5mkgrp_several_v.ls
diff --git a/tools/testfiles/h5mkgrp_single.ls b/tools/test/misc/expected/h5mkgrp_single.ls
index f2bd01c..f2bd01c 100644
--- a/tools/testfiles/h5mkgrp_single.ls
+++ b/tools/test/misc/expected/h5mkgrp_single.ls
diff --git a/tools/testfiles/h5mkgrp_single_l.ls b/tools/test/misc/expected/h5mkgrp_single_l.ls
index 1763a61..1763a61 100644
--- a/tools/testfiles/h5mkgrp_single_l.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_l.ls
diff --git a/tools/testfiles/h5mkgrp_single_p.ls b/tools/test/misc/expected/h5mkgrp_single_p.ls
index e82dc31..e82dc31 100644
--- a/tools/testfiles/h5mkgrp_single_p.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_p.ls
diff --git a/tools/testfiles/h5mkgrp_single_v.ls b/tools/test/misc/expected/h5mkgrp_single_v.ls
index 7360865..7360865 100644
--- a/tools/testfiles/h5mkgrp_single_v.ls
+++ b/tools/test/misc/expected/h5mkgrp_single_v.ls
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index 5cb7aa2..892e974 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -64,7 +64,7 @@ gen_cache_image_file(const char *fname)
         int arr[50][100];
     } * buf;                                       /* Buffer for data to write */
     H5AC_cache_image_config_t cache_image_config = /* Cache image input configuration */
-        {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, TRUE, FALSE, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE};
+        {H5AC__CURR_CACHE_IMAGE_CONFIG_VERSION, true, false, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE};
 
     /* Create and fill array */
     buf = malloc(sizeof(*buf));
@@ -168,7 +168,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static int
-gen_enhance_files(hbool_t user)
+gen_enhance_files(bool user)
 {
     hid_t    fid  = H5I_INVALID_HID; /* File ID */
     hid_t    fcpl = H5I_INVALID_HID; /* File creation property list */
@@ -193,7 +193,7 @@ gen_enhance_files(hbool_t user)
     }
 
     /* Set file space strategy and persisting free-space */
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
+    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0)
         goto error;
 
     /*
@@ -274,7 +274,7 @@ gen_enhance_files(hbool_t user)
         }
 
         /* location of "end of file address" */
-        if (lseek(fd, (off_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
+        if (lseek(fd, (HDoff_t)(28 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
             goto error;
 
         /* Write the bad eoa value to the file */
@@ -282,7 +282,7 @@ gen_enhance_files(hbool_t user)
             goto error;
 
         /* location of "superblock checksum" */
-        if (lseek(fd, (off_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
+        if (lseek(fd, (HDoff_t)(44 + (user ? USERBLOCK : 0)), SEEK_SET) < 0)
             goto error;
 
         /* Write the chksum value to the file */
@@ -383,9 +383,9 @@ main(void)
         goto error;
 
     /* Generate the first 6 files in FILENAME_ENHANCE[]  */
-    if (gen_enhance_files(FALSE) < 0)
+    if (gen_enhance_files(false) < 0)
         goto error;
-    if (gen_enhance_files(TRUE) < 0)
+    if (gen_enhance_files(true) < 0)
         goto error;
 
     /*
@@ -407,7 +407,7 @@ main(void)
      *      --FILENAME[0]: "h5clear_sec2_v3.h5", "latest_h5clear_sec2_v3.h5"
      *      --FILENAME[1]: "h5clear_log_v3.h5", "latest_h5clear_log_v3.h5"
      */
-    for (new_format = FALSE; new_format <= TRUE; new_format++) {
+    for (new_format = false; new_format <= true; new_format++) {
         hid_t fapl2, my_fapl; /* File access property lists */
 
         /* Set to use the appropriate file access property list */
@@ -421,7 +421,7 @@ main(void)
         if ((my_fapl = H5Pcopy(fapl2)) < 0)
             goto error;
         /* Create the file */
-        HDsnprintf(fname, sizeof(fname), "%s%s", new_format ? "latest_" : "", FILENAME[0]);
+        snprintf(fname, sizeof(fname), "%s%s", new_format ? "latest_" : "", FILENAME[0]);
         if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT,
                              my_fapl)) < 0)
             goto error;
@@ -446,7 +446,7 @@ main(void)
             goto error;
 
         /* Create the file */
-        HDsnprintf(fname, sizeof(fname), "%s%s", new_format ? "latest_" : "", FILENAME[1]);
+        snprintf(fname, sizeof(fname), "%s%s", new_format ? "latest_" : "", FILENAME[1]);
         if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC | (new_format ? 0 : H5F_ACC_SWMR_WRITE), H5P_DEFAULT,
                              my_fapl)) < 0)
             goto error;
@@ -559,7 +559,7 @@ main(void)
         goto error;
 
     /* Set file space strategy and persisting free-space */
-    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, TRUE, (hsize_t)1) < 0)
+    if (H5Pset_file_space_strategy(fcpl, H5F_FSPACE_STRATEGY_FSM_AGGR, true, (hsize_t)1) < 0)
         goto error;
 
     /* Create the file with the set file space info */
diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c
index 24d0581..7756914 100644
--- a/tools/test/misc/h5perf_gentest.c
+++ b/tools/test/misc/h5perf_gentest.c
@@ -103,7 +103,7 @@ main(int argc, char *argv[])
     }
 
     if (strlen(fname) <= 0)
-        HDsnprintf(fname, sizeof(fname), FNAME);
+        snprintf(fname, sizeof(fname), FNAME);
 
     create_perf_test_file(fname, ngrps, ndsets, nattrs, (hsize_t)nrows, (hsize_t)dim0, (hsize_t)chunk, vlen,
                           z, l);
@@ -322,7 +322,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     add_attrs(fid, 0);
 
-    HDsnprintf(name, sizeof(name), "a cmp ds of %d rows", nrows);
+    snprintf(name, sizeof(name), "a cmp ds of %d rows", nrows);
     did = H5Dcreate(fid, name, cmp_tid, sid_large, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     H5Dwrite(did, cmp_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_comp_large);
     add_attrs(did, 0);
@@ -342,7 +342,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
     add_attrs(gid1, 0);
     for (i = 0; i < ngrps; i++) {
         /* create sub groups */
-        HDsnprintf(name, sizeof(name), "g%02d", i);
+        snprintf(name, sizeof(name), "g%02d", i);
         gid2 = H5Gcreate(gid1, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if (i < 10)
             add_attrs(gid2, 0);
@@ -355,14 +355,14 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
     add_attrs(gid1, 0);
     for (j = 0; j < ndsets; j += 12) {
         /* 1 add a null dataset */
-        HDsnprintf(name, sizeof(name), "%05d null dataset", j);
+        snprintf(name, sizeof(name), "%05d null dataset", j);
         did = H5Dcreate(gid1, name, H5T_STD_I32LE, sid_null, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if (!j)
             add_attrs(did, j);
         H5Dclose(did);
 
         /* 2 add scalar int point */
-        HDsnprintf(name, sizeof(name), "%05d scalar int point", j);
+        snprintf(name, sizeof(name), "%05d scalar int point", j);
         did = H5Dcreate(gid1, name, H5T_NATIVE_INT, sid_scalar, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &j);
         if (!j)
@@ -370,7 +370,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 3 scalar vlen string */
-        HDsnprintf(name, sizeof(name), "%05d scalar vlen string", j);
+        snprintf(name, sizeof(name), "%05d scalar vlen string", j);
         did = H5Dcreate(gid1, name, tid_vlen_s, sid_scalar, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Dwrite(did, tid_vlen_s, H5S_ALL, H5S_ALL, H5P_DEFAULT, &buf_vlen_s[0]);
         if (!j)
@@ -378,7 +378,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 4 add fixed-length float array */
-        HDsnprintf(name, sizeof(name), "%05d fixed-length float array", j);
+        snprintf(name, sizeof(name), "%05d fixed-length float array", j);
         did = H5Dcreate(gid1, name, tid_array_f, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, tid_array_f, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_float_a);
         if (!j)
@@ -386,7 +386,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 5 add fixed-length strings */
-        HDsnprintf(name, sizeof(name), "%05d fixed-length strings", j);
+        snprintf(name, sizeof(name), "%05d fixed-length strings", j);
         did = H5Dcreate(gid1, name, tid_str, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, tid_str, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_str);
         if (!j)
@@ -394,7 +394,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 6 add compound data */
-        HDsnprintf(name, sizeof(name), "%05d compound data", j);
+        snprintf(name, sizeof(name), "%05d compound data", j);
         did = H5Dcreate(gid1, name, cmp_tid, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, cmp_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_comp);
         if (!j)
@@ -402,7 +402,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 7 add 2D double */
-        HDsnprintf(name, sizeof(name), "%05d 2D double", j);
+        snprintf(name, sizeof(name), "%05d 2D double", j);
         strcpy(tmp_name1, name);
         did = H5Dcreate(gid1, name, H5T_NATIVE_DOUBLE, sid_2d, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Dwrite(did, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_double2d[0]);
@@ -411,7 +411,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 8 add 1D int array */
-        HDsnprintf(name, sizeof(name), "%05d 1D int array", j);
+        snprintf(name, sizeof(name), "%05d 1D int array", j);
         did = H5Dcreate(gid1, name, H5T_NATIVE_INT, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_int);
         if (!j)
@@ -419,7 +419,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 9 add vlen int array */
-        HDsnprintf(name, sizeof(name), "%05d vlen int array", j);
+        snprintf(name, sizeof(name), "%05d vlen int array", j);
         strcpy(tmp_name2, name);
         did = H5Dcreate(gid1, name, tid_vlen_i, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, tid_vlen_i, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_vlen_i);
@@ -428,7 +428,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Dclose(did);
 
         /* 10 add vlen strings */
-        HDsnprintf(name, sizeof(name), "%05d vlen strings", j);
+        snprintf(name, sizeof(name), "%05d vlen strings", j);
         strcpy(tmp_name3, name);
         did = H5Dcreate(gid1, name, tid_vlen_s, sid_1d, H5P_DEFAULT, dcpl, H5P_DEFAULT);
         H5Dwrite(did, tid_vlen_s, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_vlen_s);
@@ -439,7 +439,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         /* 11 add object refs */
         H5Rcreate(&buf_ref[0], gid1, ".", H5R_OBJECT, (hid_t)-1);
         H5Rcreate(&buf_ref[1], gid1, tmp_name3, H5R_OBJECT, (hid_t)-1);
-        HDsnprintf(name, sizeof(name), "%05d obj refs", j);
+        snprintf(name, sizeof(name), "%05d obj refs", j);
         did = H5Dcreate(gid1, name, H5T_STD_REF_OBJ, sid_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Dwrite(did, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_ref);
         if (!j)
@@ -454,7 +454,7 @@ create_perf_test_file(const char *fname, int ngrps, int ndsets, int nattrs, hsiz
         H5Sselect_hyperslab(sid_1d, H5S_SELECT_SET, &start, &stride, &count, NULL);
         H5Rcreate(&buf_reg_ref[1], gid1, tmp_name2, H5R_DATASET_REGION, sid_1d);
         H5Sselect_none(sid_1d);
-        HDsnprintf(name, sizeof(name), "%05d region refs", j);
+        snprintf(name, sizeof(name), "%05d region refs", j);
         did = H5Dcreate(gid1, name, H5T_STD_REF_DSETREG, sid_2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         H5Dwrite(did, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_reg_ref);
         if (!j)
@@ -570,11 +570,11 @@ add_attrs(hid_t oid, int idx)
 
     /* 1 scalar point */
     sid = H5Screate(H5S_SCALAR);
-    HDsnprintf(name, sizeof(name), "%05d scalar int", idx);
+    snprintf(name, sizeof(name), "%05d scalar int", idx);
     nattrs += add_attr(oid, name, H5T_NATIVE_UINT, sid, &i);
-    HDsnprintf(name, sizeof(name), "%05d scalar ulong", idx);
+    snprintf(name, sizeof(name), "%05d scalar ulong", idx);
     nattrs += add_attr(oid, name, H5T_NATIVE_INT64, sid, &l);
-    HDsnprintf(name, sizeof(name), "%05d scalar str", idx);
+    snprintf(name, sizeof(name), "%05d scalar str", idx);
     tid = H5Tcopy(H5T_C_S1);
     H5Tset_size(tid, H5T_VARIABLE);
     nattrs += add_attr(oid, name, tid, sid, &s[2]);
@@ -584,24 +584,24 @@ add_attrs(hid_t oid, int idx)
     /* 4 single point */
     sid = H5Screate_simple(1, dims1, NULL);
     H5Rcreate(&ref, oid, ".", H5R_OBJECT, (hid_t)-1);
-    HDsnprintf(name, sizeof(name), "%05d single float", idx);
+    snprintf(name, sizeof(name), "%05d single float", idx);
     nattrs += add_attr(oid, name, H5T_NATIVE_FLOAT, sid, &f);
-    HDsnprintf(name, sizeof(name), "%05d single double", idx);
+    snprintf(name, sizeof(name), "%05d single double", idx);
     nattrs += add_attr(oid, name, H5T_NATIVE_DOUBLE, sid, &d);
-    HDsnprintf(name, sizeof(name), "%05d single obj_ref", idx);
+    snprintf(name, sizeof(name), "%05d single obj_ref", idx);
     nattrs += add_attr(oid, name, H5T_STD_REF_OBJ, sid, &ref);
     H5Sclose(sid);
 
     /* 7 fixed length 1D array */
     sid = H5Screate_simple(1, dims1, NULL);
     tid = H5Tarray_create(H5T_NATIVE_FLOAT, 1, dims2);
-    HDsnprintf(name, sizeof(name), "%05d array float", idx);
+    snprintf(name, sizeof(name), "%05d array float", idx);
     nattrs += add_attr(oid, name, tid, sid, &f_array[0]);
     H5Tclose(tid);
     tid = H5Tcopy(H5T_C_S1);
     H5Tset_size(tid, strlen(s[0]) + 1);
     tid1 = H5Tarray_create(tid, 1, dims2);
-    HDsnprintf(name, sizeof(name), "%05d array str", idx);
+    snprintf(name, sizeof(name), "%05d array str", idx);
     nattrs += add_attr(oid, name, tid1, sid, s);
     H5Tclose(tid1);
     H5Tclose(tid);
@@ -610,7 +610,7 @@ add_attrs(hid_t oid, int idx)
     /* 9 fixed length 2D int arrays */
     sid = H5Screate_simple(1, dims2, NULL);
     tid = H5Tarray_create(H5T_NATIVE_INT, 2, dims3);
-    HDsnprintf(name, sizeof(name), "%05d array int 2D", idx);
+    snprintf(name, sizeof(name), "%05d array int 2D", idx);
     nattrs += add_attr(oid, name, tid, sid, int3d[0][0]);
     H5Tclose(tid);
     H5Sclose(sid);
@@ -619,12 +619,12 @@ add_attrs(hid_t oid, int idx)
     sid = H5Screate_simple(1, dims2, NULL);
     tid = H5Tcopy(H5T_C_S1);
     H5Tset_size(tid, H5T_VARIABLE);
-    HDsnprintf(name, sizeof(name), "%05d vlen strings", idx);
+    snprintf(name, sizeof(name), "%05d vlen strings", idx);
     nattrs += add_attr(oid, name, tid, sid, s_vlen);
     H5Tclose(tid);
     tid = H5Tvlen_create(H5T_NATIVE_INT);
     ;
-    HDsnprintf(name, sizeof(name), "%05d vlen int array", idx);
+    snprintf(name, sizeof(name), "%05d vlen int array", idx);
     nattrs += add_attr(oid, name, tid, sid, i_vlen);
     H5Tclose(tid);
     H5Sclose(sid);
@@ -638,7 +638,7 @@ add_attrs(hid_t oid, int idx)
     offset += sizeof(H5T_NATIVE_INT);
     H5Tinsert(tid, "City", offset, tid1);
     offset += sizeof(char *);
-    HDsnprintf(name, sizeof(name), "%05d compound data", idx);
+    snprintf(name, sizeof(name), "%05d compound data", idx);
     nattrs += add_attr(oid, name, tid, sid, cmp_data);
     H5Tclose(tid1);
     H5Tclose(tid);
diff --git a/tools/test/misc/h5repart_gentest.c b/tools/test/misc/h5repart_gentest.c
index 9f0eee1..a4a4ab1 100644
--- a/tools/test/misc/h5repart_gentest.c
+++ b/tools/test/misc/h5repart_gentest.c
@@ -34,11 +34,11 @@ main(void)
 
     /* Set up data array */
     if (NULL == (buf_data = (int *)calloc(FAMILY_NUMBER * FAMILY_SIZE, sizeof(int)))) {
-        HDperror("calloc");
+        perror("calloc");
         exit(EXIT_FAILURE);
     }
     if (NULL == (buf = (int **)calloc(FAMILY_NUMBER, sizeof(buf_data)))) {
-        HDperror("calloc");
+        perror("calloc");
         exit(EXIT_FAILURE);
     }
     for (i = 0; i < FAMILY_NUMBER; i++)
@@ -46,28 +46,28 @@ main(void)
 
     /* Set property list and file name for FAMILY driver */
     if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) {
-        HDperror("H5Pcreate");
+        perror("H5Pcreate");
         exit(EXIT_FAILURE);
     }
 
     if (H5Pset_fapl_family(fapl, (hsize_t)FAMILY_SIZE, H5P_DEFAULT) < 0) {
-        HDperror("H5Pset_fapl_family");
+        perror("H5Pset_fapl_family");
         exit(EXIT_FAILURE);
     }
 
     if ((file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) {
-        HDperror("H5Fcreate");
+        perror("H5Fcreate");
         exit(EXIT_FAILURE);
     }
 
     /* Create and write dataset */
     if ((space = H5Screate_simple(2, dims, NULL)) < 0) {
-        HDperror("H5Screate_simple");
+        perror("H5Screate_simple");
         exit(EXIT_FAILURE);
     }
 
     if ((dset = H5Dcreate2(file, dname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
-        HDperror("H5Dcreate2");
+        perror("H5Dcreate2");
         exit(EXIT_FAILURE);
     }
 
@@ -76,34 +76,34 @@ main(void)
             buf[i][j] = i * 10000 + j;
 
     if (H5Dwrite(dset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_data) < 0) {
-        HDperror("H5Dwrite");
+        perror("H5Dwrite");
         exit(EXIT_FAILURE);
     }
 
     if (H5Sclose(space) < 0) {
-        HDperror("H5Sclose");
+        perror("H5Sclose");
         exit(EXIT_FAILURE);
     }
 
     if (H5Dclose(dset) < 0) {
-        HDperror("H5Dclose");
+        perror("H5Dclose");
         exit(EXIT_FAILURE);
     }
 
     if (H5Pclose(fapl) < 0) {
-        HDperror("H5Pclose");
+        perror("H5Pclose");
         exit(EXIT_FAILURE);
     }
 
     if (H5Fclose(file) < 0) {
-        HDperror("H5Fclose");
+        perror("H5Fclose");
         exit(EXIT_FAILURE);
     }
 
     free(buf);
     free(buf_data);
 
-    HDputs(" PASSED");
+    puts(" PASSED");
     fflush(stdout);
 
     return EXIT_SUCCESS;
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 805b30b..b64c8ad 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -53,12 +53,12 @@ main(void)
 
     printf("%-70s", "Testing alignment in compound datatypes");
 
-    HDstrcpy(string5, "Hi!");
+    strcpy(string5, "Hi!");
     HDunlink(fname);
     fil = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     if (fil < 0) {
-        HDputs("*FAILED*");
+        puts("*FAILED*");
         return 1;
     }
 
@@ -125,7 +125,7 @@ main(void)
     data = (char *)malloc(H5Tget_size(fix));
 
     if (!data) {
-        HDperror("malloc() failed");
+        perror("malloc() failed");
         HDabort();
     }
 
@@ -138,7 +138,7 @@ main(void)
 out:
     if (error < 0) {
         result = 1;
-        HDputs("*FAILED - HDF5 library error*");
+        puts("*FAILED - HDF5 library error*");
     }
     else if (!(H5_FLT_ABS_EQUAL(fok[0], fptr[0])) || !(H5_FLT_ABS_EQUAL(fok[1], fptr[1])) ||
              !(H5_FLT_ABS_EQUAL(fnok[0], fptr[2])) || !(H5_FLT_ABS_EQUAL(fnok[1], fptr[3]))) {
@@ -179,10 +179,10 @@ out:
                "                    %6f = %f\n",
                (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0],
                (double)fptr[2], (double)fnok[1], (double)fptr[3]);
-        HDputs("*FAILED - compound type alignmnent problem*");
+        puts("*FAILED - compound type alignnent problem*");
     }
     else {
-        HDputs(" PASSED");
+        puts(" PASSED");
     }
 
     if (data)
diff --git a/tools/testfiles/family_file00000.h5 b/tools/test/misc/testfiles/family_file00000.h5
index 88f75ca..88f75ca 100644
--- a/tools/testfiles/family_file00000.h5
+++ b/tools/test/misc/testfiles/family_file00000.h5
diff --git a/tools/testfiles/family_file00001.h5 b/tools/test/misc/testfiles/family_file00001.h5
index 0da088e..0da088e 100644
--- a/tools/testfiles/family_file00001.h5
+++ b/tools/test/misc/testfiles/family_file00001.h5
diff --git a/tools/testfiles/family_file00002.h5 b/tools/test/misc/testfiles/family_file00002.h5
index c458a23..c458a23 100644
--- a/tools/testfiles/family_file00002.h5
+++ b/tools/test/misc/testfiles/family_file00002.h5
diff --git a/tools/testfiles/family_file00003.h5 b/tools/test/misc/testfiles/family_file00003.h5
index 7e98035..7e98035 100644
--- a/tools/testfiles/family_file00003.h5
+++ b/tools/test/misc/testfiles/family_file00003.h5
diff --git a/tools/testfiles/family_file00004.h5 b/tools/test/misc/testfiles/family_file00004.h5
index cf6f4905..cf6f4905 100644
--- a/tools/testfiles/family_file00004.h5
+++ b/tools/test/misc/testfiles/family_file00004.h5
diff --git a/tools/testfiles/family_file00005.h5 b/tools/test/misc/testfiles/family_file00005.h5
index 864564a..864564a 100644
--- a/tools/testfiles/family_file00005.h5
+++ b/tools/test/misc/testfiles/family_file00005.h5
diff --git a/tools/testfiles/family_file00006.h5 b/tools/test/misc/testfiles/family_file00006.h5
index 9cc2693..9cc2693 100644
--- a/tools/testfiles/family_file00006.h5
+++ b/tools/test/misc/testfiles/family_file00006.h5
diff --git a/tools/testfiles/family_file00007.h5 b/tools/test/misc/testfiles/family_file00007.h5
index a0f0043..a0f0043 100644
--- a/tools/testfiles/family_file00007.h5
+++ b/tools/test/misc/testfiles/family_file00007.h5
diff --git a/tools/testfiles/family_file00008.h5 b/tools/test/misc/testfiles/family_file00008.h5
index eec73e0..eec73e0 100644
--- a/tools/testfiles/family_file00008.h5
+++ b/tools/test/misc/testfiles/family_file00008.h5
diff --git a/tools/testfiles/family_file00009.h5 b/tools/test/misc/testfiles/family_file00009.h5
index b28cf90..b28cf90 100644
--- a/tools/testfiles/family_file00009.h5
+++ b/tools/test/misc/testfiles/family_file00009.h5
diff --git a/tools/testfiles/family_file00010.h5 b/tools/test/misc/testfiles/family_file00010.h5
index fe1a620..fe1a620 100644
--- a/tools/testfiles/family_file00010.h5
+++ b/tools/test/misc/testfiles/family_file00010.h5
diff --git a/tools/testfiles/family_file00011.h5 b/tools/test/misc/testfiles/family_file00011.h5
index 4e5d9e4..4e5d9e4 100644
--- a/tools/testfiles/family_file00011.h5
+++ b/tools/test/misc/testfiles/family_file00011.h5
diff --git a/tools/testfiles/family_file00012.h5 b/tools/test/misc/testfiles/family_file00012.h5
index c70b87e..c70b87e 100644
--- a/tools/testfiles/family_file00012.h5
+++ b/tools/test/misc/testfiles/family_file00012.h5
diff --git a/tools/testfiles/family_file00013.h5 b/tools/test/misc/testfiles/family_file00013.h5
index b181df8..b181df8 100644
--- a/tools/testfiles/family_file00013.h5
+++ b/tools/test/misc/testfiles/family_file00013.h5
diff --git a/tools/testfiles/family_file00014.h5 b/tools/test/misc/testfiles/family_file00014.h5
index 74867f1..74867f1 100644
--- a/tools/testfiles/family_file00014.h5
+++ b/tools/test/misc/testfiles/family_file00014.h5
diff --git a/tools/testfiles/family_file00015.h5 b/tools/test/misc/testfiles/family_file00015.h5
index de984c2..de984c2 100644
--- a/tools/testfiles/family_file00015.h5
+++ b/tools/test/misc/testfiles/family_file00015.h5
diff --git a/tools/testfiles/family_file00016.h5 b/tools/test/misc/testfiles/family_file00016.h5
index 810cf34..810cf34 100644
--- a/tools/testfiles/family_file00016.h5
+++ b/tools/test/misc/testfiles/family_file00016.h5
diff --git a/tools/testfiles/family_file00017.h5 b/tools/test/misc/testfiles/family_file00017.h5
index 9171ab9..9171ab9 100644
--- a/tools/testfiles/family_file00017.h5
+++ b/tools/test/misc/testfiles/family_file00017.h5
diff --git a/tools/test/misc/testh5clear.sh.in b/tools/test/misc/testh5clear.sh.in
index 018d1fd..b5bf5cc 100644
--- a/tools/test/misc/testh5clear.sh.in
+++ b/tools/test/misc/testh5clear.sh.in
@@ -40,9 +40,9 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
 SRC_H5CLEAR_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
+SRC_H5CLEAR_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
 TESTDIR=./testh5clear
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -61,25 +61,25 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_H5CLEAR_TESTFILES/h5clear_open_fail.err
-$SRC_H5CLEAR_TESTFILES/h5clear_no_mdc_image.err
-$SRC_H5CLEAR_TESTFILES/h5clear_usage.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_missing_file.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_status_noclose_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_noclose_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_noclose_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_equal_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_equal_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_greater_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_greater_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_less_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_less_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_equal_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_greater_after_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_less_before_size.ddl
-$SRC_H5CLEAR_TESTFILES/h5clear_user_less_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_open_fail.err
+$SRC_H5CLEAR_OUTFILES/h5clear_no_mdc_image.err
+$SRC_H5CLEAR_OUTFILES/h5clear_usage.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_missing_file.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_status_noclose_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_noclose_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_noclose_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_equal_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_equal_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_greater_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_greater_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_less_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_less_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_equal_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_greater_after_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_less_before_size.ddl
+$SRC_H5CLEAR_OUTFILES/h5clear_user_less_after_size.ddl
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v0.h5
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v2.h5
 $SRC_H5CLEAR_TESTFILES/h5clear_sec2_v3.h5
diff --git a/tools/test/misc/testh5mkgrp.sh.in b/tools/test/misc/testh5mkgrp.sh.in
index d581fe1..676f6b0 100644
--- a/tools/test/misc/testh5mkgrp.sh.in
+++ b/tools/test/misc/testh5mkgrp.sh.in
@@ -39,9 +39,9 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
 # testfiles source dirs for tools
 SRC_H5MKGRP_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
+SRC_H5MKGRP_OUTFILES="$SRC_TOOLS/test/misc/expected"
 
 TESTDIR=./testgrp
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -60,19 +60,19 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_H5MKGRP_TESTFILES/h5mkgrp_help.txt
-$SRC_TOOLS_TESTFILES/h5mkgrp_single.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_v.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_single_l.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_v.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_several_l.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_lp.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_p.ls
-$SRC_TOOLS_TESTFILES/h5mkgrp_nested_mult_lp.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_help.txt
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_v.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_single_l.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_v.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_several_l.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_lp.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_p.ls
+$SRC_H5MKGRP_OUTFILES/h5mkgrp_nested_mult_lp.ls
 "
 
 COPY_TESTFILES_TO_TESTDIR()
diff --git a/tools/test/misc/testh5repart.sh.in b/tools/test/misc/testh5repart.sh.in
index b0d52f6..addd0db 100644
--- a/tools/test/misc/testh5repart.sh.in
+++ b/tools/test/misc/testh5repart.sh.in
@@ -38,7 +38,7 @@ verbose=yes
 # source dirs
 SRC_TOOLS="$srcdir/../.."
 
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
+SRC_H5REPART_TESTFILES="$SRC_TOOLS/test/misc/testfiles"
 
 TESTDIR=./testrepart
 test -d $TESTDIR || mkdir -p $TESTDIR
@@ -47,24 +47,24 @@ test -d $TESTDIR || mkdir -p $TESTDIR
 # copy test files and expected output files from source dirs to test dir
 #
 COPY_TESTFILES="
-$SRC_TOOLS_TESTFILES/family_file00000.h5
-$SRC_TOOLS_TESTFILES/family_file00001.h5
-$SRC_TOOLS_TESTFILES/family_file00002.h5
-$SRC_TOOLS_TESTFILES/family_file00003.h5
-$SRC_TOOLS_TESTFILES/family_file00004.h5
-$SRC_TOOLS_TESTFILES/family_file00005.h5
-$SRC_TOOLS_TESTFILES/family_file00006.h5
-$SRC_TOOLS_TESTFILES/family_file00007.h5
-$SRC_TOOLS_TESTFILES/family_file00008.h5
-$SRC_TOOLS_TESTFILES/family_file00009.h5
-$SRC_TOOLS_TESTFILES/family_file00010.h5
-$SRC_TOOLS_TESTFILES/family_file00011.h5
-$SRC_TOOLS_TESTFILES/family_file00012.h5
-$SRC_TOOLS_TESTFILES/family_file00013.h5
-$SRC_TOOLS_TESTFILES/family_file00014.h5
-$SRC_TOOLS_TESTFILES/family_file00015.h5
-$SRC_TOOLS_TESTFILES/family_file00016.h5
-$SRC_TOOLS_TESTFILES/family_file00017.h5
+$SRC_H5REPART_TESTFILES/family_file00000.h5
+$SRC_H5REPART_TESTFILES/family_file00001.h5
+$SRC_H5REPART_TESTFILES/family_file00002.h5
+$SRC_H5REPART_TESTFILES/family_file00003.h5
+$SRC_H5REPART_TESTFILES/family_file00004.h5
+$SRC_H5REPART_TESTFILES/family_file00005.h5
+$SRC_H5REPART_TESTFILES/family_file00006.h5
+$SRC_H5REPART_TESTFILES/family_file00007.h5
+$SRC_H5REPART_TESTFILES/family_file00008.h5
+$SRC_H5REPART_TESTFILES/family_file00009.h5
+$SRC_H5REPART_TESTFILES/family_file00010.h5
+$SRC_H5REPART_TESTFILES/family_file00011.h5
+$SRC_H5REPART_TESTFILES/family_file00012.h5
+$SRC_H5REPART_TESTFILES/family_file00013.h5
+$SRC_H5REPART_TESTFILES/family_file00014.h5
+$SRC_H5REPART_TESTFILES/family_file00015.h5
+$SRC_H5REPART_TESTFILES/family_file00016.h5
+$SRC_H5REPART_TESTFILES/family_file00017.h5
 "
 
 COPY_TESTFILES_TO_TESTDIR()
@@ -100,7 +100,7 @@ CLEAN_TESTFILES_AND_TESTDIR()
     # skip rm if srcdir is same as destdir
     # this occurs when build/test performed in source dir and
     # make cp fail
-    SDIR=$SRC_TOOLS_TESTFILES
+    SDIR=$SRC_H5REPART_TESTFILES
     INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
     INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
     if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
diff --git a/tools/test/misc/vds/UC_common.h b/tools/test/misc/vds/UC_common.h
index 234ec87..4cfce35 100644
--- a/tools/test/misc/vds/UC_common.h
+++ b/tools/test/misc/vds/UC_common.h
@@ -26,10 +26,6 @@
 /* Compression level */
 #define COMPRESSION_LEVEL 7
 
-/* Booleans */
-#define TRUE  1
-#define FALSE 0
-
 /* Testing macros */
 #define AT() printf("   at %s:%d in %s()...\n", __FILE__, __LINE__, __func__);
 #define UC_ERROR                                                                                             \
diff --git a/tools/test/perform/CMakeTests.cmake b/tools/test/perform/CMakeTests.cmake
index acfe169..2dea619 100644
--- a/tools/test/perform/CMakeTests.cmake
+++ b/tools/test/perform/CMakeTests.cmake
@@ -16,7 +16,7 @@
 ##############################################################################
 ##############################################################################
 
-HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files")
+HDFTEST_COPY_FILE("${HDF5_TOOLS_TST_DIR}/h5dump/testfiles/tfilters.h5" "${PROJECT_BINARY_DIR}/tfilters.h5" "zip_perf_files")
 add_custom_target(zip_perf_files ALL COMMENT "Copying files needed by zip_perf tests" DEPENDS ${zip_perf_list})
 
 #-----------------------------------------------------------------------------
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index bc15fdf..b5190fa 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -123,7 +123,7 @@ main(void)
     unsigned                       u;
     herr_t H5_ATTR_NDEBUG_UNUSED   status;
     hssize_t H5_ATTR_NDEBUG_UNUSED n;
-    off_t H5_ATTR_NDEBUG_UNUSED    offset;
+    HDoff_t H5_ATTR_NDEBUG_UNUSED  offset;
     hsize_t                        start[2];
     hsize_t                        count[2];
 
@@ -158,7 +158,7 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "fill raw");
     for (u = 0; u < nwrite; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
         memset(the_data, 0xAA, (size_t)(size[0] * size[1]));
     }
@@ -166,7 +166,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("fill raw",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -181,7 +181,7 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "fill hdf5");
     for (u = 0; u < nread; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
         status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
         assert(status >= 0);
@@ -190,7 +190,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("fill hdf5",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -205,9 +205,9 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "out raw");
     for (u = 0; u < nwrite; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
-        offset = HDlseek(fd, (off_t)0, SEEK_SET);
+        offset = HDlseek(fd, 0, SEEK_SET);
         assert(0 == offset);
         n = HDwrite(fd, the_data, (size_t)(size[0] * size[1]));
         assert(n >= 0 && (size_t)n == (size[0] * size[1]));
@@ -216,7 +216,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("out raw",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -231,7 +231,7 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "out hdf5");
     for (u = 0; u < nwrite; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
         status = H5Dwrite(dset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, the_data);
         assert(status >= 0);
@@ -240,7 +240,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("out hdf5",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -255,9 +255,9 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "in raw");
     for (u = 0; u < nread; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
-        offset = HDlseek(fd, (off_t)0, SEEK_SET);
+        offset = HDlseek(fd, 0, SEEK_SET);
         assert(0 == offset);
         n = HDread(fd, the_data, (size_t)(size[0] * size[1]));
         assert(n >= 0 && (size_t)n == (size[0] * size[1]));
@@ -266,7 +266,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("in raw",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -281,7 +281,7 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "in hdf5");
     for (u = 0; u < nread; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
         status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
         assert(status >= 0);
@@ -290,7 +290,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("in hdf5",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
@@ -310,7 +310,7 @@ main(void)
     t_start = H5_get_time();
     fprintf(stderr, HEADING, "in hdf5 partial");
     for (u = 0; u < nread; u++) {
-        HDputc(PROGRESS, stderr);
+        putc(PROGRESS, stderr);
         fflush(stderr);
         status = H5Dread(dset, H5T_NATIVE_UCHAR, file_space, file_space, H5P_DEFAULT, the_data);
         assert(status >= 0);
@@ -319,7 +319,7 @@ main(void)
     getrusage(RUSAGE_SELF, &r_stop);
 #endif
     t_stop = H5_get_time();
-    HDputc('\n', stderr);
+    putc('\n', stderr);
     print_stats("in hdf5 partial",
 #ifdef H5_HAVE_GETRUSAGE
                 &r_start, &r_stop,
diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c
index 90d5897..00a35bb 100644
--- a/tools/test/perform/overhead.c
+++ b/tools/test/perform/overhead.c
@@ -40,12 +40,12 @@
 #endif
 
 #define FILE_NAME_1 "overhead.h5"
-#ifndef FALSE
-#define FALSE 0
-#endif /* FALSE */
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
+#ifndef false
+#define false 0
+#endif /* false */
+#ifndef true
+#define true 1
+#endif /* true */
 
 typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OUTWARD, FILL_RANDOM } fill_t;
 
@@ -142,7 +142,7 @@ display_error_cb(hid_t estack, void H5_ATTR_UNUSED *client_data)
  *-------------------------------------------------------------------------
  */
 static int
-test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc)
+test(fill_t fill_style, const double splits[], bool verbose, bool use_rdcc)
 {
     hid_t       file = (-1), fapl = (-1), dcpl = (-1), xfer = (-1), mspace = (-1), fspace = (-1), dset = (-1);
     hsize_t     ch_size[1]  = {1};             /*chunk size    */
@@ -312,11 +312,11 @@ error:
 int
 main(int argc, char *argv[])
 {
-    hid_t   xfer;
-    fill_t  fill_style = FILL_ALL;
-    hbool_t use_cache  = FALSE;
-    double  splits[3];
-    int     i, j, nerrors = 0;
+    hid_t  xfer;
+    fill_t fill_style = FILL_ALL;
+    bool   use_cache  = false;
+    double splits[3];
+    int    i, j, nerrors = 0;
 
     /* Default split ratios */
     H5Eset_auto2(H5E_DEFAULT, display_error_cb, NULL);
@@ -346,7 +346,7 @@ main(int argc, char *argv[])
             fill_style = FILL_RANDOM;
         }
         else if (!strcmp(argv[i], "cache")) {
-            use_cache = TRUE;
+            use_cache = true;
         }
         else if (j < 3 && (isdigit(argv[i][0]) || '.' == argv[i][0])) {
             splits[j++] = strtod(argv[i], NULL);
@@ -359,16 +359,16 @@ main(int argc, char *argv[])
     if (FILL_ALL == fill_style) {
         printf("%-7s %8s\n", "Style", "Bytes/Chunk");
         printf("%-7s %8s\n", "-----", "-----------");
-        nerrors += test(FILL_FORWARD, splits, FALSE, use_cache);
-        nerrors += test(FILL_REVERSE, splits, FALSE, use_cache);
-        nerrors += test(FILL_INWARD, splits, FALSE, use_cache);
-        nerrors += test(FILL_OUTWARD, splits, FALSE, use_cache);
-        nerrors += test(FILL_RANDOM, splits, FALSE, use_cache);
+        nerrors += test(FILL_FORWARD, splits, false, use_cache);
+        nerrors += test(FILL_REVERSE, splits, false, use_cache);
+        nerrors += test(FILL_INWARD, splits, false, use_cache);
+        nerrors += test(FILL_OUTWARD, splits, false, use_cache);
+        nerrors += test(FILL_RANDOM, splits, false, use_cache);
     }
     else {
         if (use_cache)
             usage(argv[0]);
-        nerrors += test(fill_style, splits, TRUE, FALSE);
+        nerrors += test(fill_style, splits, true, false);
     }
     if (nerrors > 0)
         goto error;
diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c
index 16df60a..4f1863d 100644
--- a/tools/test/perform/perf_meta.c
+++ b/tools/test/perform/perf_meta.c
@@ -33,13 +33,13 @@ static int TEST_3   = 0x4; /* Test 3 */
 static const char *FILENAME[] = {"meta_perf_1", "meta_perf_2", "meta_perf_3", NULL};
 
 /* Default values for performance. Can be changed through command line options */
-static int     NUM_DSETS   = 16;
-static int     NUM_ATTRS   = 8;
-static int     BATCH_ATTRS = 2;
-static hbool_t flush_dset  = FALSE;
-static hbool_t flush_attr  = FALSE;
-static int     nerrors     = 0; /* errors count */
-static hid_t   fapl;
+static int   NUM_DSETS   = 16;
+static int   NUM_ATTRS   = 8;
+static int   BATCH_ATTRS = 2;
+static bool  flush_dset  = false;
+static bool  flush_attr  = false;
+static int   nerrors     = 0; /* errors count */
+static hid_t fapl;
 
 /* Data space IDs */
 static hid_t space;
@@ -117,9 +117,9 @@ parse_options(int argc, char **argv)
 
                 case 'f': /* Call H5Fflush for each dataset or attribute */
                     if (!strcmp("a", (*argv + 2)))
-                        flush_attr = TRUE;
+                        flush_attr = true;
                     else if (!strcmp("d", (*argv + 2)))
-                        flush_dset = TRUE;
+                        flush_dset = true;
                     else {
                         nerrors++;
                         return (1);
@@ -280,7 +280,7 @@ create_dsets(hid_t file)
      * Create a dataset using the default dataset creation properties.
      */
     for (i = 0; i < NUM_DSETS; i++) {
-        HDsnprintf(dset_name, sizeof(dset_name), "dataset %d", i);
+        snprintf(dset_name, sizeof(dset_name), "dataset %d", i);
         if ((dataset = H5Dcreate2(file, dset_name, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0)
             goto error;
@@ -337,14 +337,14 @@ create_attrs_1(void)
      * Create all(user specifies the number) attributes for each dataset
      */
     for (i = 0; i < NUM_DSETS; i++) {
-        HDsnprintf(dset_name, sizeof(dset_name), "dataset %d", i);
+        snprintf(dset_name, sizeof(dset_name), "dataset %d", i);
         open_t.start = retrieve_time();
         if ((dataset = H5Dopen2(file, dset_name, H5P_DEFAULT)) < 0)
             goto error;
         perf(&open_t, open_t.start, retrieve_time());
 
         for (j = 0; j < NUM_ATTRS; j++) {
-            HDsnprintf(attr_name, sizeof(attr_name), "all attrs for each dset %d", j);
+            snprintf(attr_name, sizeof(attr_name), "all attrs for each dset %d", j);
             attr_t.start = retrieve_time();
             if ((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE, small_space, H5P_DEFAULT,
                                    H5P_DEFAULT)) < 0)
@@ -433,7 +433,7 @@ create_attrs_2(void)
      * Create all(user specifies the number) attributes for each new dataset
      */
     for (i = 0; i < NUM_DSETS; i++) {
-        HDsnprintf(dset_name, sizeof(dset_name), "dataset %d", i);
+        snprintf(dset_name, sizeof(dset_name), "dataset %d", i);
         create_t.start = retrieve_time();
         if ((dataset = H5Dcreate2(file, dset_name, H5T_NATIVE_DOUBLE, space, H5P_DEFAULT, H5P_DEFAULT,
                                   H5P_DEFAULT)) < 0)
@@ -441,7 +441,7 @@ create_attrs_2(void)
         perf(&create_t, create_t.start, retrieve_time());
 
         for (j = 0; j < NUM_ATTRS; j++) {
-            HDsnprintf(attr_name, sizeof(attr_name), "all attrs for each dset %d", j);
+            snprintf(attr_name, sizeof(attr_name), "all attrs for each dset %d", j);
             attr_t.start = retrieve_time();
             if ((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE, small_space, H5P_DEFAULT,
                                    H5P_DEFAULT)) < 0)
@@ -539,14 +539,14 @@ create_attrs_3(void)
 
     for (i = 0; i < loop_num; i++) {
         for (j = 0; j < NUM_DSETS; j++) {
-            HDsnprintf(dset_name, sizeof(dset_name), "dataset %d", j);
+            snprintf(dset_name, sizeof(dset_name), "dataset %d", j);
             open_t.start = retrieve_time();
             if ((dataset = H5Dopen2(file, dset_name, H5P_DEFAULT)) < 0)
                 goto error;
             perf(&open_t, open_t.start, retrieve_time());
 
             for (k = 0; k < BATCH_ATTRS; k++) {
-                HDsnprintf(attr_name, sizeof(attr_name), "some attrs for each dset %d %d", i, k);
+                snprintf(attr_name, sizeof(attr_name), "some attrs for each dset %d %d", i, k);
                 attr_t.start = retrieve_time();
                 if ((attr = H5Acreate2(dataset, attr_name, H5T_NATIVE_DOUBLE, small_space, H5P_DEFAULT,
                                        H5P_DEFAULT)) < 0)
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index b8b80e8..063c165 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -36,13 +36,13 @@
 /* report 0.0 in case t is zero too */
 #define MB_PER_SEC(bytes, t) ((fabs(t) < 0.0000000001) ? 0.0 : ((((double)(bytes)) / (double)ONE_MB) / (t)))
 
-#ifndef TRUE
-#define TRUE 1
-#endif /* TRUE */
+#ifndef true
+#define true 1
+#endif /* true */
 
-#ifndef FALSE
-#define FALSE (!TRUE)
-#endif /* FALSE */
+#ifndef false
+#define false (!true)
+#endif /* false */
 
 #ifndef S_IRWXU
 #define S_IRWXU (_S_IREAD | _S_IWRITE)
@@ -54,7 +54,7 @@ static const char *option_prefix    = NULL;
 static char       *filename         = NULL;
 static int         compress_percent = 0;
 static int         compress_level   = Z_DEFAULT_COMPRESSION;
-static int         output, random_test = FALSE;
+static int         output, random_test = false;
 static int         report_once_flag;
 static double      compression_time;
 
@@ -85,7 +85,7 @@ error(const char *fmt, ...)
     va_start(ap, fmt);
     fprintf(stderr, "%s: error: ", prog);
     H5_GCC_CLANG_DIAG_OFF("format-nonliteral")
-    HDvfprintf(stderr, fmt, ap);
+    vfprintf(stderr, fmt, ap);
     H5_GCC_CLANG_DIAG_ON("format-nonliteral")
     fprintf(stderr, "\n");
     va_end(ap);
@@ -100,7 +100,7 @@ error(const char *fmt, ...)
 static void
 cleanup(void)
 {
-    if (!HDgetenv(HDF5_NOCLEANUP))
+    if (!getenv(HDF5_NOCLEANUP))
         HDunlink(filename);
     free(filename);
 }
@@ -140,7 +140,7 @@ write_file(Bytef *source, uLongf sourceLen)
         int rc = (int)HDwrite(output, d_ptr, (size_t)d_len);
 
         if (rc == -1)
-            error(HDstrerror(errno));
+            error(strerror(errno));
 
         if (rc == (int)d_len)
             break;
@@ -197,7 +197,7 @@ static void
 get_unique_name(void)
 {
     const char *prefix = NULL;
-    const char *env    = HDgetenv("HDF5_PREFIX");
+    const char *env    = getenv("HDF5_PREFIX");
 
     if (env)
         prefix = env;
@@ -207,19 +207,19 @@ get_unique_name(void)
 
     if (prefix)
         /* 2 = 1 for '/' + 1 for null terminator */
-        filename = (char *)malloc(HDstrlen(prefix) + HDstrlen(ZIP_PERF_FILE) + 2);
+        filename = (char *)malloc(strlen(prefix) + strlen(ZIP_PERF_FILE) + 2);
     else
-        filename = (char *)malloc(HDstrlen(ZIP_PERF_FILE) + 1);
+        filename = (char *)malloc(strlen(ZIP_PERF_FILE) + 1);
 
     if (!filename)
         error("out of memory");
 
     filename[0] = 0;
     if (prefix) {
-        HDstrcpy(filename, prefix);
-        HDstrcat(filename, "/");
+        strcpy(filename, prefix);
+        strcat(filename, "/");
     }
-    HDstrcat(filename, ZIP_PERF_FILE);
+    strcat(filename, ZIP_PERF_FILE);
 }
 
 /*
@@ -316,13 +316,13 @@ fill_with_random_data(Bytef *src, uLongf src_len)
         fprintf(stdout, "Using /dev/urandom for random data\n");
 
         if (fd < 0)
-            error(HDstrerror(errno));
+            error(strerror(errno));
 
         for (;;) {
             ssize_t rc = HDread(fd, buf, src_len);
 
             if (rc == -1)
-                error(HDstrerror(errno));
+                error(strerror(errno));
 
             if (rc == (ssize_t)len)
                 break;
@@ -391,7 +391,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
         output = HDopen(filename, O_RDWR | O_CREAT, S_IRWXU);
 
         if (output == -1)
-            error(HDstrerror(errno));
+            error(strerror(errno));
 
         for (i = 0; i <= iters; ++i) {
             Bytef *s_ptr = src;
@@ -402,7 +402,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
                 ssize_t rc = HDwrite(output, s_ptr, s_len);
 
                 if (rc == -1)
-                    error(HDstrerror(errno));
+                    error(strerror(errno));
 
                 if (rc == (ssize_t)s_len)
                     break;
@@ -427,7 +427,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long
         output = HDopen(filename, O_RDWR | O_CREAT, S_IRWXU);
 
         if (output == -1)
-            error(HDstrerror(errno));
+            error(strerror(errno));
 
         report_once_flag = 1;
         HDgettimeofday(&timer_start, NULL);
@@ -500,7 +500,7 @@ main(int argc, char *argv[])
                 option_prefix = H5_optarg;
                 break;
             case 'r':
-                random_test = TRUE;
+                random_test = true;
                 break;
             case 's':
                 file_size = parse_size_directive(H5_optarg);