Eliminate the strange include pre-build install machinery

Introduced back in 2007 in 583140460100ea99553d883174065ca22a3099b2 the
point was to fake up a sane public header structure with minimal
internal disruption, TEMPORARILY. I think 15 years is temporary enough.

The machinery has worked rather well for what it is, but having the
headers appear in multiple locations is weird and confusing to people,
plus this "physical" separation makes it far more clearer what is
a public header and what isn't.

47 files changed, 51 insertions, 210 deletions

diff --git a/Makefile.am b/Makefile.am
index cb0fe7054..e5bb2e222 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ DIST_SUBDIRS = po misc luaext rpmio lib sign build python scripts fileattrs docs
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/build
 AM_CPPFLAGS += -I$(top_srcdir)/lib
 AM_CPPFLAGS += -I$(top_srcdir)/rpmio
@@ -58,46 +58,46 @@ AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
 pkginclude_HEADERS =
 nodist_pkginclude_HEADERS =
 
-pkginclude_HEADERS += rpmio/argv.h
-pkginclude_HEADERS += rpmio/rpmcrypto.h
-pkginclude_HEADERS += rpmio/rpmio.h
-pkginclude_HEADERS += rpmio/rpmurl.h
-pkginclude_HEADERS += rpmio/rpmmacro.h
-pkginclude_HEADERS += rpmio/rpmlog.h
-pkginclude_HEADERS += rpmio/rpmpgp.h
-pkginclude_HEADERS += rpmio/rpmsq.h
-pkginclude_HEADERS += rpmio/rpmstring.h
-pkginclude_HEADERS += rpmio/rpmstrpool.h
-pkginclude_HEADERS += rpmio/rpmsw.h
-pkginclude_HEADERS += rpmio/rpmfileutil.h
-pkginclude_HEADERS += rpmio/rpmutil.h
-pkginclude_HEADERS += rpmio/rpmkeyring.h
-pkginclude_HEADERS += rpmio/rpmbase64.h
-pkginclude_HEADERS += rpmio/rpmver.h
-
-pkginclude_HEADERS += lib/header.h
-pkginclude_HEADERS += lib/rpmdb.h
-pkginclude_HEADERS += lib/rpmcallback.h
-pkginclude_HEADERS += lib/rpmcli.h
-pkginclude_HEADERS += lib/rpmlib.h
-pkginclude_HEADERS += lib/rpmds.h
-pkginclude_HEADERS += lib/rpmfi.h
-pkginclude_HEADERS += lib/rpmfiles.h
-pkginclude_HEADERS += lib/rpmpol.h
-pkginclude_HEADERS += lib/rpmps.h
-pkginclude_HEADERS += lib/rpmprob.h
-pkginclude_HEADERS += lib/rpmtag.h
-pkginclude_HEADERS += lib/rpmtd.h
-pkginclude_HEADERS += lib/rpmte.h
-pkginclude_HEADERS += lib/rpmts.h
-pkginclude_HEADERS += lib/rpmtypes.h
-pkginclude_HEADERS += lib/rpmarchive.h
-
-pkginclude_HEADERS += sign/rpmsign.h
-
-pkginclude_HEADERS += build/rpmbuild.h
-pkginclude_HEADERS += build/rpmfc.h
-pkginclude_HEADERS += build/rpmspec.h
+pkginclude_HEADERS += include/rpm/argv.h
+pkginclude_HEADERS += include/rpm/rpmcrypto.h
+pkginclude_HEADERS += include/rpm/rpmio.h
+pkginclude_HEADERS += include/rpm/rpmurl.h
+pkginclude_HEADERS += include/rpm/rpmmacro.h
+pkginclude_HEADERS += include/rpm/rpmlog.h
+pkginclude_HEADERS += include/rpm/rpmpgp.h
+pkginclude_HEADERS += include/rpm/rpmsq.h
+pkginclude_HEADERS += include/rpm/rpmstring.h
+pkginclude_HEADERS += include/rpm/rpmstrpool.h
+pkginclude_HEADERS += include/rpm/rpmsw.h
+pkginclude_HEADERS += include/rpm/rpmfileutil.h
+pkginclude_HEADERS += include/rpm/rpmutil.h
+pkginclude_HEADERS += include/rpm/rpmkeyring.h
+pkginclude_HEADERS += include/rpm/rpmbase64.h
+pkginclude_HEADERS += include/rpm/rpmver.h
+
+pkginclude_HEADERS += include/rpm/header.h
+pkginclude_HEADERS += include/rpm/rpmdb.h
+pkginclude_HEADERS += include/rpm/rpmcallback.h
+pkginclude_HEADERS += include/rpm/rpmcli.h
+pkginclude_HEADERS += include/rpm/rpmlib.h
+pkginclude_HEADERS += include/rpm/rpmds.h
+pkginclude_HEADERS += include/rpm/rpmfi.h
+pkginclude_HEADERS += include/rpm/rpmfiles.h
+pkginclude_HEADERS += include/rpm/rpmpol.h
+pkginclude_HEADERS += include/rpm/rpmps.h
+pkginclude_HEADERS += include/rpm/rpmprob.h
+pkginclude_HEADERS += include/rpm/rpmtag.h
+pkginclude_HEADERS += include/rpm/rpmtd.h
+pkginclude_HEADERS += include/rpm/rpmte.h
+pkginclude_HEADERS += include/rpm/rpmts.h
+pkginclude_HEADERS += include/rpm/rpmtypes.h
+pkginclude_HEADERS += include/rpm/rpmarchive.h
+
+pkginclude_HEADERS += include/rpm/rpmsign.h
+
+pkginclude_HEADERS += include/rpm/rpmbuild.h
+pkginclude_HEADERS += include/rpm/rpmfc.h
+pkginclude_HEADERS += include/rpm/rpmspec.h
 
 
 bin_PROGRAMS =		rpm rpm2cpio rpmbuild rpmdb rpmkeys rpmsign rpmspec
