7 files changed, 12 insertions, 10 deletions
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 9e14d6e..19a99ba 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -12,7 +12,7 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include "H5IM.h"
+#include "H5IMprivate.h"
 #include "H5IMcc.h"
 #include "H5f90i_gen.h"
 
diff --git a/hl/fortran/src/H5IMcc.h b/hl/fortran/src/H5IMcc.h
index b16eeb2..54666c4 100644
--- a/hl/fortran/src/H5IMcc.h
+++ b/hl/fortran/src/H5IMcc.h
@@ -15,8 +15,8 @@
 #ifndef _H5IMCC_H
 #define _H5IMCC_H
 
-#include "H5LT.h"
-#include "H5IM.h"
+#include "H5LTprivate.h"
+#include "H5IMprivate.h"
 #include "../../fortran/src/H5f90i_gen.h"
 
 #ifdef __cplusplus
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index b024edc..0062d60 100755
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -14,7 +14,7 @@
 
 /* This files contains C stubs for H5D Fortran APIs */
 
-#include "H5IM.h"
+#include "H5IMprivate.h"
 #include "H5IMcc.h"
 #include "H5LTf90proto.h"
 #include "../../../fortran/src/H5f90i_gen.h"
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index 693eca9..d3353c4 100755
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -14,7 +14,7 @@
 
 /* This files contains C stubs for H5D Fortran APIs */
 
-#include "H5LT.h"
+#include "H5LTprivate.h"
 #include "H5LTf90proto.h"
 
 
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 29cf15b..2bce973 100755
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -14,7 +14,7 @@
 
 /* This files contains C stubs for H5D Fortran APIs */
 
-#include "H5TB.h"
+#include "H5TBprivate.h"
 #include "H5LTf90proto.h"
 
 /*-------------------------------------------------------------------------
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 6ee69cf..9fe8618 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/config/commence.am
 
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
          -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
 AM_FCFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index e73d461..67a789c 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -293,6 +293,11 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+	-I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
+	-I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
+
 # Some machines need a command to run executables; this is that command
 # so that our tests will run.
 # We use RUNTESTS instead of RUNSERIAL directly because it may be that
@@ -336,9 +341,6 @@ TRACE = perl $(top_srcdir)/bin/trace
 # .chklog files are output from those tests.
 # *.clog are from the MPE option.
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-         -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
-
 AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 
 # Our main target, the high-level fortran library