[svn-r7355] Purpose:

    Code cleanup, etc.

Description:
    Previously (in versions prior to 1.7), there were two locations to
modify when an error was added to the library.  Now, with the new error API,
there were four.

Solution:
    Created a single text file (src/H5err.txt) and a perl script (bin/make_err)
which uses the text file to automatically create header files that are included
in appropriate places in the library.
    This means that there is only one file (src/H5err.txt) which needs to be
modified when a new error code is added to the library.  The automatically
generated headers depend on this file and the makefiles will take care of
running the perl script to regenerate them when the text file changes, so no
user action is required when a new error is added.

Platforms tested:
    h5committested

9 files changed, 1432 insertions, 1204 deletions

diff --git a/src/H5E.c b/src/H5E.c
index b00b766..7aa7d45 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -56,135 +56,9 @@ hid_t H5E_ERR_CLS_g			= FAIL;
 /*
  * Predefined errors. These are initialized at runtime in H5E_init_interface()
  * in this source file.
- *
- * If more of these are added, the new ones must be added to the list of
- * types to reset in H5E_term_interface().
  */
-
-/* Major error IDs */
-hid_t    H5E_ARGS_g         = FAIL;                      /*invalid arguments to routine               */
-hid_t    H5E_RESOURCE_g     = FAIL;                  /*resource unavailable                       */
-hid_t    H5E_INTERNAL_g     = FAIL;                  /*Internal error (too specific to document in detail) */
-hid_t    H5E_FILE_g         = FAIL;                      /*file Accessability                         */
-hid_t    H5E_IO_g           = FAIL;                        /*Low-level I/O                              */
-hid_t    H5E_FUNC_g         = FAIL;                      /*function Entry/Exit                        */
-hid_t    H5E_ATOM_g         = FAIL;                      /*object Atom                                */
-hid_t    H5E_CACHE_g        = FAIL;                     /*object Cache                               */
-hid_t    H5E_BTREE_g        = FAIL;                     /*B-Tree Node                                */
-hid_t    H5E_SYM_g          = FAIL;                       /*symbol Table                               */
-hid_t    H5E_HEAP_g         = FAIL;                      /*Heap                                       */
-hid_t    H5E_OHDR_g         = FAIL;                      /*object Header                              */
-hid_t    H5E_DATATYPE_g     = FAIL;                  /*Datatype                                   */
-hid_t    H5E_DATASPACE_g    = FAIL;                 /*Dataspace                                  */
-hid_t    H5E_DATASET_g      = FAIL;                   /*Dataset                                    */
-hid_t    H5E_STORAGE_g      = FAIL;                   /*data storage                               */
-hid_t    H5E_PLIST_g        = FAIL;                     /*Property lists                             */
-hid_t    H5E_ATTR_g         = FAIL;                      /*Attribute                                  */
-hid_t    H5E_PLINE_g        = FAIL;                     /*Data filters                               */
-hid_t    H5E_EFL_g          = FAIL;                       /*External file list                         */
-hid_t    H5E_REFERENCE_g    = FAIL;                 /*References                                 */
-hid_t    H5E_VFL_g          = FAIL;		        /*Virtual File Layer			     */
-hid_t    H5E_TBBT_g         = FAIL; 		        /*Threaded, Balanced, Binary Trees           */
-hid_t    H5E_FPHDF5_g       = FAIL;		        /*Flexible Parallel HDF5                     */
-hid_t    H5E_TST_g          = FAIL; 		        /*Ternary Search Trees                       */
-hid_t    H5E_RS_g           = FAIL;  		        /*Reference Counted Strings                  */
-hid_t    H5E_ERROR_g        = FAIL;  		        /*Error API				     */
-
-/* Minor error IDs */
-hid_t    H5E_UNINITIALIZED_g              = FAIL;             /*information is unitialized                 */
-hid_t    H5E_UNSUPPORTED_g                = FAIL;               /*feature is unsupported                     */
-hid_t    H5E_BADTYPE_g            = FAIL;                   /*incorrect type found                       */
-hid_t    H5E_BADRANGE_g           = FAIL;                  /*argument out of range                      */
-hid_t    H5E_BADVALUE_g           = FAIL;                  /*bad value for argument                     */
-
-hid_t    H5E_NOSPACE_g            = FAIL;                   /*no space available for allocation          */
-hid_t    H5E_CANTCOPY_g           = FAIL;                  /*unable to copy object                      */
-hid_t    H5E_CANTFREE_g           = FAIL;                  /*unable to free object                      */
-hid_t    H5E_ALREADYEXISTS_g              = FAIL;             /*Object already exists                      */
-hid_t    H5E_CANTLOCK_g           = FAIL;                  /*Unable to lock object                      */
-hid_t    H5E_CANTUNLOCK_g         = FAIL;                /*Unable to unlock object                    */
-hid_t    H5E_CANTGC_g             = FAIL;		        /*Unable to garbage collect                  */
-
-hid_t    H5E_FILEEXISTS_g         = FAIL;                /*file already exists                        */
-hid_t    H5E_FILEOPEN_g           = FAIL;                  /*file already open                          */
-hid_t    H5E_CANTCREATE_g         = FAIL;                /*Can't create file                          */
-hid_t    H5E_CANTOPENFILE_g               = FAIL;              /*Can't open file                            */
-hid_t    H5E_CANTCLOSEFILE_g             = FAIL;             /*Can't close file			     */
-hid_t    H5E_NOTHDF5_g            = FAIL;                   /*not an HDF5 format file                    */
-hid_t    H5E_BADFILE_g            = FAIL;                   /*bad file ID accessed                       */
-hid_t    H5E_TRUNCATED_g          = FAIL;                 /*file has been truncated                    */
-hid_t    H5E_MOUNT_g              = FAIL;			/*file mount error			     */
-
-hid_t    H5E_SEEKERROR_g          = FAIL;                 /*seek failed                                */
-hid_t    H5E_READERROR_g          = FAIL;                 /*read failed                                */
-hid_t    H5E_WRITEERROR_g         = FAIL;                /*write failed                               */
-hid_t    H5E_CLOSEERROR_g         = FAIL;                /*close failed                               */
-hid_t    H5E_OVERFLOW_g           = FAIL;		        /*address overflowed			     */
-hid_t    H5E_FCNTL_g              = FAIL;                     /*file fcntl failed                          */
-
-hid_t    H5E_CANTINIT_g           = FAIL;                  /*Can't initialize object                    */
-hid_t    H5E_ALREADYINIT_g                = FAIL;               /*object already initialized                 */
-hid_t    H5E_CANTRELEASE_g                = FAIL;               /*Can't release object                       */
-
-hid_t    H5E_BADATOM_g            = FAIL;                   /*Can't find atom information                */
-hid_t    H5E_BADGROUP_g           = FAIL;                  /*Can't find group information               */
-hid_t    H5E_CANTREGISTER_g               = FAIL;              /*Can't register new atom                    */
-hid_t    H5E_CANTINC_g            = FAIL;                   /*Can't increment reference count            */
-hid_t    H5E_CANTDEC_g            = FAIL;                   /*Can't decrement reference count            */
-hid_t    H5E_NOIDS_g              = FAIL;                     /*Out of IDs for group                       */
-
-hid_t    H5E_CANTFLUSH_g          = FAIL;                 /*Can't flush object from cache              */
-hid_t    H5E_CANTLOAD_g           = FAIL;                  /*Can't load object into cache               */
-hid_t    H5E_PROTECT_g            = FAIL;                   /*protected object error                     */
-hid_t    H5E_NOTCACHED_g          = FAIL;                 /*object not currently cached                */
-
-hid_t    H5E_NOTFOUND_g           = FAIL;                  /*object not found                           */
-hid_t    H5E_EXISTS_g             = FAIL;                    /*object already exists                      */
-hid_t    H5E_CANTENCODE_g         = FAIL;                /*Can't encode value                         */
-hid_t    H5E_CANTDECODE_g         = FAIL;                /*Can't decode value                         */
-hid_t    H5E_CANTSPLIT_g          = FAIL;                 /*Can't split node                           */
-hid_t    H5E_CANTINSERT_g         = FAIL;                /*Can't insert object                        */
-hid_t    H5E_CANTLIST_g           = FAIL;                  /*Can't list node                            */
-
-hid_t    H5E_LINKCOUNT_g          = FAIL;                 /*bad object header link count               */
-hid_t    H5E_VERSION_g            = FAIL;                   /*wrong version number                       */
-hid_t    H5E_ALIGNMENT_g          = FAIL;                 /*alignment error                            */
-hid_t    H5E_BADMESG_g            = FAIL;                   /*unrecognized message                       */
-hid_t    H5E_CANTDELETE_g         = FAIL;                /* Can't delete message                      */
-
-hid_t    H5E_CANTOPENOBJ_g                = FAIL;               /*Can't open object                          */
-hid_t    H5E_COMPLEN_g            = FAIL;                   /*name component is too long                 */
-hid_t    H5E_CWG_g                = FAIL;                       /*problem with current working group         */
-hid_t    H5E_LINK_g               = FAIL;                      /*link count failure                         */
-hid_t    H5E_SLINK_g              = FAIL;			/*symbolic link error			     */
-
-hid_t    H5E_CANTCONVERT_g                = FAIL;               /*Can't convert datatypes                    */
-hid_t    H5E_BADSIZE_g            = FAIL;                   /*Bad size for object                        */
-
-hid_t    H5E_CANTCLIP_g           = FAIL;                  /*Can't clip hyperslab region                */
-hid_t    H5E_CANTCOUNT_g          = FAIL;                 /*Can't count elements                       */
-hid_t    H5E_CANTSELECT_g         = FAIL;                /*Can't select hyperslab                     */
-hid_t    H5E_CANTNEXT_g           = FAIL;                  /*Can't move to next iterator location       */
-hid_t    H5E_BADSELECT_g          = FAIL;                 /*Invalid selection                          */
-hid_t    H5E_CANTCOMPARE_g                = FAIL;               /*Can't compare objects                      */
-
-hid_t    H5E_CANTGET_g            = FAIL;                   /*Can't get value                            */
-hid_t    H5E_CANTSET_g            = FAIL;                   /*Can't set value                            */
-hid_t    H5E_DUPCLASS_g           = FAIL;                  /*Duplicate class name in parent class */
-
-hid_t    H5E_MPI_g                = FAIL;			/*some MPI function failed		     */
-hid_t    H5E_MPIERRSTR_g          = FAIL;		        /*MPI Error String 			     */
-
-hid_t    H5E_CANTMAKETREE_g               = FAIL;              /*can't make a TBBT tree                     */
-hid_t    H5E_CANTRECV_g           = FAIL;                  /*can't receive messages from processes      */
-hid_t    H5E_CANTSENDMDATA_g              = FAIL;             /*can't send metadata message                */
-hid_t    H5E_CANTCHANGE_g         = FAIL;                /*can't register change on server            */
-hid_t    H5E_CANTALLOC_g          = FAIL;                 /*can't allocate from file                   */
-
-hid_t    H5E_NOFILTER_g           = FAIL;                  /*requested filter is not available          */
-hid_t    H5E_CALLBACK_g           = FAIL;                  /*callback failed                            */
-hid_t    H5E_CANAPPLY_g           = FAIL;                  /*error from filter "can apply" callback     */
-hid_t    H5E_SETLOCAL_g           = FAIL;                  /*error from filter "set local" callback     */
+/* Include the automatically generated error code definitions */
+#include "H5Edefin.h"
 
 /* Amount to indent each error */
 #define H5E_INDENT              2
@@ -290,556 +164,8 @@ H5E_init_interface(void)
     if((H5E_ERR_CLS_g = H5I_register(H5I_ERROR_CLASS, cls))<0)
         HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error class")
 