@@ -295,18 +295,7 @@ distclean-local:
 	rm -rf Doxytags
 	rm -f stamp-h.in
 
-$(top_srcdir)/preinstall.am: Makefile.am
-	rm -f $(top_srcdir)/preinstall.am
-	@for f in $(HEADERS); do \
-	  b=`basename $$f`; \
-	  echo 'include/rpm/'$$b': '$$f' include/rpm/$$(dirstamp)' >> $(top_srcdir)/preinstall.am;\
-	  echo '	$$(INSTALL_DATA) $$(top_srcdir)/'$$f' include/rpm/'$$b >> $(top_srcdir)/preinstall.am; \
-	  echo 'BUILT_SOURCES += include/rpm/'$$b >> $(top_srcdir)/preinstall.am; \
-	  echo 'CLEANFILES += include/rpm/'$$b  >> $(top_srcdir)/preinstall.am; \
-	 done
-
 include/rpm/$(dirstamp):
 	@$(MKDIR_P) include/rpm
 	@: > include/rpm/$(dirstamp)
 
-include $(top_srcdir)/preinstall.am
diff --git a/build/Makefile.am b/build/Makefile.am
index f613f1beb..d9e4f45b5 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 AM_CFLAGS += @OPENMP_CFLAGS@
 
-AM_CPPFLAGS =  -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS =  -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include/
 AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += @LUA_CFLAGS@
