1 8 Merges from develop (#418)

* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

85 files changed, 282 insertions, 295 deletions

diff --git a/src/H5ACpkg.h b/src/H5ACpkg.h
index 688fa6d..a38248d 100644
--- a/src/H5ACpkg.h
+++ b/src/H5ACpkg.h
@@ -30,8 +30,8 @@
 #error "Do not include this file outside the H5AC package!"
 #endif
 
-#ifndef _H5ACpkg_H
-#define _H5ACpkg_H
+#ifndef H5ACpkg_H
+#define H5ACpkg_H
 
 /* Get package's private header */
 #include "H5ACprivate.h" /* Metadata cache			*/
@@ -377,4 +377,4 @@ typedef struct H5AC_aux_t {
 
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* _H5ACpkg_H */
+#endif /* H5ACpkg_H */
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 7ca134b..1713e11 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -23,8 +23,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5ACprivate_H
-#define _H5ACprivate_H
+#ifndef H5ACprivate_H
+#define H5ACprivate_H
 
 #include "H5ACpublic.h" /*public prototypes            */
 
@@ -338,4 +338,4 @@ H5_DLL herr_t H5AC_open_trace_file(H5AC_t *cache_ptr, const char *trace_file_nam
 H5_DLL herr_t H5AC_add_candidate(H5AC_t *cache_ptr, haddr_t addr);
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* !_H5ACprivate_H */
+#endif /* H5ACprivate_H */
diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h
index cab29e1..90b3418 100644
--- a/src/H5ACpublic.h
+++ b/src/H5ACpublic.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5ACpublic_H
-#define _H5ACpublic_H
+#ifndef H5ACpublic_H
+#define H5ACpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
diff --git a/src/H5Apkg.h b/src/H5Apkg.h
index aa28562..3e1a190 100644
--- a/src/H5Apkg.h
+++ b/src/H5Apkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5A package!"
 #endif
 
-#ifndef _H5Apkg_H
-#define _H5Apkg_H
+#ifndef H5Apkg_H
+#define H5Apkg_H
 
 /*
  * Define this to enable debugging.
@@ -257,4 +257,4 @@ H5_DLL htri_t H5A_is_shared_test(hid_t aid);
 H5_DLL herr_t H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count);
 #endif /* H5A_TESTING */
 
-#endif /* _H5Apkg_H */
+#endif /* H5Apkg_H */
diff --git a/src/H5Aprivate.h b/src/H5Aprivate.h
index f4ab31e..646b78f 100644
--- a/src/H5Aprivate.h
+++ b/src/H5Aprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5D module
  */
-#ifndef _H5Aprivate_H
-#define _H5Aprivate_H
+#ifndef H5Aprivate_H
+#define H5Aprivate_H
 
 /* Include package's public header */
 #include "H5Apublic.h"
@@ -80,4 +80,4 @@ H5_DLL herr_t H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dx
 H5_DLL herr_t H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id, H5_index_t idx_type, H5_iter_order_t order,
                                hsize_t skip, hsize_t *last_attr, const H5A_attr_iter_op_t *op, void *op_data);
 
-#endif /* _H5Aprivate_H */
+#endif /* H5Aprivate_H */
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 4e2f0d1..28a0e85 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5A module.
  */
-#ifndef _H5Apublic_H
-#define _H5Apublic_H
+#ifndef H5Apublic_H
+#define H5Apublic_H
 
 /* Public headers needed by this file */
 #include "H5Ipublic.h" /* IDs			  		*/
@@ -112,4 +112,4 @@ H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op,
 }
 #endif
 
-#endif /* _H5Apublic_H */
+#endif /* H5Apublic_H */
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index 0fa9b42..9762e1e 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5B2 package!"
 #endif
 
-#ifndef _H5B2pkg_H
-#define _H5B2pkg_H
+#ifndef H5B2pkg_H
+#define H5B2pkg_H
 
 /* Get package's private header */
 #include "H5B2private.h"
@@ -356,4 +356,4 @@ H5_DLL int    H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata);
 H5_DLL herr_t H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_node_info_test_t *ninfo);
 #endif /* H5B2_TESTING */
 
-#endif /* _H5B2pkg_H */
+#endif /* H5B2pkg_H */
diff --git a/src/H5B2private.h b/src/H5B2private.h
index f5a0aae..de823e4 100644
--- a/src/H5B2private.h
+++ b/src/H5B2private.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5B2private_H
-#define _H5B2private_H
+#ifndef H5B2private_H
+#define H5B2private_H
 
 /* Include package's public header */
 #include "H5B2public.h"
@@ -150,4 +150,4 @@ H5_DLL herr_t  H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udat
 /* Statistics routines */
 H5_DLL herr_t H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info);
 
-#endif /* _H5B2private_H */
+#endif /* H5B2private_H */
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index 51b1310..9b9e97e 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -12,25 +12,25 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:	Quincey Koziol
- *		Thursday, May 15, 2003
+ * Programmer:    Quincey Koziol
+ *        Thursday, May 15, 2003
  *
- * Purpose:	This file contains declarations which are visible only within
- *		the H5B package.  Source files outside the H5B package should
- *		include H5Bprivate.h instead.
+ * Purpose:    This file contains declarations which are visible only within
+ *        the H5B package.  Source files outside the H5B package should
+ *        include H5Bprivate.h instead.
  */
 #ifndef H5B_PACKAGE
 #error "Do not include this file outside the H5B package!"
 #endif
 
-#ifndef _H5Bpkg_H
-#define _H5Bpkg_H
+#ifndef H5Bpkg_H
+#define H5Bpkg_H
 
 /* Get package's private header */
 #include "H5Bprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5ACprivate.h" /* Metadata cache			*/
+#include "H5ACprivate.h" /* Metadata cache            */
 #include "H5FLprivate.h" /* Free Lists                           */
 
 /**************************/
@@ -48,20 +48,20 @@
 typedef struct H5B_t {
     H5AC_info_t cache_info; /* Information for H5AC cache functions */
                             /* _must_ be first field in structure */
-    H5RC_t * rc_shared;     /*ref-counted shared info	     */
-    unsigned level;         /*node level			     */
-    unsigned nchildren;     /*number of child pointers	     */
-    haddr_t  left;          /*address of left sibling	     */
-    haddr_t  right;         /*address of right sibling	     */
+    H5RC_t * rc_shared;     /*ref-counted shared info         */
+    unsigned level;         /*node level                 */
+    unsigned nchildren;     /*number of child pointers         */
+    haddr_t  left;          /*address of left sibling         */
+    haddr_t  right;         /*address of right sibling         */
     uint8_t *native;        /*array of keys in native format     */
-    haddr_t *child;         /*2k child pointers		     */
+    haddr_t *child;         /*2k child pointers             */
 } H5B_t;
 
 /* Callback info for loading a B-tree node into the cache */
 typedef struct H5B_cache_ud_t {
     H5F_t *                   f;         /* File that B-tree node is within   */
-    const struct H5B_class_t *type;      /* Type of tree			     */
-    H5RC_t *                  rc_shared; /* Ref-counted shared info	     */
+    const struct H5B_class_t *type;      /* Type of tree                 */
+    H5RC_t *                  rc_shared; /* Ref-counted shared info         */
 } H5B_cache_ud_t;
 
 /*****************************/
@@ -88,4 +88,4 @@ H5_DLL herr_t H5B_node_dest(H5B_t *bt);
 herr_t H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void *udata);
 #endif
 
