Index: src/libcfa/Makefile.am
===================================================================
--- src/libcfa/Makefile.am	(revision 945047e2aca5b3231fef0da62fb6d18ffa6275f7)
+++ src/libcfa/Makefile.am	(revision 854a32c0f1a0fc8b5c267978134916d7b90de3fa)
@@ -64,5 +64,5 @@
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
 
-include_HEADERS = ${headers}
+nobase_include_HEADERS = ${headers}
 
 CLEANFILES = libcfa-prelude.c
Index: src/libcfa/Makefile.in
===================================================================
--- src/libcfa/Makefile.in	(revision 945047e2aca5b3231fef0da62fb6d18ffa6275f7)
+++ src/libcfa/Makefile.in	(revision 854a32c0f1a0fc8b5c267978134916d7b90de3fa)
@@ -39,5 +39,5 @@
 POST_UNINSTALL = :
 subdir = src/libcfa
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -117,5 +117,5 @@
 DIST_SOURCES = $(libcfa_a_SOURCES)
 DATA = $(cfalib_DATA)
-HEADERS = $(include_HEADERS)
+HEADERS = $(nobase_include_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -236,5 +236,5 @@
 libobjs = ${headers:=.o}
 libcfa_a_SOURCES = libcfa-prelude.c ${headers:=.c}
-include_HEADERS = ${headers}
+nobase_include_HEADERS = ${headers}
 CLEANFILES = libcfa-prelude.c
 all: all-am
@@ -368,21 +368,24 @@
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(cfalibdir)'; $(am__uninstall_files_from_dir)
-install-includeHEADERS: $(include_HEADERS)
+install-nobase_includeHEADERS: $(nobase_include_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	$(am__nobase_list) | while read dir files; do \
+	  xfiles=; for file in $$files; do \
+	    if test -f "$$file"; then xfiles="$$xfiles $$file"; \
+	    else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
+	  test -z "$$xfiles" || { \
+	    test "x$$dir" = x. || { \
+	      echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
+	    echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
+	    $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
 	done
 
-uninstall-includeHEADERS:
+uninstall-nobase_includeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	@list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
+	$(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
@@ -530,5 +533,5 @@
 info-am:
 
-install-data-am: install-cfalibDATA install-includeHEADERS
+install-data-am: install-cfalibDATA install-nobase_includeHEADERS
 
 install-dvi: install-dvi-am
@@ -575,6 +578,6 @@
 ps-am:
 
-uninstall-am: uninstall-cfalibDATA uninstall-includeHEADERS \
-	uninstall-libLIBRARIES
+uninstall-am: uninstall-cfalibDATA uninstall-libLIBRARIES \
+	uninstall-nobase_includeHEADERS
 
 .MAKE: install-am install-strip
@@ -586,12 +589,12 @@
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
-	install-includeHEADERS install-info install-info-am \
-	install-libLIBRARIES install-man install-pdf install-pdf-am \
+	install-info install-info-am install-libLIBRARIES install-man \
+	install-nobase_includeHEADERS install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-cfalibDATA uninstall-includeHEADERS \
-	uninstall-libLIBRARIES
+	uninstall-am uninstall-cfalibDATA uninstall-libLIBRARIES \
+	uninstall-nobase_includeHEADERS