diff --git a/rpmio/argv.h b/include/rpm/argv.h
index 9be46d494..9be46d494 100644
--- a/rpmio/argv.h
+++ b/include/rpm/argv.h
diff --git a/lib/header.h b/include/rpm/header.h
index e6e78d721..e6e78d721 100644
--- a/lib/header.h
+++ b/include/rpm/header.h
diff --git a/lib/rpmarchive.h b/include/rpm/rpmarchive.h
index 5eafc2c9c..5eafc2c9c 100644
--- a/lib/rpmarchive.h
+++ b/include/rpm/rpmarchive.h
diff --git a/rpmio/rpmbase64.h b/include/rpm/rpmbase64.h
index 03c80446b..03c80446b 100644
--- a/rpmio/rpmbase64.h
+++ b/include/rpm/rpmbase64.h
diff --git a/build/rpmbuild.h b/include/rpm/rpmbuild.h
index 227a412ff..227a412ff 100644
--- a/build/rpmbuild.h
+++ b/include/rpm/rpmbuild.h
diff --git a/lib/rpmcallback.h b/include/rpm/rpmcallback.h
index 14601fdc2..14601fdc2 100644
--- a/lib/rpmcallback.h
+++ b/include/rpm/rpmcallback.h
diff --git a/lib/rpmcli.h b/include/rpm/rpmcli.h
index 104ec11a9..104ec11a9 100644
--- a/lib/rpmcli.h
+++ b/include/rpm/rpmcli.h
diff --git a/rpmio/rpmcrypto.h b/include/rpm/rpmcrypto.h
index 69d329f37..69d329f37 100644
--- a/rpmio/rpmcrypto.h
+++ b/include/rpm/rpmcrypto.h
diff --git a/lib/rpmdb.h b/include/rpm/rpmdb.h
index afd0b85cc..afd0b85cc 100644
--- a/lib/rpmdb.h
+++ b/include/rpm/rpmdb.h
diff --git a/lib/rpmds.h b/include/rpm/rpmds.h
index 66d7ab5c9..66d7ab5c9 100644
--- a/lib/rpmds.h
+++ b/include/rpm/rpmds.h
diff --git a/build/rpmfc.h b/include/rpm/rpmfc.h
index dfc5841ed..dfc5841ed 100644
--- a/build/rpmfc.h
+++ b/include/rpm/rpmfc.h
diff --git a/lib/rpmfi.h b/include/rpm/rpmfi.h
index 8958a01bf..8958a01bf 100644
--- a/lib/rpmfi.h
+++ b/include/rpm/rpmfi.h
diff --git a/lib/rpmfiles.h b/include/rpm/rpmfiles.h
index 29bca259e..29bca259e 100644
--- a/lib/rpmfiles.h
+++ b/include/rpm/rpmfiles.h
diff --git a/rpmio/rpmfileutil.h b/include/rpm/rpmfileutil.h
index 215db129c..215db129c 100644
--- a/rpmio/rpmfileutil.h
+++ b/include/rpm/rpmfileutil.h
diff --git a/rpmio/rpmio.h b/include/rpm/rpmio.h
index 20659375e..20659375e 100644
--- a/rpmio/rpmio.h
+++ b/include/rpm/rpmio.h
diff --git a/rpmio/rpmkeyring.h b/include/rpm/rpmkeyring.h
index 8d99afb36..8d99afb36 100644
--- a/rpmio/rpmkeyring.h
+++ b/include/rpm/rpmkeyring.h
diff --git a/lib/rpmlib.h b/include/rpm/rpmlib.h
index db3839763..db3839763 100644
--- a/lib/rpmlib.h
+++ b/include/rpm/rpmlib.h
diff --git a/rpmio/rpmlog.h b/include/rpm/rpmlog.h
index 0e26b884c..0e26b884c 100644
--- a/rpmio/rpmlog.h
+++ b/include/rpm/rpmlog.h
diff --git a/rpmio/rpmmacro.h b/include/rpm/rpmmacro.h
index e7bee11ef..e7bee11ef 100644
--- a/rpmio/rpmmacro.h
+++ b/include/rpm/rpmmacro.h
diff --git a/rpmio/rpmpgp.h b/include/rpm/rpmpgp.h
index 72c668e3c..72c668e3c 100644
--- a/rpmio/rpmpgp.h
+++ b/include/rpm/rpmpgp.h
diff --git a/lib/rpmpol.h b/include/rpm/rpmpol.h
index 22e058068..22e058068 100644
--- a/lib/rpmpol.h
+++ b/include/rpm/rpmpol.h
diff --git a/lib/rpmprob.h b/include/rpm/rpmprob.h
index d580b0a27..d580b0a27 100644
--- a/lib/rpmprob.h
+++ b/include/rpm/rpmprob.h
diff --git a/lib/rpmps.h b/include/rpm/rpmps.h
index fdcd224f8..fdcd224f8 100644
--- a/lib/rpmps.h
+++ b/include/rpm/rpmps.h
diff --git a/sign/rpmsign.h b/include/rpm/rpmsign.h
index 089276f34..089276f34 100644
--- a/sign/rpmsign.h
+++ b/include/rpm/rpmsign.h
diff --git a/build/rpmspec.h b/include/rpm/rpmspec.h
index 1ec338312..1ec338312 100644
--- a/build/rpmspec.h
+++ b/include/rpm/rpmspec.h
diff --git a/rpmio/rpmsq.h b/include/rpm/rpmsq.h
index 30466e9a8..30466e9a8 100644
--- a/rpmio/rpmsq.h
+++ b/include/rpm/rpmsq.h
diff --git a/rpmio/rpmstring.h b/include/rpm/rpmstring.h
index e3ab13266..e3ab13266 100644
--- a/rpmio/rpmstring.h
+++ b/include/rpm/rpmstring.h
diff --git a/rpmio/rpmstrpool.h b/include/rpm/rpmstrpool.h
index 7d765b372..7d765b372 100644
--- a/rpmio/rpmstrpool.h
+++ b/include/rpm/rpmstrpool.h
diff --git a/rpmio/rpmsw.h b/include/rpm/rpmsw.h
index 88b51348a..88b51348a 100644
--- a/rpmio/rpmsw.h
+++ b/include/rpm/rpmsw.h
diff --git a/lib/rpmtag.h b/include/rpm/rpmtag.h
index b87cf5d03..b87cf5d03 100644
--- a/lib/rpmtag.h
+++ b/include/rpm/rpmtag.h
diff --git a/lib/rpmtd.h b/include/rpm/rpmtd.h
index 069ce5f9c..069ce5f9c 100644
--- a/lib/rpmtd.h
+++ b/include/rpm/rpmtd.h
diff --git a/lib/rpmte.h b/include/rpm/rpmte.h
index 0ed6397dd..0ed6397dd 100644
--- a/lib/rpmte.h
+++ b/include/rpm/rpmte.h
diff --git a/lib/rpmts.h b/include/rpm/rpmts.h
index f66e5cecf..f66e5cecf 100644
--- a/lib/rpmts.h
+++ b/include/rpm/rpmts.h
diff --git a/lib/rpmtypes.h b/include/rpm/rpmtypes.h
index 52e0701e3..52e0701e3 100644
--- a/lib/rpmtypes.h
+++ b/include/rpm/rpmtypes.h
diff --git a/rpmio/rpmurl.h b/include/rpm/rpmurl.h
index d8e62b86d..d8e62b86d 100644
--- a/rpmio/rpmurl.h
+++ b/include/rpm/rpmurl.h
diff --git a/rpmio/rpmutil.h b/include/rpm/rpmutil.h
index 841f89c32..841f89c32 100644
--- a/rpmio/rpmutil.h
+++ b/include/rpm/rpmutil.h
diff --git a/rpmio/rpmver.h b/include/rpm/rpmver.h
index b8f9950c3..b8f9950c3 100644
--- a/rpmio/rpmver.h
+++ b/include/rpm/rpmver.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5a1b6ca9b..5a953597f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += @LUA_CFLAGS@
 AM_CPPFLAGS += -I$(top_srcdir)/misc