-#endif /*_H5Bpkg_H*/
+#endif /*H5Bpkg_H*/
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 660b219..fc337b1 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5Bprivate_H
-#define _H5Bprivate_H
+#ifndef H5Bprivate_H
+#define H5Bprivate_H
 
 #include "H5Bpublic.h" /*API prototypes			     */
 
@@ -162,4 +162,4 @@ H5_DLL herr_t        H5B_shared_free(void *_shared);
 H5_DLL herr_t        H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
                                const H5B_class_t *type, void *udata);
 H5_DLL htri_t        H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr);
-#endif /* _H5Bprivate_H */
+#endif /* H5Bprivate_H */
diff --git a/src/H5CSprivate.h b/src/H5CSprivate.h
index ea02d1e..afec2fa 100644
--- a/src/H5CSprivate.h
+++ b/src/H5CSprivate.h
@@ -14,8 +14,8 @@
 /*
  *  Header file for function stacks, etc.
  */
-#ifndef _H5CSprivate_H
-#define _H5CSprivate_H
+#ifndef H5CSprivate_H
+#define H5CSprivate_H
 
 #ifdef NOT_YET
 #include "H5CSpublic.h"
@@ -39,4 +39,4 @@ H5_DLL herr_t H5CS_print_stack(const H5CS_t *stack, FILE *stream);
 H5_DLL herr_t H5CS_copy_stack(H5CS_t *stack);
 H5_DLL herr_t H5CS_close_stack(H5CS_t *stack);
 
-#endif /* _H5CSprivate_H */
+#endif /* H5CSprivate_H */
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 98d52b5..69ac9b1 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -33,9 +33,8 @@
 #error "Do not include this file outside the H5C package!"
 #endif
 
-#ifndef _H5Cpkg_H
-#define _H5Cpkg_H
-
+#ifndef H5Cpkg_H
+#define H5Cpkg_H
 
 /* Get package's private header */
 #include "H5Cprivate.h"
@@ -3563,5 +3562,5 @@ if ( (cache_ptr)->index_size !=                                             \
 #endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
-#endif /* _H5Cpkg_H */
+#endif /* H5Cpkg_H */
 /* clang-format on */
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 2a76bd8..d028d33 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -13,24 +13,22 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:        H5Cprivate.h
+ * Created:   H5Cprivate.h
  *            6/3/04
  *            John Mainzer
  *
- * Purpose:        Constants and typedefs available to the rest of the
+ * Purpose:   Constants and typedefs available to the rest of the
  *            library.
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5Cprivate_H
-#define _H5Cprivate_H
+#ifndef H5Cprivate_H
+#define H5Cprivate_H
 
-#include "H5Cpublic.h" /* public prototypes                */
+#include "H5Cpublic.h" /* public prototypes            */
 
-/* Pivate headers needed by this header */
+/* Private headers needed by this header */
 #include "H5private.h"  /* Generic Functions            */
 #include "H5Fprivate.h" /* File access                */
 
@@ -57,13 +55,9 @@
  * H5C_COLLECT_CACHE_STATS is also defined to true.
  */
 #if H5C_COLLECT_CACHE_STATS
-
 #define H5C_COLLECT_CACHE_ENTRY_STATS 1
-
 #else
-
 #define H5C_COLLECT_CACHE_ENTRY_STATS 0
-
 #endif /* H5C_COLLECT_CACHE_STATS */
 
 #ifdef H5_HAVE_PARALLEL
@@ -84,7 +78,6 @@
 #endif /* H5_HAVE_PARALLEL */
 
 /* Typedef for the main structure for the cache (defined in H5Cpkg.h) */
-
 typedef struct H5C_t H5C_t;
 
 /*
@@ -526,7 +519,6 @@ typedef struct H5C_cache_entry_t {
     struct H5C_cache_entry_t *ht_prev;
 
     /* fields supporting replacement policies: */
-
     struct H5C_cache_entry_t *next;
     struct H5C_cache_entry_t *prev;
     struct H5C_cache_entry_t *aux_next;
@@ -540,9 +532,7 @@ typedef struct H5C_cache_entry_t {
     int32_t clears;
     int32_t flushes;
     int32_t pins;
-
 #endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
-
 } H5C_cache_entry_t;
 
 /****************************************************************************
@@ -1037,4 +1027,4 @@ H5_DLL herr_t H5C_unprotect(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxp
 
 H5_DLL herr_t H5C_validate_resize_config(H5C_auto_size_ctl_t *config_ptr, unsigned int tests);
 
-#endif /* !_H5Cprivate_H */
+#endif /* H5Cprivate_H */
diff --git a/src/H5Cpublic.h b/src/H5Cpublic.h
index 56bfdb2..0e6fb84 100644
--- a/src/H5Cpublic.h
+++ b/src/H5Cpublic.h
@@ -19,12 +19,10 @@
  *
  * Purpose:     Public include file for cache functions.
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5Cpublic_H
-#define _H5Cpublic_H
+#ifndef H5Cpublic_H
+#define H5Cpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 7cd179d..31c0bd1 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5D package!"
 #endif
 
-#ifndef _H5Dpkg_H
-#define _H5Dpkg_H
+#ifndef H5Dpkg_H
+#define H5Dpkg_H
 
 /* Get package's private header */
 #include "H5Dprivate.h"
@@ -693,4 +693,4 @@ H5_DLL herr_t H5D__layout_compact_dirty_test(hid_t did, hbool_t *dirty);
 H5_DLL herr_t H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused);
 #endif /* H5D_TESTING */
 
-#endif /*_H5Dpkg_H*/
+#endif /*H5Dpkg_H*/
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index cc9330b..1b61f61 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5D module
  */
-#ifndef _H5Dprivate_H
-#define _H5Dprivate_H
+#ifndef H5Dprivate_H
+#define H5Dprivate_H
 
 /* Include package's public header */
 #include "H5Dpublic.h"
@@ -177,4 +177,4 @@ H5_DLL herr_t H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_ad
 H5_DLL herr_t H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
                               unsigned ndims);
 
-#endif /* _H5Dprivate_H */
+#endif /* H5Dprivate_H */
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index a0dc74c..a6f7d9b 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5D module.
  */
-#ifndef _H5Dpublic_H
-#define _H5Dpublic_H
+#ifndef H5Dpublic_H
+#define H5Dpublic_H
 
 /* System headers needed by this file */
 
@@ -165,4 +165,4 @@ H5_DLL herr_t H5Dextend(hid_t dset_id, const hsize_t size[]);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Dpublic_H */
+#endif /* H5Dpublic_H */
diff --git a/src/H5Epkg.h b/src/H5Epkg.h
index 908683f..801e4f3 100644
--- a/src/H5Epkg.h
+++ b/src/H5Epkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5E package!"
 #endif
 
-#ifndef _H5Epkg_H
-#define _H5Epkg_H
+#ifndef H5Epkg_H
+#define H5Epkg_H
 
 /* Get package's private header */
 #include "H5Eprivate.h"
@@ -138,4 +138,4 @@ H5_DLL herr_t  H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **clien
 H5_DLL herr_t  H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data);
 H5_DLL herr_t  H5E_pop(H5E_t *err_stack, size_t count);
 
-#endif /* _H5Epkg_H */
+#endif /* H5Epkg_H */
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index d7e6bbc..bf7ebdd 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -14,8 +14,8 @@
 /*
  *  Header file for error values, etc.
  */