-    /* Allocate the HDF5 major errors */
-
-    assert(H5E_ARGS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_ARGS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_RESOURCE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_RESOURCE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_INTERNAL_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_INTERNAL_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_FILE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_FILE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_IO_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_IO_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_FUNC_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_FUNC_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ATOM_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_ATOM_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CACHE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_CACHE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BTREE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_BTREE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_SYM_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_SYM_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_HEAP_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_HEAP_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_OHDR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_HEAP_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_DATATYPE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_DATATYPE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_DATASPACE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_DATASPACE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_DATASET_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_DATASET_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_STORAGE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_STORAGE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_PLIST_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_PLIST_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ATTR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_ATTR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_PLINE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_PLINE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_EFL_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_EFL_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_REFERENCE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_REFERENCE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_VFL_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_VFL_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_TBBT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_TBBT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_TBBT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_FPHDF5_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_FPHDF5_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FPHDF5_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_TST_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_TST_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_RS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_RS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ERROR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MAJOR, H5E_MAJ_ERROR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    /* Allocate the HDF5 minor errors */
-
-    assert(H5E_UNINITIALIZED_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_UNINITIALIZED_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_UNSUPPORTED_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_UNSUPPORTED_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADTYPE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADTYPE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADRANGE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADRANGE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADVALUE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADVALUE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    assert(H5E_NOSPACE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOSPACE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCOPY_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCOPY_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTFREE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTFREE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ALREADYEXISTS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_ALREADYEXISTS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTLOCK_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTLOCK_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTUNLOCK_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTUNLOCK_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTGC_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTGC_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_FILEEXISTS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_FILEEXISTS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_FILEOPEN_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_FILEOPEN_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCREATE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCREATE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTOPENFILE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTOPENFILE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCLOSEFILE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCLOSEFILE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_NOTHDF5_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOTHDF5_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADFILE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADFILE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_TRUNCATED_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_TRUNCATED_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_MOUNT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_MOUNT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    assert(H5E_SEEKERROR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_SEEKERROR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_READERROR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_READERROR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_WRITEERROR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_WRITEERROR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CLOSEERROR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CLOSEERROR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_OVERFLOW_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_OVERFLOW_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_FCNTL_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_FCNTL_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    assert(H5E_CANTINIT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTINIT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ALREADYINIT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_ALREADYINIT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTRELEASE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTRELEASE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_BADATOM_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADATOM_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADGROUP_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADGROUP_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTREGISTER_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTREGISTER_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTINC_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTINC_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTDEC_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTDEC_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_NOIDS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOIDS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTFLUSH_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTFLUSH_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTLOAD_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTLOAD_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_PROTECT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_PROTECT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_NOTCACHED_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOTCACHED_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_NOTFOUND_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOTFOUND_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_EXISTS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_EXISTS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTENCODE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTENCODE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTDECODE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTDECODE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTSPLIT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTSPLIT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTINSERT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTINSERT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTLIST_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTLIST_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_LINKCOUNT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_LINKCOUNT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_VERSION_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_VERSION_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_ALIGNMENT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_ALIGNMENT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADMESG_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADMESG_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTDELETE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTDELETE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTOPENOBJ_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTOPENOBJ_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_COMPLEN_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_COMPLEN_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CWG_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CWG_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CWG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_LINK_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_LINK_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_SLINK_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_SLINK_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_SLINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTCONVERT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCONVERT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADSIZE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADSIZE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTCLIP_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCLIP_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCOUNT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCOUNT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTSELECT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTSELECT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTNEXT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTNEXT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_BADSELECT_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_BADSELECT_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCOMPARE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCOMPARE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTGET_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTGET_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTSET_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTSET_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_DUPCLASS_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_DUPCLASS_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    assert(H5E_MPI_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_MPI_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_MPIERRSTR_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_MPIERRSTR_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    
-    assert(H5E_CANTMAKETREE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTMAKETREE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTMAKETREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTRECV_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTRECV_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTSENDMDATA_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTSENDMDATA_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTSENDMDATA_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTCHANGE_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTCHANGE_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTCHANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANTALLOC_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANTALLOC_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-
-    assert(H5E_NOFILTER_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_NOFILTER_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CALLBACK_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CALLBACK_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_CANAPPLY_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_CANAPPLY_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
-    assert(H5E_SETLOCAL_g==(-1));
-    if((msg = H5E_create_msg(cls, H5E_MINOR, H5E_MIN_SETLOCAL_MSG))==NULL)
-        HGOTO_ERROR (H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed");
-    if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
-        HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+    /* Include the automatically generated error code initialization */
+    #include "H5Einit.h"
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -897,115 +223,8 @@ H5E_term_interface(void)
                 
                 /* Reset the HDF5 error messages, if they've been closed */
                 if(H5I_nmembers(H5I_ERROR_MSG)==0) {
-                    /* Reset major error IDs */
-                    H5E_ARGS_g=
-                    H5E_RESOURCE_g=
-                    H5E_INTERNAL_g=
-                    H5E_FILE_g=
-                    H5E_IO_g=
-                    H5E_FUNC_g=
-                    H5E_ATOM_g=
-                    H5E_CACHE_g=
-                    H5E_BTREE_g=
-                    H5E_SYM_g=
-                    H5E_HEAP_g=
-                    H5E_OHDR_g=
-                    H5E_DATATYPE_g=
-                    H5E_DATASPACE_g=
-                    H5E_DATASET_g=
-                    H5E_STORAGE_g=
-                    H5E_PLIST_g=
-                    H5E_ATTR_g=
-                    H5E_PLINE_g=
-                    H5E_EFL_g=
-                    H5E_REFERENCE_g=
-                    H5E_VFL_g=
-                    H5E_TBBT_g=
-                    H5E_FPHDF5_g=
-                    H5E_TST_g=
-                    H5E_RS_g=
-                    H5E_ERROR_g= (-1);
-
-                    /* Reset minor error IDs */
-                    H5E_UNINITIALIZED_g=
-                    H5E_UNSUPPORTED_g=
-                    H5E_BADTYPE_g=
-                    H5E_BADRANGE_g=
-                    H5E_BADVALUE_g=
-                    H5E_NOSPACE_g=
-                    H5E_CANTCOPY_g=
-                    H5E_CANTFREE_g=
-                    H5E_ALREADYEXISTS_g=
-                    H5E_CANTLOCK_g=
-                    H5E_CANTUNLOCK_g=
-                    H5E_CANTGC_g=
-                    H5E_FILEEXISTS_g=
-                    H5E_FILEOPEN_g=
-                    H5E_CANTCREATE_g=
-                    H5E_CANTOPENFILE_g=
-                    H5E_CANTCLOSEFILE_g=
-                    H5E_NOTHDF5_g=
-                    H5E_BADFILE_g=
-                    H5E_TRUNCATED_g=
-                    H5E_MOUNT_g=
-                    H5E_SEEKERROR_g=
-                    H5E_READERROR_g=
-                    H5E_WRITEERROR_g=
-                    H5E_CLOSEERROR_g=
-                    H5E_OVERFLOW_g=
-                    H5E_FCNTL_g=
-                    H5E_CANTINIT_g=
-                    H5E_ALREADYINIT_g=
-                    H5E_CANTRELEASE_g=
-                    H5E_BADATOM_g=
-                    H5E_BADGROUP_g=
-                    H5E_CANTREGISTER_g=
-                    H5E_CANTINC_g=
-                    H5E_CANTDEC_g=
-                    H5E_NOIDS_g=
-                    H5E_CANTFLUSH_g=
-                    H5E_CANTLOAD_g=
-                    H5E_PROTECT_g=
-                    H5E_NOTCACHED_g=
-                    H5E_NOTFOUND_g=
-                    H5E_EXISTS_g=
-                    H5E_CANTENCODE_g=
-                    H5E_CANTDECODE_g=
-                    H5E_CANTSPLIT_g=
-                    H5E_CANTINSERT_g=
-                    H5E_CANTLIST_g=
-                    H5E_LINKCOUNT_g=
-                    H5E_VERSION_g=
-                    H5E_ALIGNMENT_g=
-                    H5E_BADMESG_g=
-                    H5E_CANTDELETE_g=
-                    H5E_CANTOPENOBJ_g=
-                    H5E_COMPLEN_g=
-                    H5E_CWG_g=
-                    H5E_LINK_g=
-                    H5E_SLINK_g=
-                    H5E_CANTCONVERT_g=
-                    H5E_BADSIZE_g=
-                    H5E_CANTCLIP_g=
-                    H5E_CANTCOUNT_g=
-                    H5E_CANTSELECT_g=
-                    H5E_CANTNEXT_g=
-                    H5E_BADSELECT_g=
-                    H5E_CANTCOMPARE_g=
-                    H5E_CANTGET_g=
-                    H5E_CANTSET_g=
-                    H5E_DUPCLASS_g=
-                    H5E_MPI_g=
-                    H5E_MPIERRSTR_g=
-                    H5E_CANTMAKETREE_g=
-                    H5E_CANTRECV_g=
-                    H5E_CANTSENDMDATA_g=
-                    H5E_CANTCHANGE_g=
-                    H5E_CANTALLOC_g=
-                    H5E_NOFILTER_g=
-                    H5E_CALLBACK_g=
-                    H5E_CANAPPLY_g=
-                    H5E_SETLOCAL_g= (-1);
+                    /* Include the automatically generated error code termination */
+                    #include "H5Eterm.h"
                 } /* end if */
             } /* end if */
 
diff --git a/src/H5Edefin.h b/src/H5Edefin.h
new file mode 100644
index 0000000..4ec08af
--- /dev/null
+++ b/src/H5Edefin.h
@@ -0,0 +1,164 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Generated automatically by bin/make_err -- do not edit */
+/* Add new errors to H5err.txt file */
+
+
+#ifndef _H5Edefin_H
+#define _H5Edefin_H
+
+/* Major error IDs */
+hid_t H5E_BTREE_g          = FAIL;      /* B-Tree node */
+hid_t H5E_EFL_g            = FAIL;      /* External file list */
+hid_t H5E_REFERENCE_g      = FAIL;      /* References */
+hid_t H5E_FPHDF5_g         = FAIL;      /* Flexible Parallel HDF5 */
+hid_t H5E_INTERNAL_g       = FAIL;      /* Internal error (too specific to document in detail) */
+hid_t H5E_ERROR_g          = FAIL;      /* Error API */
+hid_t H5E_DATASET_g        = FAIL;      /* Dataset */
+hid_t H5E_ATOM_g           = FAIL;      /* Object atom */
+hid_t H5E_TBBT_g           = FAIL;      /* Threaded, Balanced, Binary Trees */
+hid_t H5E_OHDR_g           = FAIL;      /* Object header */
+hid_t H5E_STORAGE_g        = FAIL;      /* Data storage */
+hid_t H5E_FILE_g           = FAIL;      /* File accessability */
+hid_t H5E_RS_g             = FAIL;      /* Reference Counted Strings */
+hid_t H5E_DATATYPE_g       = FAIL;      /* Datatype */
+hid_t H5E_TST_g            = FAIL;      /* Ternary Search Trees */
+hid_t H5E_RESOURCE_g       = FAIL;      /* Resource unavailable */
+hid_t H5E_CACHE_g          = FAIL;      /* Object cache */
+hid_t H5E_SYM_g            = FAIL;      /* Symbol table */
+hid_t H5E_FUNC_g           = FAIL;      /* Function entry/exit */
+hid_t H5E_VFL_g            = FAIL;      /* Virtual File Layer */
+hid_t H5E_PLIST_g          = FAIL;      /* Property lists */
+hid_t H5E_ATTR_g           = FAIL;      /* Attribute */
+hid_t H5E_IO_g             = FAIL;      /* Low-level I/O */
+hid_t H5E_ARGS_g           = FAIL;      /* Invalid arguments to routine */
+hid_t H5E_DATASPACE_g      = FAIL;      /* Dataspace */
+hid_t H5E_PLINE_g          = FAIL;      /* Data filters */
+hid_t H5E_HEAP_g           = FAIL;      /* Heap */
+
+/* Minor error IDs */
+
+/* Property list errors */
+hid_t H5E_CANTGET_g        = FAIL;      /* Can't get value */
+hid_t H5E_CANTSET_g        = FAIL;      /* Can't set value */
+hid_t H5E_DUPCLASS_g       = FAIL;      /* Duplicate class name in parent class */
+
+/* Dataspace errors */
+hid_t H5E_CANTCLIP_g       = FAIL;      /* Can't clip hyperslab region */
+hid_t H5E_CANTCOUNT_g      = FAIL;      /* Can't count elements */
+hid_t H5E_CANTSELECT_g     = FAIL;      /* Can't select hyperslab */
+hid_t H5E_CANTNEXT_g       = FAIL;      /* Can't move to next iterator location */
+hid_t H5E_BADSELECT_g      = FAIL;      /* Invalid selection */
+hid_t H5E_CANTCOMPARE_g    = FAIL;      /* Can't compare objects */
+
+/* Object atom related errors */
+hid_t H5E_BADATOM_g        = FAIL;      /* Unable to find atom information (already closed?) */
+hid_t H5E_BADGROUP_g       = FAIL;      /* Unable to find ID group information */
+hid_t H5E_CANTREGISTER_g   = FAIL;      /* Unable to register new atom */
+hid_t H5E_CANTINC_g        = FAIL;      /* Unable to increment reference count */
+hid_t H5E_CANTDEC_g        = FAIL;      /* Unable to decrement reference count */
+hid_t H5E_NOIDS_g          = FAIL;      /* Out of IDs for group */
+
+/* Argument errors */
+hid_t H5E_UNINITIALIZED_g  = FAIL;      /* Information is uinitialized */
+hid_t H5E_UNSUPPORTED_g    = FAIL;      /* Feature is unsupported */
+hid_t H5E_BADTYPE_g        = FAIL;      /* Inappropriate type */
+hid_t H5E_BADRANGE_g       = FAIL;      /* Out of range */
+hid_t H5E_BADVALUE_g       = FAIL;      /* Bad value */
+
+/* FPHDF5 errors */
+hid_t H5E_CANTMAKETREE_g   = FAIL;      /* Can't create a binary tree node */
+hid_t H5E_CANTRECV_g       = FAIL;      /* Can't receive messages from processes */
+hid_t H5E_CANTSENDMDATA_g  = FAIL;      /* Can't send metadata message */
+hid_t H5E_CANTCHANGE_g     = FAIL;      /* Can't register change with server */
+hid_t H5E_CANTALLOC_g      = FAIL;      /* Can't allocate from file */
+
+/* I/O pipeline errors */
+hid_t H5E_NOFILTER_g       = FAIL;      /* Requested filter is not available */
+hid_t H5E_CALLBACK_g       = FAIL;      /* Callback failed */
+hid_t H5E_CANAPPLY_g       = FAIL;      /* Error from filter 'can apply' callback */
+hid_t H5E_SETLOCAL_g       = FAIL;      /* Error from filter 'set local' callback */
+
+/* Datatype conversion errors */
+hid_t H5E_CANTCONVERT_g    = FAIL;      /* Can't convert datatypes */
+hid_t H5E_BADSIZE_g        = FAIL;      /* Bad size for object */
+
+/* Parallel MPI errors */
+hid_t H5E_MPI_g            = FAIL;      /* Some MPI function failed */
+hid_t H5E_MPIERRSTR_g      = FAIL;      /* MPI Error String */
+
+/* Object header related errors */
+hid_t H5E_LINKCOUNT_g      = FAIL;      /* Bad object header link count */
+hid_t H5E_VERSION_g        = FAIL;      /* Wrong version number */
+hid_t H5E_ALIGNMENT_g      = FAIL;      /* Alignment error */
+hid_t H5E_BADMESG_g        = FAIL;      /* Unrecognized message */
+hid_t H5E_CANTDELETE_g     = FAIL;      /* Can't delete message */
+
+/* Resource errors */
+hid_t H5E_NOSPACE_g        = FAIL;      /* No space available for allocation */
+hid_t H5E_CANTCOPY_g       = FAIL;      /* Unable to copy object */
+hid_t H5E_CANTFREE_g       = FAIL;      /* Unable to free object */
+hid_t H5E_ALREADYEXISTS_g  = FAIL;      /* Object already exists */
+hid_t H5E_CANTLOCK_g       = FAIL;      /* Unable to lock object */
+hid_t H5E_CANTUNLOCK_g     = FAIL;      /* Unable to unlock object */
+hid_t H5E_CANTGC_g         = FAIL;      /* Unable to garbage collect */
+
+/* Generic low-level file I/O errors */
+hid_t H5E_SEEKERROR_g      = FAIL;      /* Seek failed */
+hid_t H5E_READERROR_g      = FAIL;      /* Read failed */
+hid_t H5E_WRITEERROR_g     = FAIL;      /* Write failed */
+hid_t H5E_CLOSEERROR_g     = FAIL;      /* Close failed */
+hid_t H5E_OVERFLOW_g       = FAIL;      /* Address overflowed */
+hid_t H5E_FCNTL_g          = FAIL;      /* File control (fcntl) failed */
+
+/* B-tree related errors */
+hid_t H5E_NOTFOUND_g       = FAIL;      /* Object not found */
+hid_t H5E_EXISTS_g         = FAIL;      /* Object already exists */
+hid_t H5E_CANTENCODE_g     = FAIL;      /* Unable to encode value */
+hid_t H5E_CANTDECODE_g     = FAIL;      /* Unable to decode value */
+hid_t H5E_CANTSPLIT_g      = FAIL;      /* Unable to split node */
+hid_t H5E_CANTINSERT_g     = FAIL;      /* Unable to insert object */
+hid_t H5E_CANTLIST_g       = FAIL;      /* Unable to list node */
+
+/* File accessability errors */
+hid_t H5E_FILEEXISTS_g     = FAIL;      /* File already exists */
+hid_t H5E_FILEOPEN_g       = FAIL;      /* File already open */
+hid_t H5E_CANTCREATE_g     = FAIL;      /* Unable to create file */
+hid_t H5E_CANTOPENFILE_g   = FAIL;      /* Unable to open file */
+hid_t H5E_CANTCLOSEFILE_g  = FAIL;      /* Unable to close file */
+hid_t H5E_NOTHDF5_g        = FAIL;      /* Not an HDF5 file */
+hid_t H5E_BADFILE_g        = FAIL;      /* Bad file ID accessed */
+hid_t H5E_TRUNCATED_g      = FAIL;      /* File has been truncated */
+hid_t H5E_MOUNT_g          = FAIL;      /* File mount error */
+
+/* Cache related errors */
+hid_t H5E_CANTFLUSH_g      = FAIL;      /* Unable to flush data from cache */
+hid_t H5E_CANTLOAD_g       = FAIL;      /* Unable to load metadata into cache */
+hid_t H5E_PROTECT_g        = FAIL;      /* Protected metadata error */
+hid_t H5E_NOTCACHED_g      = FAIL;      /* Metadata not currently cached */
+
+/* Group related errors */
+hid_t H5E_CANTOPENOBJ_g    = FAIL;      /* Can't open object */
+hid_t H5E_COMPLEN_g        = FAIL;      /* Name component is too long */
+hid_t H5E_CWG_g            = FAIL;      /* Problem with current working group */
+hid_t H5E_LINK_g           = FAIL;      /* Link count failure */
+hid_t H5E_SLINK_g          = FAIL;      /* Symbolic link error */
+
+/* Function entry/exit interface errors */
+hid_t H5E_CANTINIT_g       = FAIL;      /* Unable to initialize object */
+hid_t H5E_ALREADYINIT_g    = FAIL;      /* Object already initialized */
+hid_t H5E_CANTRELEASE_g    = FAIL;      /* Unable to release object */
+
+#endif /* H5Edefin_H */
diff --git a/src/H5Einit.h b/src/H5Einit.h
new file mode 100644
index 0000000..2120ea1
--- /dev/null
+++ b/src/H5Einit.h
@@ -0,0 +1,594 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Generated automatically by bin/make_err -- do not edit */
+/* Add new errors to H5err.txt file */
+
+
+#ifndef _H5Einit_H
+#define _H5Einit_H
+
+/*********************/
+/* Major error codes */
+/*********************/
+
+assert(H5E_BTREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "B-Tree node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BTREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_EFL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "External file list"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_EFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_REFERENCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "References"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_REFERENCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FPHDF5_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Flexible Parallel HDF5"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FPHDF5_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_INTERNAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Internal error (too specific to document in detail)"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_INTERNAL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Error API"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_DATASET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataset"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_DATASET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ATOM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object atom"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_TBBT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Threaded, Balanced, Binary Trees"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_TBBT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_OHDR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object header"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_OHDR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_STORAGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data storage"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_STORAGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "File accessability"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_RS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Reference Counted Strings"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_RS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_DATATYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Datatype"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_DATATYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_TST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Ternary Search Trees"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_TST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_RESOURCE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Resource unavailable"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_RESOURCE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CACHE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Object cache"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CACHE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_SYM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Symbol table"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_SYM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FUNC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Function entry/exit"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FUNC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_VFL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Virtual File Layer"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_VFL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_PLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Property lists"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_PLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ATTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Attribute"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ATTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_IO_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Low-level I/O"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_IO_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ARGS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Invalid arguments to routine"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ARGS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_DATASPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Dataspace"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_DATASPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_PLINE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Data filters"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_PLINE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_HEAP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MAJOR, "Heap"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_HEAP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/*********************/
+/* Minor error codes */
+/*********************/
+
+
+/* Property list errors */
+assert(H5E_CANTGET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't get value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTGET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTSET_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't set value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTSET_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_DUPCLASS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Duplicate class name in parent class"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_DUPCLASS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Dataspace errors */
+assert(H5E_CANTCLIP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't clip hyperslab region"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCLIP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't count elements"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't select hyperslab"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTNEXT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't move to next iterator location"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTNEXT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADSELECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Invalid selection"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADSELECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCOMPARE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't compare objects"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCOMPARE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Object atom related errors */
+assert(H5E_BADATOM_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find atom information (already closed?)"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADATOM_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADGROUP_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to find ID group information"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADGROUP_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTREGISTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to register new atom"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTREGISTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTINC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to increment reference count"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTINC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTDEC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decrement reference count"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTDEC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_NOIDS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of IDs for group"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOIDS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Argument errors */
+assert(H5E_UNINITIALIZED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Information is uinitialized"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNINITIALIZED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_UNSUPPORTED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Feature is unsupported"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_UNSUPPORTED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADTYPE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Inappropriate type"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADTYPE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADRANGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Out of range"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADRANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADVALUE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADVALUE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* FPHDF5 errors */
+assert(H5E_CANTMAKETREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't create a binary tree node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTMAKETREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTRECV_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't receive messages from processes"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTRECV_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTSENDMDATA_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't send metadata message"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTSENDMDATA_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCHANGE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't register change with server"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCHANGE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTALLOC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't allocate from file"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTALLOC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* I/O pipeline errors */
+assert(H5E_NOFILTER_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Requested filter is not available"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOFILTER_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CALLBACK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Callback failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CALLBACK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANAPPLY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'can apply' callback"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANAPPLY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_SETLOCAL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Error from filter 'set local' callback"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_SETLOCAL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Datatype conversion errors */
+assert(H5E_CANTCONVERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't convert datatypes"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCONVERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADSIZE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad size for object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADSIZE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Parallel MPI errors */
+assert(H5E_MPI_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Some MPI function failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_MPI_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_MPIERRSTR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "MPI Error String"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_MPIERRSTR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Object header related errors */
+assert(H5E_LINKCOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad object header link count"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_LINKCOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_VERSION_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Wrong version number"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_VERSION_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ALIGNMENT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Alignment error"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ALIGNMENT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADMESG_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unrecognized message"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADMESG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTDELETE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't delete message"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTDELETE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Resource errors */
+assert(H5E_NOSPACE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "No space available for allocation"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOSPACE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCOPY_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to copy object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCOPY_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTFREE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to free object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTFREE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ALREADYEXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ALREADYEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to lock object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTUNLOCK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to unlock object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTUNLOCK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTGC_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to garbage collect"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTGC_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Generic low-level file I/O errors */
+assert(H5E_SEEKERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Seek failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_SEEKERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_READERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Read failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_READERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_WRITEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Write failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_WRITEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CLOSEERROR_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Close failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CLOSEERROR_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_OVERFLOW_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Address overflowed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_OVERFLOW_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FCNTL_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File control (fcntl) failed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FCNTL_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* B-tree related errors */
+assert(H5E_NOTFOUND_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object not found"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOTFOUND_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_EXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already exists"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_EXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTENCODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to encode value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTENCODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTDECODE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to decode value"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTDECODE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTSPLIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to split node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTSPLIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTINSERT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to insert object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTINSERT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTLIST_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to list node"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTLIST_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* File accessability errors */
+assert(H5E_FILEEXISTS_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already exists"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FILEEXISTS_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_FILEOPEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File already open"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_FILEOPEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCREATE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to create file"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCREATE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTOPENFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to open file"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTOPENFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTCLOSEFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to close file"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTCLOSEFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_NOTHDF5_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Not an HDF5 file"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOTHDF5_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_BADFILE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Bad file ID accessed"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_BADFILE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_TRUNCATED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File has been truncated"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_TRUNCATED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_MOUNT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "File mount error"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_MOUNT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Cache related errors */
+assert(H5E_CANTFLUSH_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to flush data from cache"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTFLUSH_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTLOAD_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to load metadata into cache"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTLOAD_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_PROTECT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Protected metadata error"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_PROTECT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_NOTCACHED_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Metadata not currently cached"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_NOTCACHED_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Group related errors */
+assert(H5E_CANTOPENOBJ_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Can't open object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTOPENOBJ_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_COMPLEN_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Name component is too long"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_COMPLEN_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CWG_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Problem with current working group"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CWG_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_LINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Link count failure"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_LINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_SLINK_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Symbolic link error"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_SLINK_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+/* Function entry/exit interface errors */
+assert(H5E_CANTINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to initialize object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_ALREADYINIT_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Object already initialized"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_ALREADYINIT_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+assert(H5E_CANTRELEASE_g==(-1));
+if((msg = H5E_create_msg(cls, H5E_MINOR, "Unable to release object"))==NULL)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTINIT, FAIL, "error message initialization failed")
+if((H5E_CANTRELEASE_g = H5I_register(H5I_ERROR_MSG, msg))<0)
+    HGOTO_ERROR(H5E_ERROR, H5E_CANTREGISTER, FAIL, "can't register error message")
+
+#endif /* H5Einit_H */
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index 30e3bad..0a4832a 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -58,147 +58,6 @@ typedef struct H5E_print_t {
 #define    H5E_CLS_NAME         "HDF5"
 #define    H5E_CLS_LIB_NAME     "HDF5"
 
-/* HDF5 error class: major errors */
-#define    H5E_MAJ_ARGS_MSG		"Function arguments"
-#define    H5E_MAJ_RESOURCE_MSG        "Resource unavailable"
-#define    H5E_MAJ_INTERNAL_MSG        "Internal HDF5 error"
-#define    H5E_MAJ_FILE_MSG		"File interface"
-#define    H5E_MAJ_IO_MSG		        "Low-level I/O layer"
-#define    H5E_MAJ_FUNC_MSG		"Function entry/exit"
-#define    H5E_MAJ_ATOM_MSG		"Atom layer"
-#define    H5E_MAJ_CACHE_MSG		"Meta data cache layer"
-#define    H5E_MAJ_BTREE_MSG		"B-tree layer"
-#define    H5E_MAJ_SYM_MSG		        "Symbol table layer"
-#define    H5E_MAJ_HEAP_MSG		"Heap layer"
-#define    H5E_MAJ_OHDR_MSG		"Object header layer"
-#define    H5E_MAJ_DATATYPE_MSG	        "Datatype interface"
-#define    H5E_MAJ_DATASPACE_MSG	        "Dataspace interface"
-#define    H5E_MAJ_DATASET_MSG	        "Dataset interface"
-#define    H5E_MAJ_STORAGE_MSG	        "Data storage layer"
-#define    H5E_MAJ_PLIST_MSG		"Property list interface"
-#define    H5E_MAJ_ATTR_MSG		"Attribute layer"
-#define    H5E_MAJ_PLINE_MSG		"Data filters layer"
-#define    H5E_MAJ_EFL_MSG 		"External file list"
-#define    H5E_MAJ_REFERENCE_MSG	        "References layer"
-#define    H5E_MAJ_VFL_MSG		        "Virtual File Layer"
-#define    H5E_MAJ_TBBT_MSG		"Threaded, Balanced, Binary Trees"
-#define    H5E_MAJ_FPHDF5_MSG	        "Flexible Parallel HDF5"
-#define    H5E_MAJ_TST_MSG		        "Ternary Search Trees"
-#define    H5E_MAJ_RS_MSG		        "Reference Counted Strings"
-#define    H5E_MAJ_ERROR_MSG		        "Error API"
-
-/* HDF5 error class: minor errors */
-    /* Argument errors */
-#define    H5E_MIN_UNINITIALIZED_MSG "Information is uninitialized"
-#define    H5E_MIN_UNSUPPORTED_MSG 	"Feature is unsupported"
-#define    H5E_MIN_BADTYPE_MSG 	"Inappropriate type"
-#define    H5E_MIN_BADRANGE_MSG 	"Out of range"
-#define    H5E_MIN_BADVALUE_MSG 	"Bad value"
-
-    /* Resource errors */
-#define    H5E_MIN_NOSPACE_MSG 	"No space available for allocation"
-#define    H5E_MIN_CANTCOPY_MSG 	"Unable to copy object"
-#define    H5E_MIN_CANTFREE_MSG 	"Unable to free object"
-#define    H5E_MIN_ALREADYEXISTS_MSG "Object already exists"
-#define    H5E_MIN_CANTLOCK_MSG 	"Unable to lock object"
-#define    H5E_MIN_CANTUNLOCK_MSG 	"Unable to unlock object"
-#define    H5E_MIN_CANTGC_MSG 	"Unable to garbage collect"
-
-    /* File accessability errors */
-#define    H5E_MIN_FILEEXISTS_MSG 	"File already exists"
-#define    H5E_MIN_FILEOPEN_MSG 	"File already open"
-#define    H5E_MIN_CANTCREATE_MSG 	"Unable to create file"
-#define    H5E_MIN_CANTOPENFILE_MSG 	"Unable to open file"
-#define    H5E_MIN_CANTCLOSEFILE_MSG 	"Unable to close file"
-#define    H5E_MIN_NOTHDF5_MSG 	"Not an HDF5 file"
-#define    H5E_MIN_BADFILE_MSG 	"Bad file ID accessed"
-#define    H5E_MIN_TRUNCATED_MSG 	"File has been truncated"
-#define    H5E_MIN_MOUNT_MSG		"File mount error"
-
-    /* Generic low-level file I/O errors */
-#define    H5E_MIN_SEEKERROR_MSG	"Seek failed"
-#define    H5E_MIN_READERROR_MSG	"Read failed"
-#define    H5E_MIN_WRITEERROR_MSG 	"Write failed"
-#define    H5E_MIN_CLOSEERROR_MSG 	"Close failed"
-#define    H5E_MIN_OVERFLOW_MSG 	"Address overflowed"
-#define    H5E_MIN_FCNTL_MSG         "File control (fcntl) failed"
-
-    /* Function entry/exit interface errors */
-#define    H5E_MIN_CANTINIT_MSG 	"Unable to initialize object"
-#define    H5E_MIN_ALREADYINIT_MSG 	"Object already initialized"
-#define    H5E_MIN_CANTRELEASE_MSG 	"Unable to release object"
-
-    /* Object atom related errors */
-#define    H5E_MIN_BADATOM_MSG 	"Unable to find atom information (already closed?)"
-#define    H5E_MIN_BADGROUP_MSG 	"Unable to find ID group information"
-#define    H5E_MIN_CANTREGISTER_MSG 	"Unable to register new atom"
-#define    H5E_MIN_CANTINC_MSG      	"Unable to increment reference count"
-#define    H5E_MIN_CANTDEC_MSG      	"Unable to decrement reference count"
-#define    H5E_MIN_NOIDS_MSG      	"Out of IDs for group"
-
-    /* Cache related errors */
-#define    H5E_MIN_CANTFLUSH_MSG 	"Unable to flush data from cache"
-#define    H5E_MIN_CANTLOAD_MSG 	"Unable to load meta data into cache"
-#define    H5E_MIN_PROTECT_MSG 	"Protected meta data error"
-#define    H5E_MIN_NOTCACHED_MSG 	"Meta data not currently cached"
-
-    /* B-tree related errors */
-#define    H5E_MIN_NOTFOUND_MSG 	"Object not found"
-#define    H5E_MIN_EXISTS_MSG 	"Object already exists"
-#define    H5E_MIN_CANTENCODE_MSG 	"Unable to encode value"
-#define    H5E_MIN_CANTDECODE_MSG 	"Unable to decode value"
-#define    H5E_MIN_CANTSPLIT_MSG 	"Unable to split node"
-#define    H5E_MIN_CANTINSERT_MSG 	"Unable to insert object"
-#define    H5E_MIN_CANTLIST_MSG 	"Unable to list node"
-
-    /* Object header related errors */
-#define    H5E_MIN_LINKCOUNT_MSG 	"Bad object header link count"
-#define    H5E_MIN_VERSION_MSG 	"Wrong version number"
-#define    H5E_MIN_ALIGNMENT_MSG 	"Alignment error"
-#define    H5E_MIN_BADMESG_MSG 	"Unrecognized message"
-#define    H5E_MIN_CANTDELETE_MSG 	"Can't delete message"
-
-    /* Group related errors */
-#define    H5E_MIN_CANTOPENOBJ_MSG	"Can't open object"
-#define    H5E_MIN_COMPLEN_MSG 	"Name component is too long"
-#define    H5E_MIN_CWG_MSG 		"Problem with current working group"
-#define    H5E_MIN_LINK_MSG 		"Link count failure"
-#define    H5E_MIN_SLINK_MSG		"Symbolic link error"
-
-    /* Datatype conversion errors */
-#define    H5E_MIN_CANTCONVERT_MSG	"Can't convert datatypes"
-#define    H5E_MIN_BADSIZE_MSG	"Bad size for object"
-
-    /* Dataspace errors */
-#define    H5E_MIN_CANTCLIP_MSG	"Can't clip hyperslab region"
-#define    H5E_MIN_CANTCOUNT_MSG	"Can't count elements"
-#define    H5E_MIN_CANTSELECT_MSG    "Can't select hyperslab"
-#define    H5E_MIN_CANTNEXT_MSG      "Can't move to next iterator location"
-#define    H5E_MIN_BADSELECT_MSG     "Invalid selection"
-#define    H5E_MIN_CANTCOMPARE_MSG   "Can't compare objects"
-
-    /* Property list errors */
-#define    H5E_MIN_CANTGET_MSG	"Can't get value"
-#define    H5E_MIN_CANTSET_MSG	"Can't set value"
-#define    H5E_MIN_DUPCLASS_MSG	"Duplicate class name in parent class"
-
-    /* Parallel MPI errors */
-#define    H5E_MIN_MPI_MSG		"Some MPI function failed"
-#define    H5E_MIN_MPIERRSTR_MSG     "MPI Error String"
-
-    /* FPHDF5 errors */
-#define    H5E_MIN_CANTMAKETREE_MSG "Can't create a binary tree node"
-#define    H5E_MIN_CANTRECV_MSG      "Can't receive messages from processes"
-#define    H5E_MIN_CANTSENDMDATA_MSG "Can't send metadata message"
-#define    H5E_MIN_CANTCHANGE_MSG   "Can't register change with server"
-#define    H5E_MIN_CANTALLOC_MSG     "Can't allocate from file"
-
-    /* I/O pipeline errors */
-#define    H5E_MIN_NOFILTER_MSG      "Requested filter is not available"
-#define    H5E_MIN_CALLBACK_MSG      "Callback failed"
-#define    H5E_MIN_CANAPPLY_MSG      "Error from filter \"can apply\" callback"
-#define    H5E_MIN_SETLOCAL_MSG      "Error from filter \"set local\" callback"
-
 /*
  * HERROR macro, used to facilitate error reporting between a FUNC_ENTER()
  * and a FUNC_LEAVE() within a function body.  The arguments are the major
diff --git a/src/H5Epubgen.h b/src/H5Epubgen.h
new file mode 100644
index 0000000..7b7ad6b
--- /dev/null
+++ b/src/H5Epubgen.h
@@ -0,0 +1,275 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Generated automatically by bin/make_err -- do not edit */
+/* Add new errors to H5err.txt file */
+
+
+#ifndef _H5Epubgen_H
+#define _H5Epubgen_H
+
+/*********************/
+/* Major error codes */
+/*********************/
+
+#define H5E_BTREE           (H5OPEN H5E_BTREE_g)
+#define H5E_EFL             (H5OPEN H5E_EFL_g)
+#define H5E_REFERENCE       (H5OPEN H5E_REFERENCE_g)
+#define H5E_FPHDF5          (H5OPEN H5E_FPHDF5_g)
+#define H5E_INTERNAL        (H5OPEN H5E_INTERNAL_g)
+#define H5E_ERROR           (H5OPEN H5E_ERROR_g)
+#define H5E_DATASET         (H5OPEN H5E_DATASET_g)
+#define H5E_ATOM            (H5OPEN H5E_ATOM_g)
+#define H5E_TBBT            (H5OPEN H5E_TBBT_g)
+#define H5E_OHDR            (H5OPEN H5E_OHDR_g)
+#define H5E_STORAGE         (H5OPEN H5E_STORAGE_g)
+#define H5E_FILE            (H5OPEN H5E_FILE_g)
+#define H5E_RS              (H5OPEN H5E_RS_g)
+#define H5E_DATATYPE        (H5OPEN H5E_DATATYPE_g)
+#define H5E_TST             (H5OPEN H5E_TST_g)
+#define H5E_RESOURCE        (H5OPEN H5E_RESOURCE_g)
+#define H5E_CACHE           (H5OPEN H5E_CACHE_g)
+#define H5E_SYM             (H5OPEN H5E_SYM_g)
+#define H5E_FUNC            (H5OPEN H5E_FUNC_g)
+#define H5E_VFL             (H5OPEN H5E_VFL_g)
+#define H5E_PLIST           (H5OPEN H5E_PLIST_g)
+#define H5E_ATTR            (H5OPEN H5E_ATTR_g)
+#define H5E_IO              (H5OPEN H5E_IO_g)
+#define H5E_ARGS            (H5OPEN H5E_ARGS_g)
+#define H5E_DATASPACE       (H5OPEN H5E_DATASPACE_g)
+#define H5E_PLINE           (H5OPEN H5E_PLINE_g)
+#define H5E_HEAP            (H5OPEN H5E_HEAP_g)
+H5_DLLVAR hid_t H5E_BTREE_g;        /* B-Tree node */
+H5_DLLVAR hid_t H5E_EFL_g;          /* External file list */
+H5_DLLVAR hid_t H5E_REFERENCE_g;    /* References */
+H5_DLLVAR hid_t H5E_FPHDF5_g;       /* Flexible Parallel HDF5 */
+H5_DLLVAR hid_t H5E_INTERNAL_g;     /* Internal error (too specific to document in detail) */
+H5_DLLVAR hid_t H5E_ERROR_g;        /* Error API */
+H5_DLLVAR hid_t H5E_DATASET_g;      /* Dataset */
+H5_DLLVAR hid_t H5E_ATOM_g;         /* Object atom */
+H5_DLLVAR hid_t H5E_TBBT_g;         /* Threaded, Balanced, Binary Trees */
+H5_DLLVAR hid_t H5E_OHDR_g;         /* Object header */
+H5_DLLVAR hid_t H5E_STORAGE_g;      /* Data storage */
+H5_DLLVAR hid_t H5E_FILE_g;         /* File accessability */
+H5_DLLVAR hid_t H5E_RS_g;           /* Reference Counted Strings */
+H5_DLLVAR hid_t H5E_DATATYPE_g;     /* Datatype */
+H5_DLLVAR hid_t H5E_TST_g;          /* Ternary Search Trees */
+H5_DLLVAR hid_t H5E_RESOURCE_g;     /* Resource unavailable */
+H5_DLLVAR hid_t H5E_CACHE_g;        /* Object cache */
+H5_DLLVAR hid_t H5E_SYM_g;          /* Symbol table */
+H5_DLLVAR hid_t H5E_FUNC_g;         /* Function entry/exit */
+H5_DLLVAR hid_t H5E_VFL_g;          /* Virtual File Layer */
+H5_DLLVAR hid_t H5E_PLIST_g;        /* Property lists */
+H5_DLLVAR hid_t H5E_ATTR_g;         /* Attribute */
+H5_DLLVAR hid_t H5E_IO_g;           /* Low-level I/O */
+H5_DLLVAR hid_t H5E_ARGS_g;         /* Invalid arguments to routine */
+H5_DLLVAR hid_t H5E_DATASPACE_g;    /* Dataspace */
+H5_DLLVAR hid_t H5E_PLINE_g;        /* Data filters */
+H5_DLLVAR hid_t H5E_HEAP_g;         /* Heap */
+
+/*********************/
+/* Minor error codes */
+/*********************/
+
+/* Property list errors */
+#define H5E_CANTGET         (H5OPEN H5E_CANTGET_g)
+#define H5E_CANTSET         (H5OPEN H5E_CANTSET_g)
+#define H5E_DUPCLASS        (H5OPEN H5E_DUPCLASS_g)
+H5_DLLVAR hid_t H5E_CANTGET_g;      /* Can't get value */
+H5_DLLVAR hid_t H5E_CANTSET_g;      /* Can't set value */
+H5_DLLVAR hid_t H5E_DUPCLASS_g;     /* Duplicate class name in parent class */
+
+/* Dataspace errors */
+#define H5E_CANTCLIP        (H5OPEN H5E_CANTCLIP_g)
+#define H5E_CANTCOUNT       (H5OPEN H5E_CANTCOUNT_g)
+#define H5E_CANTSELECT      (H5OPEN H5E_CANTSELECT_g)
+#define H5E_CANTNEXT        (H5OPEN H5E_CANTNEXT_g)
+#define H5E_BADSELECT       (H5OPEN H5E_BADSELECT_g)
+#define H5E_CANTCOMPARE     (H5OPEN H5E_CANTCOMPARE_g)
+H5_DLLVAR hid_t H5E_CANTCLIP_g;     /* Can't clip hyperslab region */
+H5_DLLVAR hid_t H5E_CANTCOUNT_g;    /* Can't count elements */
+H5_DLLVAR hid_t H5E_CANTSELECT_g;   /* Can't select hyperslab */
+H5_DLLVAR hid_t H5E_CANTNEXT_g;     /* Can't move to next iterator location */
+H5_DLLVAR hid_t H5E_BADSELECT_g;    /* Invalid selection */
+H5_DLLVAR hid_t H5E_CANTCOMPARE_g;  /* Can't compare objects */
+
+/* Object atom related errors */
+#define H5E_BADATOM         (H5OPEN H5E_BADATOM_g)
+#define H5E_BADGROUP        (H5OPEN H5E_BADGROUP_g)
+#define H5E_CANTREGISTER    (H5OPEN H5E_CANTREGISTER_g)
+#define H5E_CANTINC         (H5OPEN H5E_CANTINC_g)
+#define H5E_CANTDEC         (H5OPEN H5E_CANTDEC_g)
+#define H5E_NOIDS           (H5OPEN H5E_NOIDS_g)
+H5_DLLVAR hid_t H5E_BADATOM_g;      /* Unable to find atom information (already closed?) */
+H5_DLLVAR hid_t H5E_BADGROUP_g;     /* Unable to find ID group information */
+H5_DLLVAR hid_t H5E_CANTREGISTER_g; /* Unable to register new atom */
+H5_DLLVAR hid_t H5E_CANTINC_g;      /* Unable to increment reference count */
+H5_DLLVAR hid_t H5E_CANTDEC_g;      /* Unable to decrement reference count */
+H5_DLLVAR hid_t H5E_NOIDS_g;        /* Out of IDs for group */
+
+/* Argument errors */
+#define H5E_UNINITIALIZED   (H5OPEN H5E_UNINITIALIZED_g)
+#define H5E_UNSUPPORTED     (H5OPEN H5E_UNSUPPORTED_g)
+#define H5E_BADTYPE         (H5OPEN H5E_BADTYPE_g)
+#define H5E_BADRANGE        (H5OPEN H5E_BADRANGE_g)
+#define H5E_BADVALUE        (H5OPEN H5E_BADVALUE_g)
+H5_DLLVAR hid_t H5E_UNINITIALIZED_g;/* Information is uinitialized */
+H5_DLLVAR hid_t H5E_UNSUPPORTED_g;  /* Feature is unsupported */
+H5_DLLVAR hid_t H5E_BADTYPE_g;      /* Inappropriate type */
+H5_DLLVAR hid_t H5E_BADRANGE_g;     /* Out of range */
+H5_DLLVAR hid_t H5E_BADVALUE_g;     /* Bad value */
+
+/* FPHDF5 errors */
+#define H5E_CANTMAKETREE    (H5OPEN H5E_CANTMAKETREE_g)
+#define H5E_CANTRECV        (H5OPEN H5E_CANTRECV_g)
+#define H5E_CANTSENDMDATA   (H5OPEN H5E_CANTSENDMDATA_g)
+#define H5E_CANTCHANGE      (H5OPEN H5E_CANTCHANGE_g)
+#define H5E_CANTALLOC       (H5OPEN H5E_CANTALLOC_g)
+H5_DLLVAR hid_t H5E_CANTMAKETREE_g; /* Can't create a binary tree node */
+H5_DLLVAR hid_t H5E_CANTRECV_g;     /* Can't receive messages from processes */
+H5_DLLVAR hid_t H5E_CANTSENDMDATA_g;/* Can't send metadata message */
+H5_DLLVAR hid_t H5E_CANTCHANGE_g;   /* Can't register change with server */
+H5_DLLVAR hid_t H5E_CANTALLOC_g;    /* Can't allocate from file */
+
+/* I/O pipeline errors */
+#define H5E_NOFILTER        (H5OPEN H5E_NOFILTER_g)
+#define H5E_CALLBACK        (H5OPEN H5E_CALLBACK_g)
+#define H5E_CANAPPLY        (H5OPEN H5E_CANAPPLY_g)
+#define H5E_SETLOCAL        (H5OPEN H5E_SETLOCAL_g)
+H5_DLLVAR hid_t H5E_NOFILTER_g;     /* Requested filter is not available */
+H5_DLLVAR hid_t H5E_CALLBACK_g;     /* Callback failed */
+H5_DLLVAR hid_t H5E_CANAPPLY_g;     /* Error from filter 'can apply' callback */
+H5_DLLVAR hid_t H5E_SETLOCAL_g;     /* Error from filter 'set local' callback */
+
+/* Datatype conversion errors */
+#define H5E_CANTCONVERT     (H5OPEN H5E_CANTCONVERT_g)
+#define H5E_BADSIZE         (H5OPEN H5E_BADSIZE_g)
+H5_DLLVAR hid_t H5E_CANTCONVERT_g;  /* Can't convert datatypes */
+H5_DLLVAR hid_t H5E_BADSIZE_g;      /* Bad size for object */
+
+/* Parallel MPI errors */
+#define H5E_MPI             (H5OPEN H5E_MPI_g)
+#define H5E_MPIERRSTR       (H5OPEN H5E_MPIERRSTR_g)
+H5_DLLVAR hid_t H5E_MPI_g;          /* Some MPI function failed */
+H5_DLLVAR hid_t H5E_MPIERRSTR_g;    /* MPI Error String */
+
+/* Object header related errors */
+#define H5E_LINKCOUNT       (H5OPEN H5E_LINKCOUNT_g)
+#define H5E_VERSION         (H5OPEN H5E_VERSION_g)
+#define H5E_ALIGNMENT       (H5OPEN H5E_ALIGNMENT_g)
+#define H5E_BADMESG         (H5OPEN H5E_BADMESG_g)
+#define H5E_CANTDELETE      (H5OPEN H5E_CANTDELETE_g)
+H5_DLLVAR hid_t H5E_LINKCOUNT_g;    /* Bad object header link count */
+H5_DLLVAR hid_t H5E_VERSION_g;      /* Wrong version number */
+H5_DLLVAR hid_t H5E_ALIGNMENT_g;    /* Alignment error */
+H5_DLLVAR hid_t H5E_BADMESG_g;      /* Unrecognized message */
+H5_DLLVAR hid_t H5E_CANTDELETE_g;   /* Can't delete message */
+
+/* Resource errors */
+#define H5E_NOSPACE         (H5OPEN H5E_NOSPACE_g)
+#define H5E_CANTCOPY        (H5OPEN H5E_CANTCOPY_g)
+#define H5E_CANTFREE        (H5OPEN H5E_CANTFREE_g)
+#define H5E_ALREADYEXISTS   (H5OPEN H5E_ALREADYEXISTS_g)
+#define H5E_CANTLOCK        (H5OPEN H5E_CANTLOCK_g)
+#define H5E_CANTUNLOCK      (H5OPEN H5E_CANTUNLOCK_g)
+#define H5E_CANTGC          (H5OPEN H5E_CANTGC_g)
+H5_DLLVAR hid_t H5E_NOSPACE_g;      /* No space available for allocation */
+H5_DLLVAR hid_t H5E_CANTCOPY_g;     /* Unable to copy object */
+H5_DLLVAR hid_t H5E_CANTFREE_g;     /* Unable to free object */
+H5_DLLVAR hid_t H5E_ALREADYEXISTS_g;/* Object already exists */
+H5_DLLVAR hid_t H5E_CANTLOCK_g;     /* Unable to lock object */
+H5_DLLVAR hid_t H5E_CANTUNLOCK_g;   /* Unable to unlock object */
+H5_DLLVAR hid_t H5E_CANTGC_g;       /* Unable to garbage collect */
+
+/* Generic low-level file I/O errors */
+#define H5E_SEEKERROR       (H5OPEN H5E_SEEKERROR_g)
+#define H5E_READERROR       (H5OPEN H5E_READERROR_g)
+#define H5E_WRITEERROR      (H5OPEN H5E_WRITEERROR_g)
+#define H5E_CLOSEERROR      (H5OPEN H5E_CLOSEERROR_g)
+#define H5E_OVERFLOW        (H5OPEN H5E_OVERFLOW_g)
+#define H5E_FCNTL           (H5OPEN H5E_FCNTL_g)
+H5_DLLVAR hid_t H5E_SEEKERROR_g;    /* Seek failed */
+H5_DLLVAR hid_t H5E_READERROR_g;    /* Read failed */
+H5_DLLVAR hid_t H5E_WRITEERROR_g;   /* Write failed */
+H5_DLLVAR hid_t H5E_CLOSEERROR_g;   /* Close failed */
+H5_DLLVAR hid_t H5E_OVERFLOW_g;     /* Address overflowed */
+H5_DLLVAR hid_t H5E_FCNTL_g;        /* File control (fcntl) failed */
+
+/* B-tree related errors */
+#define H5E_NOTFOUND        (H5OPEN H5E_NOTFOUND_g)
+#define H5E_EXISTS          (H5OPEN H5E_EXISTS_g)
+#define H5E_CANTENCODE      (H5OPEN H5E_CANTENCODE_g)
+#define H5E_CANTDECODE      (H5OPEN H5E_CANTDECODE_g)
+#define H5E_CANTSPLIT       (H5OPEN H5E_CANTSPLIT_g)
+#define H5E_CANTINSERT      (H5OPEN H5E_CANTINSERT_g)
+#define H5E_CANTLIST        (H5OPEN H5E_CANTLIST_g)
+H5_DLLVAR hid_t H5E_NOTFOUND_g;     /* Object not found */
+H5_DLLVAR hid_t H5E_EXISTS_g;       /* Object already exists */
+H5_DLLVAR hid_t H5E_CANTENCODE_g;   /* Unable to encode value */
+H5_DLLVAR hid_t H5E_CANTDECODE_g;   /* Unable to decode value */
+H5_DLLVAR hid_t H5E_CANTSPLIT_g;    /* Unable to split node */
+H5_DLLVAR hid_t H5E_CANTINSERT_g;   /* Unable to insert object */
+H5_DLLVAR hid_t H5E_CANTLIST_g;     /* Unable to list node */
+
+/* File accessability errors */
+#define H5E_FILEEXISTS      (H5OPEN H5E_FILEEXISTS_g)
+#define H5E_FILEOPEN        (H5OPEN H5E_FILEOPEN_g)
+#define H5E_CANTCREATE      (H5OPEN H5E_CANTCREATE_g)
+#define H5E_CANTOPENFILE    (H5OPEN H5E_CANTOPENFILE_g)
+#define H5E_CANTCLOSEFILE   (H5OPEN H5E_CANTCLOSEFILE_g)
+#define H5E_NOTHDF5         (H5OPEN H5E_NOTHDF5_g)
+#define H5E_BADFILE         (H5OPEN H5E_BADFILE_g)
+#define H5E_TRUNCATED       (H5OPEN H5E_TRUNCATED_g)
+#define H5E_MOUNT           (H5OPEN H5E_MOUNT_g)
+H5_DLLVAR hid_t H5E_FILEEXISTS_g;   /* File already exists */
+H5_DLLVAR hid_t H5E_FILEOPEN_g;     /* File already open */
+H5_DLLVAR hid_t H5E_CANTCREATE_g;   /* Unable to create file */
+H5_DLLVAR hid_t H5E_CANTOPENFILE_g; /* Unable to open file */
+H5_DLLVAR hid_t H5E_CANTCLOSEFILE_g;/* Unable to close file */
+H5_DLLVAR hid_t H5E_NOTHDF5_g;      /* Not an HDF5 file */
+H5_DLLVAR hid_t H5E_BADFILE_g;      /* Bad file ID accessed */
+H5_DLLVAR hid_t H5E_TRUNCATED_g;    /* File has been truncated */
+H5_DLLVAR hid_t H5E_MOUNT_g;        /* File mount error */
+
+/* Cache related errors */
+#define H5E_CANTFLUSH       (H5OPEN H5E_CANTFLUSH_g)
+#define H5E_CANTLOAD        (H5OPEN H5E_CANTLOAD_g)
+#define H5E_PROTECT         (H5OPEN H5E_PROTECT_g)
+#define H5E_NOTCACHED       (H5OPEN H5E_NOTCACHED_g)
+H5_DLLVAR hid_t H5E_CANTFLUSH_g;    /* Unable to flush data from cache */
+H5_DLLVAR hid_t H5E_CANTLOAD_g;     /* Unable to load metadata into cache */
+H5_DLLVAR hid_t H5E_PROTECT_g;      /* Protected metadata error */
+H5_DLLVAR hid_t H5E_NOTCACHED_g;    /* Metadata not currently cached */
+
+/* Group related errors */
+#define H5E_CANTOPENOBJ     (H5OPEN H5E_CANTOPENOBJ_g)
+#define H5E_COMPLEN         (H5OPEN H5E_COMPLEN_g)
+#define H5E_CWG             (H5OPEN H5E_CWG_g)
+#define H5E_LINK            (H5OPEN H5E_LINK_g)
+#define H5E_SLINK           (H5OPEN H5E_SLINK_g)
+H5_DLLVAR hid_t H5E_CANTOPENOBJ_g;  /* Can't open object */
+H5_DLLVAR hid_t H5E_COMPLEN_g;      /* Name component is too long */
+H5_DLLVAR hid_t H5E_CWG_g;          /* Problem with current working group */
+H5_DLLVAR hid_t H5E_LINK_g;         /* Link count failure */
+H5_DLLVAR hid_t H5E_SLINK_g;        /* Symbolic link error */
+
+/* Function entry/exit interface errors */
+#define H5E_CANTINIT        (H5OPEN H5E_CANTINIT_g)
+#define H5E_ALREADYINIT     (H5OPEN H5E_ALREADYINIT_g)
+#define H5E_CANTRELEASE     (H5OPEN H5E_CANTRELEASE_g)
+H5_DLLVAR hid_t H5E_CANTINIT_g;     /* Unable to initialize object */
+H5_DLLVAR hid_t H5E_ALREADYINIT_g;  /* Object already initialized */
+H5_DLLVAR hid_t H5E_CANTRELEASE_g;  /* Unable to release object */
+
+#endif /* H5Epubgen_H */
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 00ed240..36a8e57 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -59,269 +59,8 @@ typedef struct H5E_error_t {
 #define H5E_ERR_CLS		(H5OPEN H5E_ERR_CLS_g)
 H5_DLLVAR hid_t H5E_ERR_CLS_g;
 
-/* HDF5 error class: major errors. */
-#define H5E_ARGS                            (H5OPEN H5E_ARGS_g)
-#define H5E_RESOURCE                        (H5OPEN H5E_RESOURCE_g)
-#define H5E_INTERNAL                        (H5OPEN H5E_INTERNAL_g)
-#define H5E_FILE                            (H5OPEN H5E_FILE_g)
-#define H5E_IO                              (H5OPEN H5E_IO_g)
-#define H5E_FUNC                            (H5OPEN H5E_FUNC_g)
-#define H5E_ATOM                            (H5OPEN H5E_ATOM_g)
-#define H5E_CACHE                           (H5OPEN H5E_CACHE_g)
-#define H5E_BTREE                           (H5OPEN H5E_BTREE_g)
-#define H5E_SYM                             (H5OPEN H5E_SYM_g)
-#define H5E_HEAP                            (H5OPEN H5E_HEAP_g)
-#define H5E_OHDR                            (H5OPEN H5E_OHDR_g)
-#define H5E_DATATYPE                        (H5OPEN H5E_DATATYPE_g)
-#define H5E_DATASPACE                       (H5OPEN H5E_DATASPACE_g)
-#define H5E_DATASET                         (H5OPEN H5E_DATASET_g)
-#define H5E_STORAGE                         (H5OPEN H5E_STORAGE_g)
-#define H5E_PLIST                           (H5OPEN H5E_PLIST_g)
-#define H5E_ATTR                            (H5OPEN H5E_ATTR_g)
-#define H5E_PLINE                           (H5OPEN H5E_PLINE_g)
-#define H5E_EFL                             (H5OPEN H5E_EFL_g)
-#define H5E_REFERENCE                       (H5OPEN H5E_REFERENCE_g)
-#define H5E_VFL                             (H5OPEN H5E_VFL_g)
-#define H5E_TBBT                            (H5OPEN H5E_TBBT_g)
-#define H5E_FPHDF5                          (H5OPEN H5E_FPHDF5_g)
-#define H5E_TST                             (H5OPEN H5E_TST_g)
-#define H5E_RS                              (H5OPEN H5E_RS_g)
-#define H5E_ERROR                           (H5OPEN H5E_ERROR_g)
-
-H5_DLLVAR hid_t    H5E_ARGS_g;                      /*invalid arguments to routine               */
-H5_DLLVAR hid_t    H5E_RESOURCE_g;                  /*resource unavailable                       */
-H5_DLLVAR hid_t    H5E_INTERNAL_g;                  /*Internal error (too specific to document in detail) */
-H5_DLLVAR hid_t    H5E_FILE_g;                      /*file Accessability                         */
-H5_DLLVAR hid_t    H5E_IO_g;                        /*Low-level I/O                              */
-H5_DLLVAR hid_t    H5E_FUNC_g;                      /*function Entry/Exit                        */
-H5_DLLVAR hid_t    H5E_ATOM_g;                      /*object Atom                                */
-H5_DLLVAR hid_t    H5E_CACHE_g;                     /*object Cache                               */
-H5_DLLVAR hid_t    H5E_BTREE_g;                     /*B-Tree Node                                */
-H5_DLLVAR hid_t    H5E_SYM_g;                       /*symbol Table                               */
-H5_DLLVAR hid_t    H5E_HEAP_g;                      /*Heap                                       */
-H5_DLLVAR hid_t    H5E_OHDR_g;                      /*object Header                              */
-H5_DLLVAR hid_t    H5E_DATATYPE_g;                  /*Datatype                                   */
-H5_DLLVAR hid_t    H5E_DATASPACE_g;                 /*Dataspace                                  */
-H5_DLLVAR hid_t    H5E_DATASET_g;                   /*Dataset                                    */
-H5_DLLVAR hid_t    H5E_STORAGE_g;                   /*data storage                               */
-H5_DLLVAR hid_t    H5E_PLIST_g;                     /*Property lists                             */
-H5_DLLVAR hid_t    H5E_ATTR_g;                      /*Attribute                                  */
-H5_DLLVAR hid_t    H5E_PLINE_g;                     /*Data filters                               */
-H5_DLLVAR hid_t    H5E_EFL_g;                       /*External file list                         */
-H5_DLLVAR hid_t    H5E_REFERENCE_g;                 /*References                                 */
-H5_DLLVAR hid_t    H5E_VFL_g;		        /*Virtual File Layer			     */
-H5_DLLVAR hid_t    H5E_TBBT_g; 		        /*Threaded, Balanced, Binary Trees           */
-H5_DLLVAR hid_t    H5E_FPHDF5_g;		        /*Flexible Parallel HDF5                     */
-H5_DLLVAR hid_t    H5E_TST_g; 		        /*Ternary Search Trees                       */
-H5_DLLVAR hid_t    H5E_RS_g;  		        /*Reference Counted Strings                  */
-H5_DLLVAR hid_t    H5E_ERROR_g;  		        /*Error API				     */
-
-/* HDF5 error class: minor errors. */
-         /* Argument errors */
-#define H5E_UNINITIALIZED                   (H5OPEN H5E_UNINITIALIZED_g)
-#define H5E_UNSUPPORTED                     (H5OPEN H5E_UNSUPPORTED_g)
-#define H5E_BADTYPE                         (H5OPEN H5E_BADTYPE_g)
-#define H5E_BADRANGE                        (H5OPEN H5E_BADRANGE_g)
-#define H5E_BADVALUE                        (H5OPEN H5E_BADVALUE_g)
-
-H5_DLLVAR hid_t    H5E_UNINITIALIZED_g;             /*information is unitialized                 */
-H5_DLLVAR hid_t    H5E_UNSUPPORTED_g;               /*feature is unsupported                     */
-H5_DLLVAR hid_t    H5E_BADTYPE_g;                   /*incorrect type found                       */
-H5_DLLVAR hid_t    H5E_BADRANGE_g;                  /*argument out of range                      */
-H5_DLLVAR hid_t    H5E_BADVALUE_g;                  /*bad value for argument                     */
-
-         /* Resource errors */
-#define H5E_NOSPACE                         (H5OPEN H5E_NOSPACE_g)
-#define H5E_CANTCOPY                        (H5OPEN H5E_CANTCOPY_g)
-#define H5E_CANTFREE                        (H5OPEN H5E_CANTFREE_g)
-#define H5E_ALREADYEXISTS                   (H5OPEN H5E_ALREADYEXISTS_g)
-#define H5E_CANTLOCK                        (H5OPEN H5E_CANTLOCK_g)
-#define H5E_CANTUNLOCK                      (H5OPEN H5E_CANTUNLOCK_g)
-#define H5E_CANTGC                          (H5OPEN H5E_CANTGC_g)
-
-H5_DLLVAR hid_t    H5E_NOSPACE_g;                   /*no space available for allocation          */
-H5_DLLVAR hid_t    H5E_CANTCOPY_g;                  /*unable to copy object                      */
-H5_DLLVAR hid_t    H5E_CANTFREE_g;                  /*unable to free object                      */
-H5_DLLVAR hid_t    H5E_ALREADYEXISTS_g;             /*Object already exists                      */
-H5_DLLVAR hid_t    H5E_CANTLOCK_g;                  /*Unable to lock object                      */
-H5_DLLVAR hid_t    H5E_CANTUNLOCK_g;                /*Unable to unlock object                    */
-H5_DLLVAR hid_t    H5E_CANTGC_g;		        /*Unable to garbage collect                  */
-
-    /* File accessability errors */
-#define H5E_FILEEXISTS                      (H5OPEN H5E_FILEEXISTS_g)
-#define H5E_FILEOPEN                        (H5OPEN H5E_FILEOPEN_g)
-#define H5E_CANTCREATE                      (H5OPEN H5E_CANTCREATE_g)
-#define H5E_CANTOPENFILE                    (H5OPEN H5E_CANTOPENFILE_g)
-#define H5E_CANTCLOSEFILE                   (H5OPEN H5E_CANTCLOSEFILE_g)
-#define H5E_NOTHDF5                         (H5OPEN H5E_NOTHDF5_g)
-#define H5E_BADFILE                         (H5OPEN H5E_BADFILE_g)
-#define H5E_TRUNCATED                       (H5OPEN H5E_TRUNCATED_g)
-#define H5E_MOUNT                           (H5OPEN H5E_MOUNT_g)
-
-H5_DLLVAR hid_t    H5E_FILEEXISTS_g;                /*file already exists                        */
-H5_DLLVAR hid_t    H5E_FILEOPEN_g;                  /*file already open                          */
-H5_DLLVAR hid_t    H5E_CANTCREATE_g;                /*Can't create file                          */
-H5_DLLVAR hid_t    H5E_CANTOPENFILE_g;              /*Can't open file                            */
-H5_DLLVAR hid_t    H5E_CANTCLOSEFILE_g;             /*Can't close file			     */
-H5_DLLVAR hid_t    H5E_NOTHDF5_g;                   /*not an HDF5 format file                    */
-H5_DLLVAR hid_t    H5E_BADFILE_g;                   /*bad file ID accessed                       */
-H5_DLLVAR hid_t    H5E_TRUNCATED_g;                 /*file has been truncated                    */
-H5_DLLVAR hid_t    H5E_MOUNT_g;			/*file mount error			     */
-
-    /* Generic low-level file I/O errors */
-#define H5E_SEEKERROR                       (H5OPEN H5E_SEEKERROR_g)
-#define H5E_READERROR                       (H5OPEN H5E_READERROR_g)
-#define H5E_WRITEERROR                      (H5OPEN H5E_WRITEERROR_g)
-#define H5E_CLOSEERROR                      (H5OPEN H5E_CLOSEERROR_g)
-#define H5E_OVERFLOW                        (H5OPEN H5E_OVERFLOW_g)
-#define H5E_FCNTL                           (H5OPEN H5E_FCNTL_g)
-
-H5_DLLVAR hid_t    H5E_SEEKERROR_g;                 /*seek failed                                */
-H5_DLLVAR hid_t    H5E_READERROR_g;                 /*read failed                                */
-H5_DLLVAR hid_t    H5E_WRITEERROR_g;                /*write failed                               */
-H5_DLLVAR hid_t    H5E_CLOSEERROR_g;                /*close failed                               */
-H5_DLLVAR hid_t    H5E_OVERFLOW_g;		        /*address overflowed			     */
-H5_DLLVAR hid_t    H5E_FCNTL_g;                     /*file fcntl failed                          */
-
-    /* Function entry/exit interface errors */
-#define H5E_CANTINIT                        (H5OPEN H5E_CANTINIT_g)
-#define H5E_ALREADYINIT                     (H5OPEN H5E_ALREADYINIT_g)
-#define H5E_CANTRELEASE                     (H5OPEN H5E_CANTRELEASE_g)
-
-H5_DLLVAR hid_t    H5E_CANTINIT_g;                  /*Can't initialize object                    */
-H5_DLLVAR hid_t    H5E_ALREADYINIT_g;               /*object already initialized                 */
-H5_DLLVAR hid_t    H5E_CANTRELEASE_g;               /*Can't release object                       */
-
-    /* Object atom related errors */
-#define H5E_BADATOM                         (H5OPEN H5E_BADATOM_g)
-#define H5E_BADGROUP                        (H5OPEN H5E_BADGROUP_g)
-#define H5E_CANTREGISTER                    (H5OPEN H5E_CANTREGISTER_g)
-#define H5E_CANTINC                         (H5OPEN H5E_CANTINC_g)
-#define H5E_CANTDEC                         (H5OPEN H5E_CANTDEC_g)
-#define H5E_NOIDS                           (H5OPEN H5E_NOIDS_g)
-
-H5_DLLVAR hid_t    H5E_BADATOM_g;                   /*Can't find atom information                */
-H5_DLLVAR hid_t    H5E_BADGROUP_g;                  /*Can't find group information               */
-H5_DLLVAR hid_t    H5E_CANTREGISTER_g;              /*Can't register new atom                    */
-H5_DLLVAR hid_t    H5E_CANTINC_g;                   /*Can't increment reference count            */
-H5_DLLVAR hid_t    H5E_CANTDEC_g;                   /*Can't decrement reference count            */
-H5_DLLVAR hid_t    H5E_NOIDS_g;                     /*Out of IDs for group                       */
-
-    /* Cache related errors */
-#define H5E_CANTFLUSH                       (H5OPEN H5E_CANTFLUSH_g)
-#define H5E_CANTLOAD                        (H5OPEN H5E_CANTLOAD_g)
-#define H5E_PROTECT                         (H5OPEN H5E_PROTECT_g)
-#define H5E_NOTCACHED                       (H5OPEN H5E_NOTCACHED_g)
-
-H5_DLLVAR hid_t    H5E_CANTFLUSH_g;                 /*Can't flush object from cache              */
-H5_DLLVAR hid_t    H5E_CANTLOAD_g;                  /*Can't load object into cache               */
-H5_DLLVAR hid_t    H5E_PROTECT_g;                   /*protected object error                     */
-H5_DLLVAR hid_t    H5E_NOTCACHED_g;                 /*object not currently cached                */
-
-    /* B-tree related errors */
-#define H5E_NOTFOUND                        (H5OPEN H5E_NOTFOUND_g)
-#define H5E_EXISTS                          (H5OPEN H5E_EXISTS_g)
-#define H5E_CANTENCODE                      (H5OPEN H5E_CANTENCODE_g)
-#define H5E_CANTDECODE                      (H5OPEN H5E_CANTDECODE_g)
-#define H5E_CANTSPLIT                       (H5OPEN H5E_CANTSPLIT_g)
-#define H5E_CANTINSERT                      (H5OPEN H5E_CANTINSERT_g)
-#define H5E_CANTLIST                        (H5OPEN H5E_CANTLIST_g)
-
-H5_DLLVAR hid_t    H5E_NOTFOUND_g;                  /*object not found                           */
-H5_DLLVAR hid_t    H5E_EXISTS_g;                    /*object already exists                      */
-H5_DLLVAR hid_t    H5E_CANTENCODE_g;                /*Can't encode value                         */
-H5_DLLVAR hid_t    H5E_CANTDECODE_g;                /*Can't decode value                         */
-H5_DLLVAR hid_t    H5E_CANTSPLIT_g;                 /*Can't split node                           */
-H5_DLLVAR hid_t    H5E_CANTINSERT_g;                /*Can't insert object                        */
-H5_DLLVAR hid_t    H5E_CANTLIST_g;                  /*Can't list node                            */
-
-    /* Object header related errors */
-#define H5E_LINKCOUNT                       (H5OPEN H5E_LINKCOUNT_g)
-#define H5E_VERSION                         (H5OPEN H5E_VERSION_g)
-#define H5E_ALIGNMENT                       (H5OPEN H5E_ALIGNMENT_g)
-#define H5E_BADMESG                         (H5OPEN H5E_BADMESG_g)
-#define H5E_CANTDELETE                      (H5OPEN H5E_CANTDELETE_g)
-
-H5_DLLVAR hid_t    H5E_LINKCOUNT_g;                 /*bad object header link count               */
-H5_DLLVAR hid_t    H5E_VERSION_g;                   /*wrong version number                       */
-H5_DLLVAR hid_t    H5E_ALIGNMENT_g;                 /*alignment error                            */
-H5_DLLVAR hid_t    H5E_BADMESG_g;                   /*unrecognized message                       */
-H5_DLLVAR hid_t    H5E_CANTDELETE_g;                /* Can't delete message                      */
-
-    /* Group related errors */
-#define H5E_CANTOPENOBJ                     (H5OPEN H5E_CANTOPENOBJ_g)
-#define H5E_COMPLEN                         (H5OPEN H5E_COMPLEN_g)
-#define H5E_CWG                             (H5OPEN H5E_CWG_g)
-#define H5E_LINK                            (H5OPEN H5E_LINK_g)
-#define H5E_SLINK                           (H5OPEN H5E_SLINK_g)
-
-H5_DLLVAR hid_t    H5E_CANTOPENOBJ_g;               /*Can't open object                          */
-H5_DLLVAR hid_t    H5E_COMPLEN_g;                   /*name component is too long                 */
-H5_DLLVAR hid_t    H5E_CWG_g;                       /*problem with current working group         */
-H5_DLLVAR hid_t    H5E_LINK_g;                      /*link count failure                         */
-H5_DLLVAR hid_t    H5E_SLINK_g;			/*symbolic link error			     */
-
-    /* Datatype conversion errors */
-#define H5E_CANTCONVERT                     (H5OPEN H5E_CANTCONVERT_g)
-#define H5E_BADSIZE                         (H5OPEN H5E_BADSIZE_g)
-
-H5_DLLVAR hid_t    H5E_CANTCONVERT_g;               /*Can't convert datatypes                    */
-H5_DLLVAR hid_t    H5E_BADSIZE_g;                   /*Bad size for object                        */
-
-    /* Dataspace errors */
-#define H5E_CANTCLIP                        (H5OPEN H5E_CANTCLIP_g)
-#define H5E_CANTCOUNT                       (H5OPEN H5E_CANTCOUNT_g)
-#define H5E_CANTSELECT                      (H5OPEN H5E_CANTSELECT_g)
-#define H5E_CANTNEXT                        (H5OPEN H5E_CANTNEXT_g)
-#define H5E_BADSELECT                       (H5OPEN H5E_BADSELECT_g)
-#define H5E_CANTCOMPARE                     (H5OPEN H5E_CANTCOMPARE_g)
-
-H5_DLLVAR hid_t    H5E_CANTCLIP_g;                  /*Can't clip hyperslab region                */
-H5_DLLVAR hid_t    H5E_CANTCOUNT_g;                 /*Can't count elements                       */
-H5_DLLVAR hid_t    H5E_CANTSELECT_g;                /*Can't select hyperslab                     */
-H5_DLLVAR hid_t    H5E_CANTNEXT_g;                  /*Can't move to next iterator location       */
-H5_DLLVAR hid_t    H5E_BADSELECT_g;                 /*Invalid selection                          */
-H5_DLLVAR hid_t    H5E_CANTCOMPARE_g;               /*Can't compare objects                      */
-
-    /* Property list errors */
-#define H5E_CANTGET                         (H5OPEN H5E_CANTGET_g)
-#define H5E_CANTSET                         (H5OPEN H5E_CANTSET_g)
-#define H5E_DUPCLASS                        (H5OPEN H5E_DUPCLASS_g)
-
-H5_DLLVAR hid_t    H5E_CANTGET_g;                   /*Can't get value                            */
-H5_DLLVAR hid_t    H5E_CANTSET_g;                   /*Can't set value                            */
-H5_DLLVAR hid_t    H5E_DUPCLASS_g;                  /*Duplicate class name in parent class */
-
-    /* Parallel errors */
-#define H5E_MPI                             (H5OPEN H5E_MPI_g)
-#define H5E_MPIERRSTR                       (H5OPEN H5E_MPIERRSTR_g)
-
-H5_DLLVAR hid_t    H5E_MPI_g;			/*some MPI function failed		     */
-H5_DLLVAR hid_t    H5E_MPIERRSTR_g;		        /*MPI Error String 			     */
-
-    /* FPHDF5 errors */
-#define H5E_CANTMAKETREE                    (H5OPEN H5E_CANTMAKETREE_g)
-#define H5E_CANTRECV                        (H5OPEN H5E_CANTRECV_g)
-#define H5E_CANTSENDMDATA                   (H5OPEN H5E_CANTSENDMDATA_g)
-#define H5E_CANTCHANGE                      (H5OPEN H5E_CANTCHANGE_g)
-#define H5E_CANTALLOC                       (H5OPEN H5E_CANTALLOC_g)
-
-H5_DLLVAR hid_t    H5E_CANTMAKETREE_g;              /*can't make a TBBT tree                     */
-H5_DLLVAR hid_t    H5E_CANTRECV_g;                  /*can't receive messages from processes      */
-H5_DLLVAR hid_t    H5E_CANTSENDMDATA_g;             /*can't send metadata message                */
-H5_DLLVAR hid_t    H5E_CANTCHANGE_g;                /*can't register change on server            */
-H5_DLLVAR hid_t    H5E_CANTALLOC_g;                 /*can't allocate from file                   */
-
-    /* I/O pipeline errors */
-#define H5E_NOFILTER                        (H5OPEN H5E_NOFILTER_g)
-#define H5E_CALLBACK                        (H5OPEN H5E_CALLBACK_g)
-#define H5E_CANAPPLY                        (H5OPEN H5E_CANAPPLY_g)
-#define H5E_SETLOCAL                        (H5OPEN H5E_SETLOCAL_g)
-
-H5_DLLVAR hid_t    H5E_NOFILTER_g;                  /*requested filter is not available          */
-H5_DLLVAR hid_t    H5E_CALLBACK_g;                  /*callback failed                            */
-H5_DLLVAR hid_t    H5E_CANAPPLY_g;                  /*error from filter "can apply" callback     */
-H5_DLLVAR hid_t    H5E_SETLOCAL_g;                  /*error from filter "set local" callback     */
+/* Include the automatically generated public header information */
+#include "H5Epubgen.h"
 
 /*
  * One often needs to temporarily disable automatic error reporting when
diff --git a/src/H5Eterm.h b/src/H5Eterm.h
new file mode 100644
index 0000000..78749e1
--- /dev/null
+++ b/src/H5Eterm.h
@@ -0,0 +1,166 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Generated automatically by bin/make_err -- do not edit */
+/* Add new errors to H5err.txt file */
+
+
+#ifndef _H5Eterm_H
+#define _H5Eterm_H
+
+/* Reset major error IDs */
+    
+H5E_BTREE_g=    
+H5E_EFL_g=    
+H5E_REFERENCE_g=    
+H5E_FPHDF5_g=    
+H5E_INTERNAL_g=    
+H5E_ERROR_g=    
+H5E_DATASET_g=    
+H5E_ATOM_g=    
+H5E_TBBT_g=    
+H5E_OHDR_g=    
+H5E_STORAGE_g=    
+H5E_FILE_g=    
+H5E_RS_g=    
+H5E_DATATYPE_g=    
+H5E_TST_g=    
+H5E_RESOURCE_g=    
+H5E_CACHE_g=    
+H5E_SYM_g=    
+H5E_FUNC_g=    
+H5E_VFL_g=    
+H5E_PLIST_g=    
+H5E_ATTR_g=    
+H5E_IO_g=    
+H5E_ARGS_g=    
+H5E_DATASPACE_g=    
+H5E_PLINE_g=    
+H5E_HEAP_g= (-1);
+
+/* Reset minor error IDs */
+
+
+/* Property list errors */    
+H5E_CANTGET_g=    
+H5E_CANTSET_g=    
+H5E_DUPCLASS_g=
+
+/* Dataspace errors */    
+H5E_CANTCLIP_g=    
+H5E_CANTCOUNT_g=    
+H5E_CANTSELECT_g=    
+H5E_CANTNEXT_g=    
+H5E_BADSELECT_g=    
+H5E_CANTCOMPARE_g=
+
+/* Object atom related errors */    
+H5E_BADATOM_g=    
+H5E_BADGROUP_g=    
+H5E_CANTREGISTER_g=    
+H5E_CANTINC_g=    
+H5E_CANTDEC_g=    
+H5E_NOIDS_g=
+
+/* Argument errors */    
+H5E_UNINITIALIZED_g=    
+H5E_UNSUPPORTED_g=    
+H5E_BADTYPE_g=    
+H5E_BADRANGE_g=    
+H5E_BADVALUE_g=
+
+/* FPHDF5 errors */    
+H5E_CANTMAKETREE_g=    
+H5E_CANTRECV_g=    
+H5E_CANTSENDMDATA_g=    
+H5E_CANTCHANGE_g=    
+H5E_CANTALLOC_g=
+
+/* I/O pipeline errors */    
+H5E_NOFILTER_g=    
+H5E_CALLBACK_g=    
+H5E_CANAPPLY_g=    
+H5E_SETLOCAL_g=
+
+/* Datatype conversion errors */    
+H5E_CANTCONVERT_g=    
+H5E_BADSIZE_g=
+
+/* Parallel MPI errors */    
+H5E_MPI_g=    
+H5E_MPIERRSTR_g=
+
+/* Object header related errors */    
+H5E_LINKCOUNT_g=    
+H5E_VERSION_g=    
+H5E_ALIGNMENT_g=    
+H5E_BADMESG_g=    
+H5E_CANTDELETE_g=
+
+/* Resource errors */    
+H5E_NOSPACE_g=    
+H5E_CANTCOPY_g=    
+H5E_CANTFREE_g=    
+H5E_ALREADYEXISTS_g=    
+H5E_CANTLOCK_g=    
+H5E_CANTUNLOCK_g=    
+H5E_CANTGC_g=
+
+/* Generic low-level file I/O errors */    
+H5E_SEEKERROR_g=    
+H5E_READERROR_g=    
+H5E_WRITEERROR_g=    
+H5E_CLOSEERROR_g=    
+H5E_OVERFLOW_g=    
+H5E_FCNTL_g=
+
+/* B-tree related errors */    
+H5E_NOTFOUND_g=    
+H5E_EXISTS_g=    
+H5E_CANTENCODE_g=    
+H5E_CANTDECODE_g=    
+H5E_CANTSPLIT_g=    
+H5E_CANTINSERT_g=    
+H5E_CANTLIST_g=
+
+/* File accessability errors */    
+H5E_FILEEXISTS_g=    
+H5E_FILEOPEN_g=    
+H5E_CANTCREATE_g=    
+H5E_CANTOPENFILE_g=    
+H5E_CANTCLOSEFILE_g=    
+H5E_NOTHDF5_g=    
+H5E_BADFILE_g=    
+H5E_TRUNCATED_g=    
+H5E_MOUNT_g=
+
+/* Cache related errors */    
+H5E_CANTFLUSH_g=    
+H5E_CANTLOAD_g=    
+H5E_PROTECT_g=    
+H5E_NOTCACHED_g=
+
+/* Group related errors */    
+H5E_CANTOPENOBJ_g=    
+H5E_COMPLEN_g=    
+H5E_CWG_g=    
+H5E_LINK_g=    
+H5E_SLINK_g=
+
+/* Function entry/exit interface errors */    
+H5E_CANTINIT_g=    
+H5E_ALREADYINIT_g=    
+H5E_CANTRELEASE_g= (-1);
+
+#endif /* H5Eterm_H */
diff --git a/src/H5err.txt b/src/H5err.txt
new file mode 100644
index 0000000..58ca59f
--- /dev/null
+++ b/src/H5err.txt
@@ -0,0 +1,204 @@
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
+#
+
+# This file is used to generate the various headers that are needed for the
+# error API.  The bin/make_err script reads in this file and creates the
+# appropriate files in the src/ directory when the generated headers are out
+# of date with respect to this file.
+#
+# Blank lines and lines beginning with '#' are ignored
+#
+# The format of this file is as follows:
+#  <type>,<major section, if minor type, otherwise omitted>,<name>,<description>
+#
+# For example, the following sample input shows two major errors and two minor
+# errors in each section:
+#
+# MAJOR, H5E_ARGS, Invalid arguments to routine
+# MAJOR, H5E_RESOURCE, Resource unavailable
+#
+# SECTION, ARGS, Argument errors
+# SECTION, RESOURCE, Resource errors
+#
+# MINOR, ARGS, H5E_UNINITIALIZED, Information is uinitialized
+# MINOR, ARGS, H5E_UNSUPPORTED, Feature is unsupported
+# MINOR, RESOURCE, H5E_NOSPACE, No space available for allocation
+# MINOR, RESOURCE, H5E_CANTCOPY, unable to copy object
+#
+# The section information is just used for grouping the information in the
+# files created and can have any value.  They generally correspond to the
+# major errors, but don't have to.  The section definition for each minor error
+# must come before any minor error that uses it.
+#
+# Programmer: Quincey Koziol
+# Creation Date: 2003/08/12
+
+# Major errors
+MAJOR, H5E_ARGS, Invalid arguments to routine
+MAJOR, H5E_RESOURCE, Resource unavailable
+MAJOR, H5E_INTERNAL, Internal error (too specific to document in detail)
+MAJOR, H5E_FILE, File accessability
+MAJOR, H5E_IO, Low-level I/O
+MAJOR, H5E_FUNC, Function entry/exit
+MAJOR, H5E_ATOM, Object atom
+MAJOR, H5E_CACHE, Object cache
+MAJOR, H5E_BTREE, B-Tree node
+MAJOR, H5E_SYM, Symbol table
+MAJOR, H5E_HEAP, Heap
+MAJOR, H5E_OHDR, Object header
+MAJOR, H5E_DATATYPE, Datatype
+MAJOR, H5E_DATASPACE, Dataspace
+MAJOR, H5E_DATASET, Dataset
+MAJOR, H5E_STORAGE, Data storage
+MAJOR, H5E_PLIST, Property lists
+MAJOR, H5E_ATTR, Attribute
+MAJOR, H5E_PLINE, Data filters
+MAJOR, H5E_EFL, External file list
+MAJOR, H5E_REFERENCE, References
+MAJOR, H5E_VFL, Virtual File Layer
+MAJOR, H5E_TBBT, Threaded, Balanced, Binary Trees
+MAJOR, H5E_FPHDF5, Flexible Parallel HDF5
+MAJOR, H5E_TST, Ternary Search Trees
+MAJOR, H5E_RS, Reference Counted Strings
+MAJOR, H5E_ERROR, Error API
+
+# Sections (for grouping minor errors)
+SECTION, ARGS, Argument errors
+SECTION, RESOURCE, Resource errors
+SECTION, FILEACC, File accessability errors
+SECTION, FILE, Generic low-level file I/O errors
+SECTION, FUNC, Function entry/exit interface errors
+SECTION, ATOM, Object atom related errors
+SECTION, CACHE, Cache related errors
+SECTION, BTREE, B-tree related errors
+SECTION, OHDR, Object header related errors
+SECTION, GROUP, Group related errors
+SECTION, TYPECONV, Datatype conversion errors
+SECTION, DSPACE, Dataspace errors
+SECTION, PLIST, Property list errors
+SECTION, MPI, Parallel MPI errors
+SECTION, FPH5, FPHDF5 errors
+SECTION, PIPELINE, I/O pipeline errors
+
+# Minor errors
+
+# Argument errors
+MINOR, ARGS, H5E_UNINITIALIZED, Information is uinitialized
+MINOR, ARGS, H5E_UNSUPPORTED, Feature is unsupported
+MINOR, ARGS, H5E_BADTYPE, Inappropriate type
+MINOR, ARGS, H5E_BADRANGE, Out of range
+MINOR, ARGS, H5E_BADVALUE, Bad value
+
+# Resource errors
+MINOR, RESOURCE, H5E_NOSPACE, No space available for allocation
+MINOR, RESOURCE, H5E_CANTCOPY, Unable to copy object
+MINOR, RESOURCE, H5E_CANTFREE, Unable to free object
+MINOR, RESOURCE, H5E_ALREADYEXISTS, Object already exists
+MINOR, RESOURCE, H5E_CANTLOCK, Unable to lock object
+MINOR, RESOURCE, H5E_CANTUNLOCK, Unable to unlock object
+MINOR, RESOURCE, H5E_CANTGC, Unable to garbage collect
+
+# File accessability errors
+MINOR, FILEACC, H5E_FILEEXISTS, File already exists
+MINOR, FILEACC, H5E_FILEOPEN, File already open
+MINOR, FILEACC, H5E_CANTCREATE, Unable to create file
+MINOR, FILEACC, H5E_CANTOPENFILE, Unable to open file
+MINOR, FILEACC, H5E_CANTCLOSEFILE, Unable to close file
+MINOR, FILEACC, H5E_NOTHDF5, Not an HDF5 file
+MINOR, FILEACC, H5E_BADFILE, Bad file ID accessed
+MINOR, FILEACC, H5E_TRUNCATED, File has been truncated
+MINOR, FILEACC, H5E_MOUNT, File mount error
+
+# Generic low-level file I/O errors
+MINOR, FILE, H5E_SEEKERROR, Seek failed
+MINOR, FILE, H5E_READERROR, Read failed
+MINOR, FILE, H5E_WRITEERROR, Write failed
+MINOR, FILE, H5E_CLOSEERROR, Close failed
+MINOR, FILE, H5E_OVERFLOW, Address overflowed
+MINOR, FILE, H5E_FCNTL, File control (fcntl) failed
+
+# Function entry/exit interface errors
+MINOR, FUNC, H5E_CANTINIT, Unable to initialize object
+MINOR, FUNC, H5E_ALREADYINIT, Object already initialized
+MINOR, FUNC, H5E_CANTRELEASE, Unable to release object
+
+# Object atom related errors
+MINOR, ATOM, H5E_BADATOM, Unable to find atom information (already closed?)
+MINOR, ATOM, H5E_BADGROUP, Unable to find ID group information
+MINOR, ATOM, H5E_CANTREGISTER, Unable to register new atom
+MINOR, ATOM, H5E_CANTINC, Unable to increment reference count
+MINOR, ATOM, H5E_CANTDEC, Unable to decrement reference count
+MINOR, ATOM, H5E_NOIDS, Out of IDs for group
+
+# Cache related errors
+MINOR, CACHE, H5E_CANTFLUSH, Unable to flush data from cache
+MINOR, CACHE, H5E_CANTLOAD, Unable to load metadata into cache
+MINOR, CACHE, H5E_PROTECT, Protected metadata error
+MINOR, CACHE, H5E_NOTCACHED, Metadata not currently cached
+
+# B-tree related errors
+MINOR, BTREE, H5E_NOTFOUND, Object not found
+MINOR, BTREE, H5E_EXISTS, Object already exists
+MINOR, BTREE, H5E_CANTENCODE, Unable to encode value
+MINOR, BTREE, H5E_CANTDECODE, Unable to decode value
+MINOR, BTREE, H5E_CANTSPLIT, Unable to split node
+MINOR, BTREE, H5E_CANTINSERT, Unable to insert object
+MINOR, BTREE, H5E_CANTLIST, Unable to list node
+
+# Object header related errors
+MINOR, OHDR, H5E_LINKCOUNT, Bad object header link count
+MINOR, OHDR, H5E_VERSION, Wrong version number
+MINOR, OHDR, H5E_ALIGNMENT, Alignment error
+MINOR, OHDR, H5E_BADMESG, Unrecognized message
+MINOR, OHDR, H5E_CANTDELETE, Can't delete message
+
+# Group related errors
+MINOR, GROUP, H5E_CANTOPENOBJ, Can't open object
+MINOR, GROUP, H5E_COMPLEN, Name component is too long
+MINOR, GROUP, H5E_CWG, Problem with current working group
+MINOR, GROUP, H5E_LINK, Link count failure
+MINOR, GROUP, H5E_SLINK, Symbolic link error
+
+# Datatype conversion errors
+MINOR, TYPECONV, H5E_CANTCONVERT, Can't convert datatypes
+MINOR, TYPECONV, H5E_BADSIZE, Bad size for object
+
+# Dataspace errors
+MINOR, DSPACE, H5E_CANTCLIP, Can't clip hyperslab region
+MINOR, DSPACE, H5E_CANTCOUNT, Can't count elements
+MINOR, DSPACE, H5E_CANTSELECT, Can't select hyperslab
+MINOR, DSPACE, H5E_CANTNEXT, Can't move to next iterator location
+MINOR, DSPACE, H5E_BADSELECT, Invalid selection
+MINOR, DSPACE, H5E_CANTCOMPARE, Can't compare objects
+
+# Property list errors
+MINOR, PLIST, H5E_CANTGET, Can't get value
+MINOR, PLIST, H5E_CANTSET, Can't set value
+MINOR, PLIST, H5E_DUPCLASS, Duplicate class name in parent class
+
+# Parallel MPI errors
+MINOR, MPI, H5E_MPI, Some MPI function failed
+MINOR, MPI, H5E_MPIERRSTR, MPI Error String
+
+# FPHDF5 errors
+MINOR, FPH5, H5E_CANTMAKETREE, Can't create a binary tree node
+MINOR, FPH5, H5E_CANTRECV, Can't receive messages from processes
+MINOR, FPH5, H5E_CANTSENDMDATA, Can't send metadata message
+MINOR, FPH5, H5E_CANTCHANGE, Can't register change with server
+MINOR, FPH5, H5E_CANTALLOC, Can't allocate from file
+
+# I/O pipeline errors
+MINOR, PIPELINE, H5E_NOFILTER, Requested filter is not available
+MINOR, PIPELINE, H5E_CALLBACK, Callback failed
+MINOR, PIPELINE, H5E_CANAPPLY, Error from filter 'can apply' callback
+MINOR, PIPELINE, H5E_SETLOCAL, Error from filter 'set local' callback
diff --git a/src/Makefile.in b/src/Makefile.in
index 406bc3b..c3eca2e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,22 +54,30 @@ MOSTLYCLEAN=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
 
 ## Public header files (to be installed)...
 PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h           \
-        H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDfamily.h          \
-        H5FDfphdf5.h H5FDgass.h H5FDlog.h H5FDmpio.h H5FDmpiposix.h           \
-        H5FDmulti.h H5FDsec2.h H5FDsrb.h H5FDstdio.h H5FDstream.h             \
-        H5FPpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h H5Ipublic.h        \
-        H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h          \
-        H5Tpublic.h H5Zpublic.h H5pubconf.h hdf5.h H5api_adpt.h
+        H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h           \
+        H5FDfamily.h H5FDfphdf5.h H5FDgass.h H5FDlog.h H5FDmpio.h             \
+        H5FDmpiposix.h H5FDmulti.h H5FDsec2.h H5FDsrb.h H5FDstdio.h           \
+        H5FDstream.h H5FPpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h       \
+        H5Ipublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h          \
+        H5Spublic.h H5Tpublic.h H5Zpublic.h H5pubconf.h hdf5.h H5api_adpt.h
 
 ## Other header files (not to be installed)...
 PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h      \
-        H5Dprivate.h H5Eprivate.h H5Fprivate.h H5FDprivate.h H5FLprivate.h    \
-        H5FOprivate.h H5FPprivate.h H5FSprivate.h H5Gprivate.h H5Gpkg.h       \
-        H5HGprivate.h H5HGpkg.h H5HLprivate.h H5HLpkg.h H5HPprivate.h         \
-        H5Iprivate.h H5MFprivate.h H5MMprivate.h H5Oprivate.h H5Opkg.h        \
-        H5Pprivate.h H5Ppkg.h H5Rprivate.h H5RSprivate.h H5Sprivate.h         \
-        H5STprivate.h H5Tprivate.h H5TBprivate.h H5Tpkg.h H5TSprivate.h       \
-        H5Vprivate.h H5Zprivate.h H5Zpkg.h H5config.h
+        H5Dprivate.h H5Edefin.h H5Einit.h H5Eprivate.h H5Eterm.h H5Fprivate.h \
+        H5FDprivate.h H5FLprivate.h H5FOprivate.h H5FPprivate.h H5FSprivate.h \
+        H5Gprivate.h H5Gpkg.h H5HGprivate.h H5HGpkg.h H5HLprivate.h H5HLpkg.h \
+        H5HPprivate.h H5Iprivate.h H5MFprivate.h H5MMprivate.h H5Oprivate.h   \
+        H5Opkg.h H5Pprivate.h H5Ppkg.h H5Rprivate.h H5RSprivate.h             \
+        H5Sprivate.h H5STprivate.h H5Tprivate.h H5TBprivate.h H5Tpkg.h        \
+        H5TSprivate.h H5Vprivate.h H5Zprivate.h H5Zpkg.h H5config.h
+
+## Error header generation
+##
+## Actually, H5Einit.h, H5Eterm.h, H5Edefin.h and H5Epubgen.h all
+## depend on H5err.txt, but the perl script generates them all, so just
+## list one here.
+$(top_srcdir)/src/H5Edefin.h: $(top_srcdir)/src/H5err.txt
+	perl $(top_srcdir)/bin/make_err $>
 
 ## Number format detection
 ## The LD_LIBRARY_PATH setting is a klutch.