@@ -73,9 +73,9 @@ librpm_la_LIBADD += $(SQLITE_LIBS)
 librpm_la_SOURCES += backend/sqlite.c
 endif
 
-tagtbl.C: Makefile.am $(srcdir)/rpmtag.h gentagtbl.sh
+tagtbl.C: Makefile.am $(top_srcdir)/include/rpm/rpmtag.h gentagtbl.sh
 	@AWK=${AWK} ${SHELL} $(srcdir)/gentagtbl.sh \
-		    	     $(srcdir)/rpmtag.h > $@.new && \
+		$(top_srcdir)/include/rpm/rpmtag.h > $@.new && \
 	 mv -f $@.new $@
 BUILT_SOURCES = tagtbl.C
 
diff --git a/luaext/Makefile.am b/luaext/Makefile.am
index 5353321df..e7f564e15 100644
--- a/luaext/Makefile.am
+++ b/luaext/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libluaext.la
 EXTRA_DIST = \
 	modemuncher.c
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include -I.
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include -I.
 
 libluaext_la_CPPFLAGS = $(AM_CPPFLAGS) -DWITH_POSIX @LUA_CFLAGS@
 libluaext_la_LIBADD = @LUA_LIBS@
diff --git a/misc/Makefile.am b/misc/Makefile.am
index e413a211c..3df5f19bb 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile for misc library.
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 
 EXTRA_DIST = \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 3a929d0ce..822c7d213 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/misc
 AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
 AM_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\""