-#ifndef _H5Eprivate_H
-#define _H5Eprivate_H
+#ifndef H5Eprivate_H
+#define H5Eprivate_H
 
 #include "H5Epublic.h"
 
@@ -179,4 +179,4 @@ extern int  H5E_mpi_error_str_len;
     }
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* _H5Eprivate_H */
+#endif /* H5Eprivate_H */
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 952ae38..dc8e079 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5E module.
  */
-#ifndef _H5Epublic_H
-#define _H5Epublic_H
+#ifndef H5Epublic_H
+#define H5Epublic_H
 
 #include <stdio.h> /*FILE arg of H5Eprint()                     */
 
@@ -218,4 +218,4 @@ H5_DLL char * H5Eget_minor(H5E_minor_t min);
 }
 #endif
 
-#endif /* end _H5Epublic_H */
+#endif /* end H5Epublic_H */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 12beaa8..a2641bc 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1189,7 +1189,7 @@ static herr_t
 H5FD_multi_query(const H5FD_t *_f, unsigned long *flags /* out */)
 {
     /* Shut compiler up */
-    _f = _f;
+    (void)_f;
 
     /* Set the VFL feature flags that this driver supports */
     if (flags) {
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
index 7bec86b..27924f5 100644
--- a/src/H5FDpkg.h
+++ b/src/H5FDpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5FD package!"
 #endif
 
-#ifndef _H5FDpkg_H
-#define _H5FDpkg_H
+#ifndef H5FDpkg_H
+#define H5FDpkg_H
 
 /* Get package's private header */
 #include "H5FDprivate.h" /* File drivers				*/
@@ -56,4 +56,4 @@ H5_DLL herr_t  H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hadd
 #ifdef H5FD_TESTING
 #endif /* H5FD_TESTING */
 
-#endif /* _H5FDpkg_H */
+#endif /* H5FDpkg_H */
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index 6e41d42..bde4c74 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -15,8 +15,8 @@
  * Programmer:  Robb Matzke
  *              Monday, July 26, 1999
  */
-#ifndef _H5FDprivate_H
-#define _H5FDprivate_H
+#ifndef H5FDprivate_H
+#define H5FDprivate_H
 
 /* Include package's public header */
 #include "H5FDpublic.h"
@@ -164,4 +164,4 @@ H5_DLL int      H5FD_mpi_get_size(const H5FD_t *file);
 H5_DLL MPI_Comm H5FD_mpi_get_comm(const H5FD_t *_file);
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* !_H5FDprivate_H */
+#endif /* H5FDprivate_H */
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index fcedba2..8b3198f 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -15,8 +15,8 @@
  * Programmer:  Robb Matzke
  *              Monday, July 26, 1999
  */
-#ifndef _H5FDpublic_H
-#define _H5FDpublic_H
+#ifndef H5FDpublic_H
+#define H5FDpublic_H
 
 #include "H5public.h"
 #include "H5Fpublic.h" /*for H5F_close_degree_t */
diff --git a/src/H5FDstdio.c b/src/H5FDstdio.c
index 4745f38..631d96d 100644
--- a/src/H5FDstdio.c
+++ b/src/H5FDstdio.c
@@ -330,7 +330,7 @@ H5FD_stdio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     assert(sizeof(file_offset_t) >= sizeof(size_t));
 
     /* Quiet compiler */
-    fapl_id = fapl_id;
+    (void)fapl_id;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -555,7 +555,7 @@ static herr_t
 H5FD_stdio_query(const H5FD_t *_f, unsigned long *flags /* out */)
 {
     /* Quiet the compiler */
-    _f = _f;
+    (void)_f;
 
     /* Set the VFL feature flags that this driver supports */
     if (flags) {
@@ -595,8 +595,8 @@ H5FD_stdio_alloc(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, hid_t /*H5_A
     haddr_t       addr;
 
     /* Quiet compiler */
-    type    = type;
-    dxpl_id = dxpl_id;
+    (void)type;
+    (void)dxpl_id;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -641,7 +641,7 @@ H5FD_stdio_get_eoa(const H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type)
     H5Eclear2(H5E_DEFAULT);
 
     /* Quiet compiler */
-    type = type;
+    (void)type;
 
     return file->eoa;
 } /* end H5FD_stdio_get_eoa() */
@@ -671,7 +671,7 @@ H5FD_stdio_set_eoa(H5FD_t *_file, H5FD_mem_t /*H5_ATTR_UNUSED*/ type, haddr_t ad
     H5Eclear2(H5E_DEFAULT);
 
     /* Quiet the compiler */
-    type = type;
+    (void)type;
 
     file->eoa = addr;
 
@@ -726,7 +726,7 @@ H5FD_stdio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle)
     static const char *func = "H5FD_stdio_get_handle"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    fapl = fapl;
+    (void)fapl;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -763,8 +763,8 @@ H5FD_stdio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
     static const char *func = "H5FD_stdio_read"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    type    = type;
-    dxpl_id = dxpl_id;
+    (void)type;
+    (void)dxpl_id;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -864,8 +864,8 @@ H5FD_stdio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
     static const char *func = "H5FD_stdio_write"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    dxpl_id = dxpl_id;
-    type    = type;
+    (void)dxpl_id;
+    (void)type;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -952,7 +952,7 @@ H5FD_stdio_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
     static const char *func = "H5FD_stdio_flush"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    dxpl_id = dxpl_id;
+    (void)dxpl_id;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
@@ -996,8 +996,8 @@ H5FD_stdio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing)
     static const char *func = "H5FD_stdio_truncate"; /* Function Name for error reporting */
 
     /* Quiet the compiler */
-    dxpl_id = dxpl_id;
-    closing = closing;
+    (void)dxpl_id;
+    (void)closing;
 
     /* Clear the error stack */
     H5Eclear2(H5E_DEFAULT);
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 3481b7a..0f9131e 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5FLprivate_H
-#define _H5FLprivate_H
+#ifndef H5FLprivate_H
+#define H5FLprivate_H
 
 /* Public headers needed by this file */
 #ifdef LATER
diff --git a/src/H5FOprivate.h b/src/H5FOprivate.h
index 716ce9d..e2250e3 100644
--- a/src/H5FOprivate.h
+++ b/src/H5FOprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains library private information about the H5FO module
  */
-#ifndef _H5FOprivate_H
-#define _H5FOprivate_H
+#ifndef H5FOprivate_H
+#define H5FOprivate_H
 
 #ifdef LATER
 #include "H5FOpublic.h"
@@ -47,4 +47,4 @@ H5_DLL herr_t  H5FO_top_decr(const H5F_t *f, haddr_t addr);
 H5_DLL hsize_t H5FO_top_count(const H5F_t *f, haddr_t addr);
 H5_DLL herr_t  H5FO_top_dest(H5F_t *f);
 
-#endif /* _H5FOprivate_H */
+#endif /* H5FOprivate_H */
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index b482ed6..167f503 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5FS package!"
 #endif
 
-#ifndef _H5FSpkg_H
-#define _H5FSpkg_H
+#ifndef H5FSpkg_H
+#define H5FSpkg_H
 
 /* Uncomment this macro to enable debugging output for free space manager */
 /* #define H5FS_DEBUG */
@@ -240,4 +240,4 @@ H5_DLL herr_t H5FS_get_cparam_test(const H5FS_t *fh, H5FS_create_t *cparam);
 H5_DLL int    H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2);
 #endif /* H5FS_TESTING */
 
-#endif /* _H5FSpkg_H */
+#endif /* H5FSpkg_H */
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h
index cdcad73..3d59d61 100644
--- a/src/H5FSprivate.h
+++ b/src/H5FSprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5FSprivate_H
-#define _H5FSprivate_H
+#ifndef H5FSprivate_H
+#define H5FSprivate_H
 
 /* Include package's public header */
 #include "H5FSpublic.h"
@@ -218,4 +218,4 @@ H5_DLL herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stre
 H5_DLL herr_t H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *stream, int indent,
                               int fwidth);
 
-#endif /* _H5FSprivate_H */
+#endif /* H5FSprivate_H */
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index c27f3ac..4c968db 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5F package!"
 #endif
 
-#ifndef _H5Fpkg_H
-#define _H5Fpkg_H
+#ifndef H5Fpkg_H
+#define H5Fpkg_H
 
 /* Get package's private header */
 #include "H5Fprivate.h"
@@ -330,4 +330,4 @@ H5_DLL herr_t H5F_check_cached_stab_test(hid_t file_id);
 H5_DLL herr_t H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr);
 #endif /* H5F_TESTING */
 
