6 files changed, 19 insertions, 8 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 9f8e558..5e3f2af 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -267,6 +267,9 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+INCLUDES = -I$(top_srcdir)/hl/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
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 8b84eb2..85ae764 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -264,6 +264,9 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+INCLUDES = -I$(top_srcdir)/hl/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
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index 924d25c..42c7834 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -20,7 +20,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Include src directory
-INCLUDES=-I$(top_srcdir)/src
+INCLUDES+=-I$(top_srcdir)/src
 
 # This is our main target
 lib_LTLIBRARIES=libhdf5_cpp.la
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index 18ab3b6..cdf1b3c 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -301,6 +301,11 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+
+# Include src directory
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/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
@@ -345,9 +350,6 @@ TRACE = perl $(top_srcdir)/bin/trace
 # *.clog are from the MPE option.
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
-# Include src directory
-INCLUDES = -I$(top_srcdir)/src
-
 # This is our main target
 lib_LTLIBRARIES = libhdf5_cpp.la
 
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 35de101..51500bf 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -20,7 +20,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Include src, test, and c++/src directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
 
 # Shared C++ libraries aren't universally supported.
 if CXX_SHARED_CONDITIONAL
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 41b468d..00f85df 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -290,6 +290,12 @@ RM = rm -f
 CP = cp
 TIME = time
 
+# Path for hl needed in hdf5.h
+
+# Include src, test, and c++/src directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+	-I$(top_srcdir)/test -I$(top_srcdir)/c++/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
@@ -334,9 +340,6 @@ TRACE = perl $(top_srcdir)/bin/trace
 # *.clog are from the MPE option.
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
-# Include src, test, and c++/src directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
-
 # Shared C++ libraries aren't universally supported.
 @CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static