diff --git a/preinstall.am b/preinstall.am
deleted file mode 100644
index 30ff6d999..000000000
--- a/preinstall.am
+++ /dev/null
@@ -1,148 +0,0 @@
-include/rpm/argv.h: rpmio/argv.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/argv.h include/rpm/argv.h
-BUILT_SOURCES += include/rpm/argv.h
-CLEANFILES += include/rpm/argv.h
-include/rpm/rpmcrypto.h: rpmio/rpmcrypto.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmcrypto.h include/rpm/rpmcrypto.h
-BUILT_SOURCES += include/rpm/rpmcrypto.h
-CLEANFILES += include/rpm/rpmcrypto.h
-include/rpm/rpmio.h: rpmio/rpmio.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmio.h include/rpm/rpmio.h
-BUILT_SOURCES += include/rpm/rpmio.h
-CLEANFILES += include/rpm/rpmio.h
-include/rpm/rpmurl.h: rpmio/rpmurl.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmurl.h include/rpm/rpmurl.h
-BUILT_SOURCES += include/rpm/rpmurl.h
-CLEANFILES += include/rpm/rpmurl.h
-include/rpm/rpmmacro.h: rpmio/rpmmacro.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmmacro.h include/rpm/rpmmacro.h
-BUILT_SOURCES += include/rpm/rpmmacro.h
-CLEANFILES += include/rpm/rpmmacro.h
-include/rpm/rpmlog.h: rpmio/rpmlog.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmlog.h include/rpm/rpmlog.h
-BUILT_SOURCES += include/rpm/rpmlog.h
-CLEANFILES += include/rpm/rpmlog.h
-include/rpm/rpmpgp.h: rpmio/rpmpgp.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmpgp.h include/rpm/rpmpgp.h
-BUILT_SOURCES += include/rpm/rpmpgp.h
-CLEANFILES += include/rpm/rpmpgp.h
-include/rpm/rpmsq.h: rpmio/rpmsq.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmsq.h include/rpm/rpmsq.h
-BUILT_SOURCES += include/rpm/rpmsq.h
-CLEANFILES += include/rpm/rpmsq.h
-include/rpm/rpmstring.h: rpmio/rpmstring.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmstring.h include/rpm/rpmstring.h
-BUILT_SOURCES += include/rpm/rpmstring.h
-CLEANFILES += include/rpm/rpmstring.h
-include/rpm/rpmstrpool.h: rpmio/rpmstrpool.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmstrpool.h include/rpm/rpmstrpool.h
-BUILT_SOURCES += include/rpm/rpmstrpool.h
-CLEANFILES += include/rpm/rpmstrpool.h
-include/rpm/rpmsw.h: rpmio/rpmsw.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmsw.h include/rpm/rpmsw.h
-BUILT_SOURCES += include/rpm/rpmsw.h
-CLEANFILES += include/rpm/rpmsw.h
-include/rpm/rpmfileutil.h: rpmio/rpmfileutil.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmfileutil.h include/rpm/rpmfileutil.h
-BUILT_SOURCES += include/rpm/rpmfileutil.h
-CLEANFILES += include/rpm/rpmfileutil.h
-include/rpm/rpmutil.h: rpmio/rpmutil.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmutil.h include/rpm/rpmutil.h
-BUILT_SOURCES += include/rpm/rpmutil.h
-CLEANFILES += include/rpm/rpmutil.h
-include/rpm/rpmkeyring.h: rpmio/rpmkeyring.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmkeyring.h include/rpm/rpmkeyring.h
-BUILT_SOURCES += include/rpm/rpmkeyring.h
-CLEANFILES += include/rpm/rpmkeyring.h
-include/rpm/rpmbase64.h: rpmio/rpmbase64.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmbase64.h include/rpm/rpmbase64.h
-BUILT_SOURCES += include/rpm/rpmbase64.h
-CLEANFILES += include/rpm/rpmbase64.h
-include/rpm/rpmver.h: rpmio/rpmver.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmver.h include/rpm/rpmver.h
-BUILT_SOURCES += include/rpm/rpmver.h
-CLEANFILES += include/rpm/rpmver.h
-include/rpm/header.h: lib/header.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/header.h include/rpm/header.h
-BUILT_SOURCES += include/rpm/header.h
-CLEANFILES += include/rpm/header.h
-include/rpm/rpmdb.h: lib/rpmdb.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmdb.h include/rpm/rpmdb.h
-BUILT_SOURCES += include/rpm/rpmdb.h
-CLEANFILES += include/rpm/rpmdb.h
-include/rpm/rpmcallback.h: lib/rpmcallback.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmcallback.h include/rpm/rpmcallback.h
-BUILT_SOURCES += include/rpm/rpmcallback.h
-CLEANFILES += include/rpm/rpmcallback.h
-include/rpm/rpmcli.h: lib/rpmcli.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmcli.h include/rpm/rpmcli.h
-BUILT_SOURCES += include/rpm/rpmcli.h
-CLEANFILES += include/rpm/rpmcli.h
-include/rpm/rpmlib.h: lib/rpmlib.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmlib.h include/rpm/rpmlib.h
-BUILT_SOURCES += include/rpm/rpmlib.h
-CLEANFILES += include/rpm/rpmlib.h
-include/rpm/rpmds.h: lib/rpmds.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmds.h include/rpm/rpmds.h
-BUILT_SOURCES += include/rpm/rpmds.h
-CLEANFILES += include/rpm/rpmds.h
-include/rpm/rpmfi.h: lib/rpmfi.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmfi.h include/rpm/rpmfi.h
-BUILT_SOURCES += include/rpm/rpmfi.h
-CLEANFILES += include/rpm/rpmfi.h
-include/rpm/rpmfiles.h: lib/rpmfiles.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmfiles.h include/rpm/rpmfiles.h
-BUILT_SOURCES += include/rpm/rpmfiles.h
-CLEANFILES += include/rpm/rpmfiles.h
-include/rpm/rpmpol.h: lib/rpmpol.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmpol.h include/rpm/rpmpol.h
-BUILT_SOURCES += include/rpm/rpmpol.h
-CLEANFILES += include/rpm/rpmpol.h
-include/rpm/rpmps.h: lib/rpmps.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmps.h include/rpm/rpmps.h
-BUILT_SOURCES += include/rpm/rpmps.h
-CLEANFILES += include/rpm/rpmps.h
-include/rpm/rpmprob.h: lib/rpmprob.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmprob.h include/rpm/rpmprob.h
-BUILT_SOURCES += include/rpm/rpmprob.h
-CLEANFILES += include/rpm/rpmprob.h
-include/rpm/rpmtag.h: lib/rpmtag.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmtag.h include/rpm/rpmtag.h
-BUILT_SOURCES += include/rpm/rpmtag.h
-CLEANFILES += include/rpm/rpmtag.h
-include/rpm/rpmtd.h: lib/rpmtd.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmtd.h include/rpm/rpmtd.h
-BUILT_SOURCES += include/rpm/rpmtd.h
-CLEANFILES += include/rpm/rpmtd.h
-include/rpm/rpmte.h: lib/rpmte.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmte.h include/rpm/rpmte.h
-BUILT_SOURCES += include/rpm/rpmte.h
-CLEANFILES += include/rpm/rpmte.h
-include/rpm/rpmts.h: lib/rpmts.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmts.h include/rpm/rpmts.h
-BUILT_SOURCES += include/rpm/rpmts.h
-CLEANFILES += include/rpm/rpmts.h
-include/rpm/rpmtypes.h: lib/rpmtypes.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmtypes.h include/rpm/rpmtypes.h
-BUILT_SOURCES += include/rpm/rpmtypes.h
-CLEANFILES += include/rpm/rpmtypes.h
-include/rpm/rpmarchive.h: lib/rpmarchive.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmarchive.h include/rpm/rpmarchive.h
-BUILT_SOURCES += include/rpm/rpmarchive.h
-CLEANFILES += include/rpm/rpmarchive.h
-include/rpm/rpmsign.h: sign/rpmsign.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/sign/rpmsign.h include/rpm/rpmsign.h
-BUILT_SOURCES += include/rpm/rpmsign.h
-CLEANFILES += include/rpm/rpmsign.h
-include/rpm/rpmbuild.h: build/rpmbuild.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/build/rpmbuild.h include/rpm/rpmbuild.h
-BUILT_SOURCES += include/rpm/rpmbuild.h
-CLEANFILES += include/rpm/rpmbuild.h
-include/rpm/rpmfc.h: build/rpmfc.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/build/rpmfc.h include/rpm/rpmfc.h
-BUILT_SOURCES += include/rpm/rpmfc.h
-CLEANFILES += include/rpm/rpmfc.h
-include/rpm/rpmspec.h: build/rpmspec.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/build/rpmspec.h include/rpm/rpmspec.h
-BUILT_SOURCES += include/rpm/rpmspec.h
-CLEANFILES += include/rpm/rpmspec.h
diff --git a/python/Makefile.am b/python/Makefile.am
index 8f272dcdb..ec3608134 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = @RPMCFLAGS@
 
 EXTRA_DIST = rpm/__init__.py rpm/transaction.py
 
-AM_CPPFLAGS = -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_srcdir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/python
 AM_CPPFLAGS += @PYTHON_CFLAGS@
 
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 710ef1ebd..f8ff2e0f3 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include/
 AM_CPPFLAGS += @WITH_OPENSSL_INCLUDE@
 AM_CPPFLAGS += @WITH_LIBGCRYPT_INCLUDE@
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
diff --git a/sign/Makefile.am b/sign/Makefile.am
index ae3df2a86..9fc6ce7f9 100644
--- a/sign/Makefile.am
+++ b/sign/Makefile.am
@@ -3,7 +3,7 @@
 include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/include/
 AM_CPPFLAGS += @WITH_POPT_INCLUDE@
 AM_CPPFLAGS += -I$(top_srcdir)/misc