-#endif /* _H5Fpkg_H */
+#endif /* H5Fpkg_H */
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 468379a..3d8e8d3 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -15,8 +15,8 @@
  * This file contains macros & information for file access
  */
 
-#ifndef _H5Fprivate_H
-#define _H5Fprivate_H
+#ifndef H5Fprivate_H
+#define H5Fprivate_H
 
 /* Include package's public header */
 #include "H5Fpublic.h"
@@ -696,4 +696,4 @@ H5_DLL herr_t H5F_cwfs_remove_heap(H5F_file_t *shared, struct H5HG_heap_t *heap)
 /* Debugging functions */
 H5_DLL herr_t H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth);
 
-#endif /* _H5Fprivate_H */
+#endif /* H5Fprivate_H */
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index c48bea0..574bf87 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5F module.
  */
-#ifndef _H5Fpublic_H
-#define _H5Fpublic_H
+#ifndef H5Fpublic_H
+#define H5Fpublic_H
 
 /* Public header files needed by this file */
 #include "H5public.h"
@@ -24,11 +24,11 @@
 
 /* When this header is included from a private header, don't make calls to H5check() */
 #undef H5CHECK
-#ifndef _H5private_H
+#ifndef H5private_H
 #define H5CHECK H5check(),
-#else /* _H5private_H */
+#else /* H5private_H */
 #define H5CHECK
-#endif /* _H5private_H */
+#endif /* H5private_H */
 
 /*
  * These are the bits that can be passed to the `flags' argument of
@@ -185,4 +185,4 @@ H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Fpublic_H */
+#endif /* H5Fpublic_H */
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index b962739..3d7c118 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5G package!"
 #endif
 
-#ifndef _H5Gpkg_H
-#define _H5Gpkg_H
+#ifndef H5Gpkg_H
+#define H5Gpkg_H
 
 /* Get package's private header */
 #include "H5Gprivate.h"
@@ -505,4 +505,4 @@ H5_DLL herr_t H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent
 H5_DLL herr_t H5G__verify_cached_stabs_test(hid_t gid);
 #endif /* H5G_TESTING */
 
-#endif /* _H5Gpkg_H */
+#endif /* H5Gpkg_H */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index cc161d5..902c310 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5Gprivate_H
-#define _H5Gprivate_H
+#ifndef H5Gprivate_H
+#define H5Gprivate_H
 
 /* Include package's public header */
 #include "H5Gpublic.h"
@@ -294,4 +294,4 @@ H5_DLL herr_t H5G_root_loc(H5F_t *f, H5G_loc_t *loc);
 H5_DLL herr_t H5G_root_free(H5G_t *grp);
 H5_DLL H5G_t *H5G_rootof(H5F_t *f);
 
-#endif /* _H5Gprivate_H */
+#endif /* H5Gprivate_H */
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index c279d7f..745fc85 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5Gpublic_H
-#define _H5Gpublic_H
+#ifndef H5Gpublic_H
+#define H5Gpublic_H
 
 /* System headers needed by this file */
 #include <sys/types.h>
@@ -159,4 +159,4 @@ H5_DLL H5G_obj_t H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Gpublic_H */
+#endif /* H5Gpublic_H */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 22d3110..4b544c1 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5HF package!"
 #endif
 
-#ifndef _H5HFpkg_H
-#define _H5HFpkg_H
+#ifndef H5HFpkg_H
+#define H5HFpkg_H
 
 /* Get package's private header */
 #include "H5HFprivate.h"
@@ -762,4 +762,4 @@ H5_DLL herr_t   H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len, hbool
 H5_DLL herr_t   H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id, hbool_t *ids_direct);
 #endif /* H5HF_TESTING */
 
-#endif /* _H5HFpkg_H */
+#endif /* H5HFpkg_H */
diff --git a/src/H5HFprivate.h b/src/H5HFprivate.h
index 1075945..8bf580c 100644
--- a/src/H5HFprivate.h
+++ b/src/H5HFprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5HFprivate_H
-#define _H5HFprivate_H
+#ifndef H5HFprivate_H
+#define H5HFprivate_H
 
 /* Include package's public header */
 #include "H5HFpublic.h"
@@ -126,4 +126,4 @@ H5_DLL herr_t H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size /*ou
 H5_DLL herr_t H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 #endif /* H5HF_DEBUGGING */
 
-#endif /* _H5HFprivate_H */
+#endif /* H5HFprivate_H */
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index d3c8334..f5733d5 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5HG package!"
 #endif
 
-#ifndef _H5HGpkg_H
-#define _H5HGpkg_H
+#ifndef H5HGpkg_H
+#define H5HGpkg_H
 
 /* Get package's private header */
 #include "H5HGprivate.h"
@@ -139,4 +139,4 @@ struct H5HG_heap_t {
 H5_DLL herr_t H5HG_free(H5HG_heap_t *heap);
 H5_DLL H5HG_heap_t *H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw);
 
-#endif /* _H5HGpkg_H */
+#endif /* H5HGpkg_H */
diff --git a/src/H5HGprivate.h b/src/H5HGprivate.h
index a02ad40..13c8cfb 100644
--- a/src/H5HGprivate.h
+++ b/src/H5HGprivate.h
@@ -15,8 +15,8 @@
  * Programmer:  Robb Matzke
  *              Friday, March 27, 1998
  */
-#ifndef _H5HGprivate_H
-#define _H5HGprivate_H
+#ifndef H5HGprivate_H
+#define H5HGprivate_H
 
 /* Include package's public header */
 #include "H5HGpublic.h"
@@ -68,4 +68,4 @@ H5_DLL size_t  H5HG_get_free_size(const H5HG_heap_t *h);
 /* Debugging functions */
 H5_DLL herr_t H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth);
 
-#endif /* _H5HGprivate_H */
+#endif /* H5HGprivate_H */
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index bfbebab24..ad7daeb 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5HL package!"
 #endif
 
-#ifndef _H5HLpkg_H
-#define _H5HLpkg_H
+#ifndef H5HLpkg_H
+#define H5HLpkg_H
 
 /* Get package's private header */
 #include "H5HLprivate.h"
