diff --git a/src/h5core/private/h5_init.c b/src/h5core/private/h5_init.c
index 057e728..5cfb549 100644
--- a/src/h5core/private/h5_init.c
+++ b/src/h5core/private/h5_init.c
@@ -77,7 +77,7 @@ create_vertex_type (
 
 	TRY(
 	        h5_dta_types.h5_vertex_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5_glb_vertex_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -103,7 +103,7 @@ create_triangle_type (
 
 	TRY(
 	        h5_dta_types.h5_triangle_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5_glb_tri_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -165,7 +165,7 @@ create_tag_types (
 
 	TRY (
 	        h5_dta_types.h5t_glb_tag_idx_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5t_glb_tag_idx_t)) );
 	TRY (
 	        hdf5_insert_type (
@@ -191,7 +191,7 @@ create_tet_type (
 
 	TRY(
 	        h5_dta_types.h5_tet_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5_glb_tet_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -254,7 +254,7 @@ create_chunk_type (
 	H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
 	TRY(
 	        h5_dta_types.h5_chunk_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5t_chunk_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -308,7 +308,7 @@ create_octree_type (
 	H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
 	TRY(
 	        h5_dta_types.h5_octree_t = hdf5_create_type (
-	                H5_COMPOUND,
+	                H5T_COMPOUND,
 	                sizeof (h5t_octant_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -357,7 +357,7 @@ create_userdata_type (
 	H5_PRIV_FUNC_ENTER (h5_err_t, "%s", "void");
 	TRY(
 		        h5_dta_types.h5_userdata_t = hdf5_create_type (
-		                H5_COMPOUND,
+		                H5T_COMPOUND,
 		                sizeof (h5t_oct_userdata_t)) );
 	TRY(
 	        hdf5_insert_type (
@@ -663,7 +663,7 @@ _h5_exit (int status) {
 }
 
 h5_err_t
-h5_initialize (
+h5priv_initialize (
         void
         ) {
 	h5_initialized = 1;
diff --git a/src/include/h5core/h5_types.h b/src/include/h5core/h5_types.h
index 1ca10bd..c38b6ea 100644
--- a/src/include/h5core/h5_types.h
+++ b/src/include/h5core/h5_types.h
@@ -13,18 +13,6 @@
 #include <stdarg.h>
 #include <stdint.h>
 
-#define H5_STRING               H5T_C_S1
-#define H5_INT16                H5T_NATIVE_INT16
-#define H5_UINT16		H5T_NATIVE_UINT16
-#define H5_INT32                H5T_NATIVE_INT32
-#define H5_UINT32               H5T_NATIVE_UINT32
-#define H5_INT64                H5T_NATIVE_INT64
-#define H5_UINT64               H5T_NATIVE_UINT64
-#define H5_FLOAT32              H5T_NATIVE_FLOAT
-#define H5_FLOAT64              H5T_NATIVE_DOUBLE
-#define H5_ID                   H5T_NATIVE_INT64
-#define H5_COMPOUND             H5T_COMPOUND
-
 typedef enum  {
 	H5_STRING_T,
 	H5_INT16_T,
@@ -36,9 +24,8 @@ typedef enum  {
 	H5_FLOAT32_T,
 	H5_FLOAT64_T,
 	H5_ID_T,
-	H5_COMPOUND_T
 } h5_types_t;
-	
+
 #ifdef   WIN32
 typedef __int64                 int64_t;
 #endif /* WIN32 */