diff --git a/src/C/Makefile.am b/src/C/Makefile.am
index 9e76b9c..8753d9a 100644
--- a/src/C/Makefile.am
+++ b/src/C/Makefile.am
@@ -3,11 +3,6 @@ if ENABLE_C
 # Header files that I wish to install in $(prefix)/include
 include_HEADERS =					\
 	$(top_srcdir)/src/include/H5.h			\
-	$(top_srcdir)/src/include/H5_attribs.h		\
-	$(top_srcdir)/src/include/H5_model.h		\
-	$(top_srcdir)/src/include/H5Part.h		\
-	$(top_srcdir)/src/include/H5Part_io.h		\
-	$(top_srcdir)/src/include/H5Part_model.h	\
 	$(top_srcdir)/src/include/H5Block.h		\
 	$(top_srcdir)/src/include/H5Block_attribs.h	\
 	$(top_srcdir)/src/include/H5Block_io.h		\
@@ -18,6 +13,16 @@ include_HEADERS =					\
 	$(top_srcdir)/src/include/H5Fed_retrieve.h	\
 	$(top_srcdir)/src/include/H5Fed_store.h		\
 	$(top_srcdir)/src/include/H5Fed_tags.h		\
+	$(top_srcdir)/src/include/H5Part.h		\
+	$(top_srcdir)/src/include/H5Part_io.h		\
+	$(top_srcdir)/src/include/H5Part_model.h	\
+	$(top_srcdir)/src/include/H5_debug.h		\
+	$(top_srcdir)/src/include/H5_error.h		\
+	$(top_srcdir)/src/include/H5_file.h		\
+	$(top_srcdir)/src/include/H5_file_attribs.h	\
+	$(top_srcdir)/src/include/H5_log.h		\
+	$(top_srcdir)/src/include/H5_model.h		\
+	$(top_srcdir)/src/include/H5_step_attribs.h	\
 	$(top_srcdir)/src/include/H5hut.h
 
 # Listing of all possible headers that I may include
diff --git a/src/Fortran/Makefile.am b/src/Fortran/Makefile.am
index 88710a1..8803b68 100644
--- a/src/Fortran/Makefile.am
+++ b/src/Fortran/Makefile.am
@@ -4,10 +4,12 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/include
 
 F90_FILES =						\
 	$(top_srcdir)/src/include/H5hut.f90		\
-	$(top_srcdir)/src/include/H5.f90		\
 	$(top_srcdir)/src/include/H5_const.f90		\
-	$(top_srcdir)/src/include/H5_attribs.f90	\
+	$(top_srcdir)/src/include/H5_file.f90		\
 	$(top_srcdir)/src/include/H5_model.f90		\
+	$(top_srcdir)/src/include/H5_attribs.f90	\
+	$(top_srcdir)/src/include/H5_debug.f90		\
+	$(top_srcdir)/src/include/H5_error.f90		\
 	$(top_srcdir)/src/include/H5Part_model.f90	\
 	$(top_srcdir)/src/include/H5Part_io.f90		\
 	$(top_srcdir)/src/include/H5Block_model.f90	\