@@ -147,4 +147,4 @@ H5_DLL herr_t       H5HL_prfx_dest(H5HL_prfx_t *prfx);
 H5_DLL H5HL_dblk_t *H5HL_dblk_new(H5HL_t *heap);
 H5_DLL herr_t       H5HL_dblk_dest(H5HL_dblk_t *dblk);
 
-#endif /* _H5HLpkg_H */
+#endif /* H5HLpkg_H */
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 6561fef..186d3b4 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5HLprivate_H
-#define _H5HLprivate_H
+#ifndef H5HLprivate_H
+#define H5HLprivate_H
 
 /* Include package's public header */
 #include "H5HLpublic.h"
diff --git a/src/H5HPprivate.h b/src/H5HPprivate.h
index 3b68400..50020bc 100644
--- a/src/H5HPprivate.h
+++ b/src/H5HPprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5HP module
  */
-#ifndef _H5HPprivate_H
-#define _H5HPprivate_H
+#ifndef H5HPprivate_H
+#define H5HPprivate_H
 
 /**************************************/
 /* Public headers needed by this file */
@@ -65,4 +65,4 @@ H5_DLL herr_t  H5HP_incr(H5HP_t *heap, unsigned amt, void *obj);
 H5_DLL herr_t  H5HP_decr(H5HP_t *heap, unsigned amt, void *obj);
 H5_DLL herr_t  H5HP_close(H5HP_t *heap);
 
-#endif /* _H5HPprivate_H */
+#endif /* H5HPprivate_H */
diff --git a/src/H5Ipkg.h b/src/H5Ipkg.h
index d2406c0..14400e7 100644
--- a/src/H5Ipkg.h
+++ b/src/H5Ipkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5I package!"
 #endif
 
-#ifndef _H5Ipkg_H
-#define _H5Ipkg_H
+#ifndef H5Ipkg_H
+#define H5Ipkg_H
 
 /* Get package's private header */
 #include "H5Iprivate.h"
@@ -69,4 +69,4 @@
 H5_DLL ssize_t H5I_get_name_test(hid_t id, char *name /*out*/, size_t size, hbool_t *cached);
 #endif /* H5I_TESTING */
 
-#endif /*_H5Ipkg_H*/
+#endif /*H5Ipkg_H*/
diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h
index b86de65..09ac2bf 100644
--- a/src/H5Iprivate.h
+++ b/src/H5Iprivate.h
@@ -17,8 +17,8 @@
  *---------------------------------------------------------------------------*/
 
 /* avoid re-inclusion */
-#ifndef _H5Iprivate_H
-#define _H5Iprivate_H
+#ifndef H5Iprivate_H
+#define H5Iprivate_H
 
 /* Include package's public header */
 #include "H5Ipublic.h"
@@ -79,4 +79,4 @@ H5_DLL int        H5I_dec_app_ref(hid_t id);
 H5_DLL int        H5I_dec_app_ref_always_close(hid_t id);
 H5_DLL herr_t     H5I_dec_type_ref(H5I_type_t type);
 
-#endif /* _H5Iprivate_H */
+#endif /* H5Iprivate_H */
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index 4542132..1a851c0 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -15,8 +15,8 @@
  * This file contains function prototypes for each exported function in
  * the H5I module.
  */
-#ifndef _H5Ipublic_H
-#define _H5Ipublic_H
+#ifndef H5Ipublic_H
+#define H5Ipublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -98,4 +98,4 @@ H5_DLL htri_t     H5Iis_valid(hid_t id);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Ipublic_H */
+#endif /* H5Ipublic_H */
diff --git a/src/H5Lpkg.h b/src/H5Lpkg.h
index 7c9984a..451f5b4 100644
--- a/src/H5Lpkg.h
+++ b/src/H5Lpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5L package!"
 #endif
 
-#ifndef _H5Lpkg_H
-#define _H5Lpkg_H
+#ifndef H5Lpkg_H
+#define H5Lpkg_H
 
 /* Get package's private header */
 #include "H5Lprivate.h"
@@ -53,4 +53,4 @@ H5_DLL herr_t H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name, co
 H5_DLL herr_t H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
                                  const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk, H5O_copy_t *cpy_info);
 
-#endif /* _H5Lpkg_H */
+#endif /* H5Lpkg_H */
diff --git a/src/H5Lprivate.h b/src/H5Lprivate.h
index 464b893..14b58ee 100644
--- a/src/H5Lprivate.h
+++ b/src/H5Lprivate.h
@@ -15,8 +15,8 @@
  * This file contains private information about the H5L module
  * for dealing with links in an HDF5 file.
  */
-#ifndef _H5Lprivate_H
-#define _H5Lprivate_H
+#ifndef H5Lprivate_H
+#define H5Lprivate_H
 
 /* Include package's public header */
 #include "H5Lpublic.h"
@@ -90,4 +90,4 @@ H5_DLL herr_t H5L_register(const H5L_class_t *cls);
 H5_DLL herr_t H5L_unregister(H5L_type_t id);
 H5_DLL const H5L_class_t *H5L_find_class(H5L_type_t id);
 
-#endif /* _H5Lprivate_H */
+#endif /* H5Lprivate_H */
diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h
index b5568c9..861b716 100644
--- a/src/H5Lpublic.h
+++ b/src/H5Lpublic.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5Lpublic_H
-#define _H5Lpublic_H
+#ifndef H5Lpublic_H
+#define H5Lpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"  /* Generic Functions            */
@@ -189,4 +189,4 @@ H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hi
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Lpublic_H */
+#endif /* H5Lpublic_H */
diff --git a/src/H5MFpkg.h b/src/H5MFpkg.h
index 71ddf6b..cc90d72 100644
--- a/src/H5MFpkg.h
+++ b/src/H5MFpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5MF package!"
 #endif
 
-#ifndef _H5MFpkg_H
-#define _H5MFpkg_H
+#ifndef H5MFpkg_H
+#define H5MFpkg_H
 
 /* Get package's private header */
 #include "H5MFprivate.h"
@@ -164,4 +164,4 @@ H5_DLL herr_t  H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr
 #ifdef H5MF_TESTING
 #endif /* H5MF_TESTING */
 
-#endif /* _H5MFpkg_H */
+#endif /* H5MFpkg_H */
diff --git a/src/H5MFprivate.h b/src/H5MFprivate.h
index 50cb8d2..640b6da 100644
--- a/src/H5MFprivate.h
+++ b/src/H5MFprivate.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5MFprivate_H
-#define _H5MFprivate_H
+#ifndef H5MFprivate_H
+#define H5MFprivate_H
 
 /* Private headers needed by this file */
 #include "H5Fprivate.h"  /* File access				*/
@@ -79,4 +79,4 @@ H5_DLL herr_t H5MF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stre
 #endif /* NOT_YET */
 #endif /* H5MF_DEBUGGING */
 
-#endif /* end _H5MFprivate_H */
+#endif /* end H5MFprivate_H */
diff --git a/src/H5MMprivate.h b/src/H5MMprivate.h
index 0416682..62990fe 100644
--- a/src/H5MMprivate.h
+++ b/src/H5MMprivate.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5MMprivate_H
-#define _H5MMprivate_H
+#ifndef H5MMprivate_H
+#define H5MMprivate_H
 
 #include "H5MMpublic.h"
 
@@ -41,4 +41,4 @@ H5_DLL char *H5MM_xstrdup(const char *s);
 H5_DLL char *H5MM_strdup(const char *s);
 H5_DLL void *H5MM_xfree(void *mem);
 
