diff --git a/src/h5core/h5t_model.c b/src/h5core/h5t_model.c
index 7bc3e19..98c313f 100644
--- a/src/h5core/h5t_model.c
+++ b/src/h5core/h5t_model.c
@@ -23,8 +23,6 @@
 #include "private/h5t_io.h"
 #include "private/h5t_tags.h"
 
-#include "private/h5_init.h"
-
 #include "h5core/h5_model.h"
 #include "private/h5t_core.h"
 #include "private/h5t_store.h"
diff --git a/src/h5core/h5t_store.c b/src/h5core/h5t_store.c
index 8358a6f..aa5a642 100644
--- a/src/h5core/h5t_store.c
+++ b/src/h5core/h5t_store.c
@@ -17,7 +17,6 @@
 #include "private/h5t_store.h"
 #include "private/h5t_core.h"
 #include "private/h5t_io.h"
-#include "private/h5_init.h"
 #include "private/h5_file.h"
 #include "private/h5_mpi.h"
 
@@ -687,6 +686,7 @@ rebuild_map_elem_g2l (
 	h5priv_sort_idxmap (map);
 	H5_RETURN (H5_SUCCESS);
 }
+
 /*
    Rebuild mapping of global element indices to their local indices.
  */
diff --git a/src/h5core/h5t_tags.c b/src/h5core/h5t_tags.c
index 301572c..b8ed370 100644
--- a/src/h5core/h5t_tags.c
+++ b/src/h5core/h5t_tags.c
@@ -21,8 +21,6 @@
 #include "private/h5t_model.h"
 #include "private/h5t_tags.h"
 
-#include "private/h5_init.h"
-
 #include <assert.h>
 
 static h5_err_t
diff --git a/src/h5core/private/h5t_access_tetm.c b/src/h5core/private/h5t_access_tetm.c
index 3cf0fa2..d9ff034 100644
--- a/src/h5core/private/h5t_access_tetm.c
+++ b/src/h5core/private/h5t_access_tetm.c
@@ -12,7 +12,6 @@
 
 #include "private/h5_file.h"
 #include "private/h5_types.h"
-#include "private/h5_init.h"
 #include "private/h5t_types.h"
 #include "private/h5t_model.h"
 #include "private/h5t_access.h"
diff --git a/src/h5core/private/h5t_access_trim.c b/src/h5core/private/h5t_access_trim.c
index ee118b6..a2c909e 100644
--- a/src/h5core/private/h5t_access_trim.c
+++ b/src/h5core/private/h5t_access_trim.c
@@ -11,7 +11,6 @@
 #include "h5core/h5_syscall.h"
 
 #include "private/h5_file.h"
-#include "private/h5_init.h"
 #include "private/h5t_types.h"
 #include "private/h5t_model.h"
 #include "private/h5t_access.h"
diff --git a/src/h5core/private/h5t_model_tetm.c b/src/h5core/private/h5t_model_tetm.c
index 8eb98dc..6c49935 100644
--- a/src/h5core/private/h5t_model_tetm.c
+++ b/src/h5core/private/h5t_model_tetm.c
@@ -21,7 +21,6 @@
 #include "private/h5t_store.h"
 
 #include "private/h5_file.h"
-#include "private/h5_init.h"
 #include "private/h5t_core.h"
 
 static struct h5t_methods tet_funcs = {
diff --git a/src/h5core/private/h5t_model_trim.c b/src/h5core/private/h5t_model_trim.c
index 742e7cd..b98831f 100644
--- a/src/h5core/private/h5t_model_trim.c
+++ b/src/h5core/private/h5t_model_trim.c
@@ -20,7 +20,6 @@
 #include "private/h5t_retrieve.h"
 #include "private/h5t_store.h"
 
-#include "private/h5_init.h"
 #include "private/h5t_core.h"
 
 static struct h5t_methods tri_funcs = {