-#endif /* _H5MMprivate_H */
+#endif /* H5MMprivate_H */
diff --git a/src/H5MMpublic.h b/src/H5MMpublic.h
index 9ddd377..ebfb377 100644
--- a/src/H5MMpublic.h
+++ b/src/H5MMpublic.h
@@ -22,8 +22,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5MMpublic_H
-#define _H5MMpublic_H
+#ifndef H5MMpublic_H
+#define H5MMpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -39,4 +39,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5MMpublic_H */
+#endif /* H5MMpublic_H */
diff --git a/src/H5MPpkg.h b/src/H5MPpkg.h
index c6c15e6..05c4bca 100644
--- a/src/H5MPpkg.h
+++ b/src/H5MPpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5MP package!"
 #endif
 
-#ifndef _H5MPpkg_H
-#define _H5MPpkg_H
+#ifndef H5MPpkg_H
+#define H5MPpkg_H
 
 /* Get package's private header */
 #include "H5MPprivate.h" /* Memory Pools				*/
@@ -96,4 +96,4 @@ H5_DLL herr_t H5MP_get_page_free_size(const H5MP_page_t *mp, size_t *page);
 H5_DLL herr_t H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page);
 #endif /* H5MP_TESTING */
 
-#endif /* _H5MPpkg_H */
+#endif /* H5MPpkg_H */
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index 87d1f1b..2b06650 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5MPprivate_H
-#define _H5MPprivate_H
+#ifndef H5MPprivate_H
+#define H5MPprivate_H
 
 /* Include package's public header (not yet) */
 /* #include "H5MPpublic.h" */
@@ -54,4 +54,4 @@ H5_DLL void *       H5MP_malloc(H5MP_pool_t *mp, size_t request);
 H5_DLL void *       H5MP_free(H5MP_pool_t *mp, void *spc);
 H5_DLL herr_t       H5MP_close(H5MP_pool_t *mp);
 
-#endif /* _H5MPprivate_H */
+#endif /* H5MPprivate_H */
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index dcdab78..e0ba5c5 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -15,8 +15,8 @@
 #error "Do not include this file outside the H5O package!"
 #endif
 
-#ifndef _H5Opkg_H
-#define _H5Opkg_H
+#ifndef H5Opkg_H
+#define H5Opkg_H
 
 /* Get package's private header */
 #include "H5Oprivate.h" /* Object headers		  	*/
@@ -596,4 +596,4 @@ H5_DLL herr_t H5O_assert(const H5O_t *oh);
 H5_DLL herr_t H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, int indent,
                              int fwidth);
 
-#endif /* _H5Opkg_H */
+#endif /* H5Opkg_H */
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 24bc962..cdc0eef 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -21,8 +21,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5Oprivate_H
-#define _H5Oprivate_H
+#ifndef H5Oprivate_H
+#define H5Oprivate_H
 
 /* Include the public header file for this API */
 #include "H5Opublic.h" /* Object header functions              */
@@ -749,4 +749,4 @@ H5_DLL herr_t H5O_pline_set_latest_version(H5O_pline_t *pline);
 /* Shared message operators */
 H5_DLL herr_t H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src);
 
-#endif /* _H5Oprivate_H */
+#endif /* H5Oprivate_H */
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index e658299..b0976a4 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -22,13 +22,13 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5Opublic_H
-#define _H5Opublic_H
+#ifndef H5Opublic_H
+#define H5Opublic_H
 
 /* Public headers needed by this file */
-#include "H5public.h"  /* Generic Functions			*/
-#include "H5Ipublic.h" /* IDs			  		*/
-#include "H5Lpublic.h" /* Links		  		*/
+#include "H5public.h"  /* Generic Functions            */
+#include "H5Ipublic.h" /* IDs                          */
+#include "H5Lpublic.h" /* Links                        */
 
 /*****************/
 /* Public Macros */
@@ -204,4 +204,4 @@ typedef struct H5O_stat_t {
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Opublic_H */
+#endif /* H5Opublic_H */
diff --git a/src/H5PLextern.h b/src/H5PLextern.h
index dbf1058..7f3df5e 100644
--- a/src/H5PLextern.h
+++ b/src/H5PLextern.h
@@ -14,8 +14,8 @@
  * Purpose:     Header file for writing external HDF5 plugins.
  */
 
-#ifndef _H5PLextern_H
-#define _H5PLextern_H
+#ifndef H5PLextern_H
+#define H5PLextern_H
 
 /* Include HDF5 header */
 #include "hdf5.h"
@@ -40,4 +40,4 @@ H5PLUGIN_DLL const void *H5PLget_plugin_info(void);
 }
 #endif
 
-#endif /* _H5PLextern_H */
+#endif /* H5PLextern_H */
diff --git a/src/H5PLpkg.h b/src/H5PLpkg.h
index c57a34f..c794bf7 100644
--- a/src/H5PLpkg.h
+++ b/src/H5PLpkg.h
@@ -15,8 +15,8 @@
 #error "Do not include this file outside the H5PL package!"
 #endif
 
-#ifndef _H5PLpkg_H
-#define _H5PLpkg_H
+#ifndef H5PLpkg_H
+#define H5PLpkg_H
 
 /* Include private header file */
 #include "H5PLprivate.h" /* Filter functions                */
@@ -41,4 +41,4 @@
 /* Package Private Prototypes */
 /******************************/
 
-#endif /* _H5PLpkg_H */
+#endif /* H5PLpkg_H */
diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h
index 45c0b5a..1f00014 100644
--- a/src/H5PLprivate.h
+++ b/src/H5PLprivate.h
@@ -14,8 +14,8 @@
  * This file contains private information about the H5PL module
  */
 
-#ifndef _H5PLprivate_H
-#define _H5PLprivate_H
+#ifndef H5PLprivate_H
+#define H5PLprivate_H
 
 /* Include package's public header */
 #include "H5PLpublic.h"
@@ -42,4 +42,4 @@
 /* Internal API routines */
 H5_DLL const void *H5PL_load(H5PL_type_t plugin_type, int type_id);
 
-#endif /* _H5PLprivate_H */
+#endif /* H5PLprivate_H */
diff --git a/src/H5PLpublic.h b/src/H5PLpublic.h
index 78c2b33..549f34d 100644
--- a/src/H5PLpublic.h
+++ b/src/H5PLpublic.h
@@ -14,8 +14,8 @@
  * This file contains public declarations for the H5PL module.
  */
 
-#ifndef _H5PLpublic_H
-#define _H5PLpublic_H
+#ifndef H5PLpublic_H
+#define H5PLpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h" /* Generic Functions                    */
@@ -54,4 +54,4 @@ H5_DLL herr_t  H5PLsize(unsigned int *listsize /*out*/);
 }
 #endif
 
-#endif /* _H5PLpublic_H */
+#endif /* H5PLpublic_H */
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index e0ea7a7..ee8124b 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5P package!"
 #endif
 
-#ifndef _H5Ppkg_H
-#define _H5Ppkg_H
+#ifndef H5Ppkg_H
+#define H5Ppkg_H
 
 /* Get package's private header */
 #include "H5Pprivate.h"
@@ -203,4 +203,4 @@ H5_DLL hid_t  H5P_open_class_path_test(const char *path);
 H5_DLL herr_t H5P_reset_external_file_test(hid_t dcpl_id);
 #endif /* H5P_TESTING */
 
-#endif /* _H5Ppkg_H */
+#endif /* H5Ppkg_H */
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 0f2fa05..b03115f 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5P module
  */
-#ifndef _H5Pprivate_H
-#define _H5Pprivate_H
+#ifndef H5Pprivate_H
+#define H5Pprivate_H
 
 /* Include package's public header */
 #include "H5Ppublic.h"
@@ -150,4 +150,4 @@ H5_DLL size_t   H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
 H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status);
 H5_DLL herr_t H5P_get_fill_value(H5P_genplist_t *plist, const struct H5T_t *type, void *value, hid_t dxpl_id);
 
-#endif /* _H5Pprivate_H */
+#endif /* H5Pprivate_H */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 847cb23..39a7fc2 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -15,8 +15,8 @@
  * This file contains function prototypes for each exported function in the
  * H5P module.
  */
-#ifndef _H5Ppublic_H
-#define _H5Ppublic_H
+#ifndef H5Ppublic_H
+#define H5Ppublic_H
 
 /* System headers needed by this file */
 
@@ -451,4 +451,4 @@ H5_DLL herr_t       H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsign
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Ppublic_H */
+#endif /* H5Ppublic_H */
diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h
index ceea827..6532db1 100644
--- a/src/H5RSprivate.h
+++ b/src/H5RSprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5RS module
  */
-#ifndef _H5RSprivate_H
-#define _H5RSprivate_H
+#ifndef H5RSprivate_H
+#define H5RSprivate_H
 
 /**************************************/
 /* Public headers needed by this file */
@@ -55,4 +55,4 @@ H5_DLL ssize_t     H5RS_len(const H5RS_str_t *rs);
 H5_DLL char *      H5RS_get_str(const H5RS_str_t *rs);
 H5_DLL unsigned    H5RS_get_count(const H5RS_str_t *rs);
 
-#endif /* _H5RSprivate_H */
+#endif /* H5RSprivate_H */
diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h
index bae5804..597b5a5 100644
--- a/src/H5Rpkg.h
+++ b/src/H5Rpkg.h
@@ -19,8 +19,8 @@
 #error "Do not include this file outside the H5R package!"
 #endif
 
-#ifndef _H5Rpkg_H
-#define _H5Rpkg_H
+#ifndef H5Rpkg_H
+#define H5Rpkg_H
 
 /* Get package's private header */
 #include "H5Rprivate.h"
@@ -50,4 +50,4 @@ H5_DLL herr_t H5R__term_deprec_interface(void);
 H5_DLL herr_t H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_ref,
                                H5O_type_t *obj_type);
 
-#endif /* _H5Rpkg_H */
+#endif /* H5Rpkg_H */
diff --git a/src/H5Rprivate.h b/src/H5Rprivate.h
index 0e58eb1..6805747 100644
--- a/src/H5Rprivate.h
+++ b/src/H5Rprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5R module
  */
-#ifndef _H5Rprivate_H
-#define _H5Rprivate_H
+#ifndef H5Rprivate_H
+#define H5Rprivate_H
 
 #include "H5Rpublic.h"
 
@@ -25,4 +25,4 @@
 
 /* Private functions */
 
-#endif /* _H5Rprivate_H */
+#endif /* H5Rprivate_H */
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index 03a12be..b2bbee7 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5R module.
  */
-#ifndef _H5Rpublic_H
-#define _H5Rpublic_H
+#ifndef H5Rpublic_H
+#define H5Rpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -80,4 +80,4 @@ H5_DLL H5G_obj_t H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *_re
 }
 #endif
 
-#endif /* _H5Rpublic_H */
+#endif /* H5Rpublic_H */
diff --git a/src/H5SLprivate.h b/src/H5SLprivate.h
index ba23507..c9e1147 100644
--- a/src/H5SLprivate.h
+++ b/src/H5SLprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5SL module
  */
-#ifndef _H5SLprivate_H
-#define _H5SLprivate_H
+#ifndef H5SLprivate_H
+#define H5SLprivate_H
 
 /**************************************/
 /* Public headers needed by this file */
@@ -91,4 +91,4 @@ H5_DLL herr_t       H5SL_close(H5SL_t *slist);
 H5_DLL herr_t       H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data);
 H5_DLL int          H5SL_term_interface(void);
 
-#endif /* _H5SLprivate_H */
+#endif /* H5SLprivate_H */
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 9a04545..31176dd 100644
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5SM package!"
 #endif
 
-#ifndef _H5SMpkg_H
-#define _H5SMpkg_H
+#ifndef H5SMpkg_H
+#define H5SMpkg_H
 
 /* Get package's private header */
 #include "H5SMprivate.h" /* Shared Object Header Messages	*/
@@ -281,4 +281,4 @@ herr_t H5SM_list_free(H5SM_list_t *list);
 H5_DLL herr_t H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id, size_t *mesg_count);
 #endif /* H5SM_TESTING */
 
-#endif /* _H5SMpkg_H */
+#endif /* H5SMpkg_H */
diff --git a/src/H5SMprivate.h b/src/H5SMprivate.h
index 9b3405e..45d57ea 100644
--- a/src/H5SMprivate.h
+++ b/src/H5SMprivate.h
@@ -18,8 +18,8 @@
  * Purpose:	This file contains private declarations for the H5SM
  *              shared object header messages module.
  */
-#ifndef _H5SMprivate_H
-#define _H5SMprivate_H
+#ifndef H5SMprivate_H
+#define H5SMprivate_H
 
 #include "H5Oprivate.h" /* Object headers			*/
 #include "H5Pprivate.h" /* Property lists			*/
@@ -67,4 +67,4 @@ H5_DLL herr_t H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr, FILE
 H5_DLL herr_t H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr, FILE *stream, int indent,
                               int fwidth, unsigned list_vers, size_t num_messages);
 
-#endif /*_H5SMprivate_H*/
+#endif /*H5SMprivate_H*/
diff --git a/src/H5STprivate.h b/src/H5STprivate.h
index eaf3234..02cd926 100644
--- a/src/H5STprivate.h
+++ b/src/H5STprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5ST module
  */
-#ifndef _H5STprivate_H
-#define _H5STprivate_H
+#ifndef H5STprivate_H
+#define H5STprivate_H
 
 #ifdef LATER
 #include "H5STpublic.h"
@@ -58,4 +58,4 @@ H5_DLL void *       H5ST_remove(H5ST_tree_t *root, const char *s);
 H5_DLL herr_t       H5ST_delete(H5ST_tree_t *root, H5ST_ptr_t p);
 H5_DLL herr_t       H5ST_dump(H5ST_ptr_t p);
 
-#endif /* _H5STprivate_H */
+#endif /* H5STprivate_H */
diff --git a/src/H5Spkg.h b/src/H5Spkg.h
index 0c390cc..e2eae2a 100644
--- a/src/H5Spkg.h
+++ b/src/H5Spkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5S package!"
 #endif
 
-#ifndef _H5Spkg_H
-#define _H5Spkg_H
+#ifndef H5Spkg_H
+#define H5Spkg_H
 
 /* Get package's private header */
 #include "H5Sprivate.h"
@@ -289,4 +289,4 @@ H5_DLL htri_t H5S_select_shape_same_test(hid_t sid1, hid_t sid2);
 H5_DLL htri_t H5S_get_rebuild_status_test(hid_t space_id);
 #endif /* H5S_TESTING */
 
-#endif /*_H5Spkg_H*/
+#endif /*H5Spkg_H*/
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 242f99f..8629ecb 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5S module
  */
-#ifndef _H5Sprivate_H
-#define _H5Sprivate_H
+#ifndef H5Sprivate_H
+#define H5Sprivate_H
 
 /* Include package's public header */
 #include "H5Spublic.h"
@@ -289,4 +289,4 @@ H5_DLL herr_t H5S_mpio_space_type(const H5S_t *space, size_t elmt_size,
                                   hbool_t do_permute, hsize_t **permute_map, hbool_t *is_permuted);
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* _H5Sprivate_H */
+#endif /* H5Sprivate_H */
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 76e01c0..fb58843 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5S module.
  */
-#ifndef _H5Spublic_H
-#define _H5Spublic_H
+#ifndef H5Spublic_H
+#define H5Spublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -132,4 +132,4 @@ H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Spublic_H */
+#endif /* H5Spublic_H */
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 3f08df9..53112f7 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -23,8 +23,8 @@
 #error "Do not include this file outside the H5T package!"
 #endif
 
-#ifndef _H5Tpkg_H
-#define _H5Tpkg_H
+#ifndef H5Tpkg_H
+#define H5Tpkg_H
 
 /*
  * Define this to enable debugging.
@@ -984,4 +984,4 @@ H5_DLL herr_t H5T__sort_name(const H5T_t *dt, int *map);
 /* Debugging functions */
 H5_DLL herr_t H5T__print_stats(H5T_path_t *path, int *nprint /*in,out*/);
 
-#endif /* _H5Tpkg_H */
+#endif /* H5Tpkg_H */
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h
index a3bc8ef..b7c203c 100644
--- a/src/H5Tprivate.h
+++ b/src/H5Tprivate.h
@@ -14,8 +14,8 @@
 /*
  * This file contains private information about the H5T module
  */
-#ifndef _H5Tprivate_H
-#define _H5Tprivate_H
+#ifndef H5Tprivate_H
+#define H5Tprivate_H
 
 /* Get package's public header */
 #include "H5Tpublic.h"
@@ -158,4 +158,4 @@ H5_DLL int         H5T_get_offset(const H5T_t *dt);
 /* Fixed-point functions */
 H5_DLL H5T_sign_t H5T_get_sign(H5T_t const *dt);
 
-#endif /* _H5Tprivate_H */
+#endif /* H5Tprivate_H */
diff --git a/src/H5Tpublic.h b/src/H5Tpublic.h
index 742744ae..33c71b9 100644
--- a/src/H5Tpublic.h
+++ b/src/H5Tpublic.h
@@ -14,8 +14,8 @@
 /*
  * This file contains public declarations for the H5T module.
  */
-#ifndef _H5Tpublic_H
-#define _H5Tpublic_H
+#ifndef H5Tpublic_H
+#define H5Tpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -604,4 +604,4 @@ H5_DLL int    H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int perm[]);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5Tpublic_H */
+#endif /* H5Tpublic_H */
diff --git a/src/H5WBprivate.h b/src/H5WBprivate.h
index 416e125..1092365 100644
--- a/src/H5WBprivate.h
+++ b/src/H5WBprivate.h
@@ -22,8 +22,8 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5WBprivate_H
-#define _H5WBprivate_H
+#ifndef H5WBprivate_H
+#define H5WBprivate_H
 
 /* Include package's public header */
 /* #include "H5WBpublic.h" */
@@ -55,4 +55,4 @@ H5_DLL void *  H5WB_actual(H5WB_t *wb, size_t need);
 H5_DLL void *  H5WB_actual_clear(H5WB_t *wb, size_t need);
 H5_DLL herr_t  H5WB_unwrap(H5WB_t *wb);
 
-#endif /* _H5WBprivate_H */
+#endif /* H5WBprivate_H */
diff --git a/src/H5Zpkg.h b/src/H5Zpkg.h
index 6e64c66..562b4a1 100644
--- a/src/H5Zpkg.h
+++ b/src/H5Zpkg.h
@@ -15,8 +15,8 @@
 #error "Do not include this file outside the H5Z package!"
 #endif
 
-#ifndef _H5Zpkg_H
-#define _H5Zpkg_H
+#ifndef H5Zpkg_H
+#define H5Zpkg_H
 
 /* Include private header file */
 #include "H5Zprivate.h" /* Filter functions                */
@@ -51,4 +51,4 @@ H5_DLLVAR const H5Z_class2_t H5Z_DEFLATE[1];
 H5_DLLVAR H5Z_class2_t H5Z_SZIP[1];
 #endif /* H5_HAVE_FILTER_SZIP */
 
-#endif /* _H5Zpkg_H */
+#endif /* H5Zpkg_H */
diff --git a/src/H5Zprivate.h b/src/H5Zprivate.h
index c229de3..ecca1c0 100644
--- a/src/H5Zprivate.h
+++ b/src/H5Zprivate.h
@@ -15,8 +15,8 @@
  *              Thursday, April 16, 1998
  */
 
-#ifndef _H5Zprivate_H
-#define _H5Zprivate_H
+#ifndef H5Zprivate_H
+#define H5Zprivate_H
 
 /* Include package's public header */
 #include "H5Zpublic.h"
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index ddf69a1..e829eb1 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -15,8 +15,8 @@
  *              Thursday, April 16, 1998
  */
 
-#ifndef _H5Zpublic_H
-#define _H5Zpublic_H
+#ifndef H5Zpublic_H
+#define H5Zpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
diff --git a/src/H5private.h b/src/H5private.h
index d37d2cd..ef0bd82 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _H5private_H
-#define _H5private_H
+#ifndef H5private_H
+#define H5private_H
 
 #include "H5public.h" /* Include Public Definitions    */
 
@@ -2225,4 +2225,4 @@ H5_DLL herr_t H5_combine_path(const char *path1, const char *path2, char **full_
 H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf, const uint8_t *marker,
                              size_t buf_offset, size_t buf_size);
 
-#endif /* _H5private_H */
+#endif /* H5private_H */
diff --git a/src/H5public.h b/src/H5public.h
index c3ea8ef..fa0bfbc 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -14,16 +14,16 @@
 /*
  * This file contains public declarations for the HDF5 module.
  */
-#ifndef _H5public_H
-#define _H5public_H
+#ifndef H5public_H
+#define H5public_H
 
 /* Include files for public use... */
 /*
  * Since H5pubconf.h is a generated header file, it is messy to try
- * to put a #ifndef _H5pubconf_H ... #endif guard in it.
+ * to put a #ifndef H5pubconf_H ... #endif guard in it.
  * HDF5 has set an internal rule that it is being included here.
  * Source files should NOT include H5pubconf.h directly but include
- * it via H5public.h.  The #ifndef _H5public_H guard above would
+ * it via H5public.h.  The #ifndef H5public_H guard above would
  * prevent repeated include.
  */
 #include "H5pubconf.h" /* From configure */
@@ -332,4 +332,4 @@ H5_DLL void * H5resize_memory(void *mem, size_t size);
 #ifdef __cplusplus
 }
 #endif
-#endif /* _H5public_H */
+#endif /* H5public_H */
diff --git a/src/hdf5.h b/src/hdf5.h
index 3dcdf2e..7706177 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -16,8 +16,8 @@
  * a particular header file and include that here, don't fill this file with
  * lots of gunk...
  */
-#ifndef _HDF5_H
-#define _HDF5_H
+#ifndef HDF5_H
+#define HDF5_H
 
 #include "H5public.h"
 #include "H5Apublic.h"  /* Attributes                               */