rpmlib.h mass eviction

- explicitly include what's really needed instead
- document remaining uses

build.c

@@ -5,6 +5,8 @@
 #include "system.h"
 
 #include <rpm/rpmcli.h>
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmrc, MACHTABLE .. */
 #include <rpm/rpmbuild.h>
 
 #include <rpm/rpmps.h>

build/pack.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmlib.h>			/* RPMSIGTAG*, rpmReadPackageFile */
 #include "rpmio/rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
 #include <rpm/rpmbuild.h>
 

build/parseChangelog.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"

build/parseDescription.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"

build/parsePreamble.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>

build/parsePrep.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>

build/parseReqs.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"

build/parseScript.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"

build/parseSpec.c

@@ -5,6 +5,8 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* RPM_MACHTABLE & related */
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmts.h>

build/reqprov.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include "debug.h"
 

build/rpmfc.c

@@ -2,6 +2,7 @@
 
 #include <signal.h>
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/argv.h>
 #include <rpm/rpmfc.h>

build/spec.c

@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "build/buildio.h"
+#include <rpm/rpmtag.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmfi.h>
 #include <rpm/rpmts.h>

lib/depends.c

@@ -6,6 +6,8 @@
 
 #include <rpm/rpmcli.h>		/* XXX rpmcliPackagesTotal */
 
+#include <rpm/rpmlib.h>			/* rpmVersionCompare, rpmlib provides */
+#include <rpm/rpmtag.h>
 #include <rpm/rpmmacro.h>		/* XXX rpmExpand("%{_dependency_whiteout}" */
 #include <rpm/rpmlog.h>
 

lib/formats.c

@@ -4,7 +4,8 @@
 
 #include "system.h"
 #include "rpmio/digest.h"
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmGetFilesystem*() */
 #include <rpm/rpmds.h>
 #include <rpm/rpmmacro.h>	/* XXX for %_i18ndomains */
 

lib/fs.c

@@ -3,7 +3,7 @@
  */
 
 #include "system.h"
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmGetFilesystem*() prototypes */
 #include <rpm/rpmfileutil.h>	/* for rpmGetPath */
 #include <rpm/rpmlog.h>
 #include "debug.h"

lib/fsm.c

@@ -6,7 +6,6 @@
 #include "system.h"
 
 #include "rpmio/rpmio_internal.h"	/* fdGet/SetCpioPos, fdInit/FiniDigest */
-#include <rpm/rpmlib.h>
 
 #include "lib/cpio.h"
 

lib/idtx.c

@@ -1,7 +1,8 @@
 #include "system.h"
 
 #include <rpm/idtx.h>
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmReadPackageFile */
+#include <rpm/rpmtag.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmfileutil.h>

lib/legacy.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmfi.h>

lib/manifest.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
 

lib/misc.c

@@ -9,7 +9,6 @@ const char * RPMVERSION = VERSION;
 
 #include <rpm/rpmurl.h>
 #include <rpm/rpmmacro.h>	/* XXX for rpmGetPath */
-#include <rpm/rpmlib.h>
 #include <rpm/rpmlog.h>
 #include "lib/misc.h"
 #include "debug.h"

lib/misc.h

@@ -7,6 +7,7 @@
  */
 
 #include <string.h>
+#include <rpm/rpmtypes.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/package.c

@@ -8,8 +8,8 @@
 
 #include "rpmio/digest.h"
 #include "rpmio/rpmio_internal.h"	/* fd*Digest(), fd stats */
-#include <rpm/rpmlib.h>
 
+#include <rpm/rpmlib.h>			/* XXX RPMSIGTAG, other sig stuff */
 #include <rpm/rpmts.h>
 
 #include "lib/legacy.h"	/* XXX legacyRetrofit() */

lib/poptALL.c

@@ -7,6 +7,7 @@
 const char *__progname;
 
 #include <rpm/rpmcli.h>
+#include <rpm/rpmlib.h>		/* rpmEVR, rpmReadConfigFiles etc */
 #include <rpm/rpmgi.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>

lib/psm.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmvercmp and others */
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmurl.h>
 #include "rpmio/rpmlua.h"

lib/query.c

@@ -11,6 +11,7 @@
 
 #include <rpm/rpmcli.h>
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmfi.h>
 

lib/rpmal.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 
 #include <rpm/rpmal.h>
 #include <rpm/rpmds.h>

lib/rpmchecksig.c

@@ -5,6 +5,7 @@
 
 #include "system.h"
 
+#include <rpm/rpmlib.h>			/* RPMSIGTAG & related */
 #include <rpm/rpmpgp.h>
 #include "rpmio/rpmio_internal.h"	/* for fd*Digest() */
 #include <rpm/rpmcli.h>

lib/rpmcli.h

@@ -5,7 +5,8 @@
  * \file lib/rpmcli.h
  */
 
-#include <rpm/rpmlib.h>
+#include <popt.h>
+
 #include <rpm/rpmurl.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmcallback.h>

lib/rpmds.c

@@ -3,7 +3,8 @@
  */
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmvercmp */
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 

lib/rpmfi.c

@@ -5,7 +5,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 #include <rpm/rpmlog.h>
 
 #include "lib/cpio.h"	/* XXX CPIO_FOO */

lib/rpmfi_internal.h

@@ -1,6 +1,7 @@
 #ifndef _RPMFI_INTERNAL_H
 #define _RPMFI_INTERNAL_H
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmfi.h>
 #include "lib/fsm.h"		/* for FSM_t */
 

lib/rpmgi.c

@@ -3,7 +3,8 @@
  */
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmReadPackageFile */
 #include <rpm/rpmte.h>		/* XXX rpmElementType */
 #include <rpm/rpmts.h>
 

lib/rpminstall.c

@@ -6,6 +6,8 @@
 
 #include <rpm/rpmcli.h>
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmReadPackageFile, vercmp etc */
 #include <rpm/rpmdb.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmts.h>

lib/rpmlead.c

@@ -6,8 +6,7 @@
 
 #include <netinet/in.h>
 
-#include <rpm/rpmlib.h>
-
+#include <rpm/rpmlib.h>		/* rpmGetOs/ArchInfo() */
 #include "lib/signature.h"
 #include "lib/rpmlead.h"
 #include "lib/legacy.h"

lib/rpmlead.h

@@ -21,7 +21,6 @@ extern "C" {
 
 typedef struct rpmlead_s * rpmlead;
 
-#include <rpm/rpmlib.h>
 
 /** \ingroup lead
  * Initialize a lead structure

lib/rpmlibprov.c

@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
-
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmGetRpmlibProvides() & co protos */
 #include <rpm/rpmds.h>
 
 #include "debug.h"

lib/rpmlock.c

@@ -1,7 +1,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>

lib/rpmrc.c

@@ -13,8 +13,8 @@
 #define __power_pc() 0
 #endif
 
+#include <rpm/rpmlib.h>			/* RPM_MACTABLE*, Rc-prototypes */
 #include "rpmio/rpmio_internal.h"	/* XXX for rpmioSlurp */
-#include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmstring.h>

lib/rpmte.c

@@ -3,8 +3,9 @@
  * Routine(s) to handle an "rpmte"  transaction element.
  */
 #include "system.h"
-#include <rpm/rpmlib.h>
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* RPM_MACHTABLE_* */
 #include <rpm/rpmds.h>
 #include <rpm/rpmfi.h>
 

lib/rpmts.c

@@ -4,9 +4,10 @@
  */
 #include "system.h"
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>			/* rpmReadPackage etc */
 #include <rpm/rpmurl.h>
 #include "rpmio/digest.h"
-#include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>		/* rpmtsOpenDB() needs rpmGetPath */
 #include <rpm/rpmstring.h>

lib/rpmvercmp.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmvercmp proto */
 #include <rpm/rpmstring.h>
 
 #include "debug.h"

lib/signature.c

@@ -4,8 +4,11 @@
 
 #include "system.h"
 
+#include <popt.h>
+
 #include "rpmio/digest.h"
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* XXX RPMSIGTAG* & related */
 #include <rpm/rpmmacro.h>	/* XXX for rpmGetPath() */
 #include <rpm/rpmdb.h>
 #include <rpm/rpmstring.h>

lib/tcpu.c

@@ -1,5 +1,8 @@
 #include "system.h"
-#include <rpm/rpmlib.h>
+
+#include <popt.h>
+
+#include <rpm/rpmio.h>
 #include <rpm/rpmmacro.h>
 #include "debug.h"
 

lib/tds.c

@@ -1,7 +1,6 @@
 #include "system.h"
 
-#include <rpm/rpmlib.h>
-
+#include <rpm/rpmtag.h>
 #include <rpm/rpmds.h>
 
 #include "debug.h"

lib/tgi.c

@@ -1,5 +1,6 @@
 #include "system.h"
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmgi.h>
 #include <rpm/rpmcli.h>
 

lib/tplatform.c

@@ -1,7 +1,6 @@
 #include "system.h"
 
 #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
-#include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmio.h>
 

lib/transaction.c

@@ -3,8 +3,8 @@
  */
 
 #include "system.h"
-#include <rpm/rpmlib.h>
 
+#include <rpm/rpmlib.h>		/* rpmMachineScore, rpmReadPackageFile */
 #include <rpm/rpmmacro.h>	/* XXX for rpmExpand */
 #include <rpm/rpmlog.h>
 

lib/trb.c

@@ -1,5 +1,6 @@
 #include "system.h"
 #include <rpm/rpmcli.h>
+#include <rpm/rpmlib.h>	/* rpmReadConfigFiles */
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 

lib/tthread.c

@@ -2,7 +2,7 @@
 
 #include <pthread.h>
 #include <assert.h>
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>	/* rpmReadConfigFiles, rpmReadPackageFile */
 #include <rpm/rpmts.h>
 #include <rpm/rpmsq.h>	/* XXX for _rpmsq_debug */
 #include <rpm/rpmio.h>

lib/verify.c

@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include <rpm/rpmcli.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmlog.h>
 
 #include "lib/psm.h"

python/header-py.c

@@ -4,7 +4,8 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmvercmp */
+#include <rpm/rpmtag.h>
 #include <rpm/rpmstring.h>
 
 #include "lib/legacy.h"	/* XXX expand/compressFilelist(), providePackageNVR() */

python/header-py.h

@@ -1,7 +1,7 @@
 #ifndef RPMPYTHON_HEADER
 #define RPMPYTHON_HEADER
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtypes.h>
 
 /** \ingroup py_c
  * \file python/header-py.h

python/rpmal-py.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 
 #include "rpmal-py.h"
 #include "rpmds-py.h"

python/rpmdb-py.c

@@ -4,8 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
-
+#include <rpm/rpmtag.h>
 #include "rpmdb-py.h"
 #include "rpmmi-py.h"
 #include "header-py.h"

python/rpmds-py.c

@@ -4,8 +4,9 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmstring.h>
+#include <rpm/rpmlib.h>		/* rpmvercmp */
 
 #include "header-py.h"
 #include "rpmds-py.h"

python/rpmfi-py.c

@@ -4,8 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
-
+#include <rpm/rpmtag.h>
 #include "header-py.h"
 #include "rpmfi-py.h"
 

python/rpmmi-py.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 #include <rpm/rpmdb.h>
 
 #include "rpmmi-py.h"

python/rpmmodule.c

@@ -4,6 +4,8 @@
 
 #include "system.h"
 
+#include <rpm/rpmlib.h>		/* rpmMachineScore, rpmReadConfigFiles */
+#include <rpm/rpmtag.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmsq.h>
 #include <rpm/rpmlog.h>

python/rpmps-py.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 
 #include "rpmps-py.h"
 

python/rpmte-py.c

@@ -4,7 +4,6 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
 
 #include "header-py.h"	/* XXX tagNumFromPyObject */
 #include "rpmds-py.h"

python/rpmts-py.c

@@ -4,7 +4,8 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>	/* rpmReadPackageFile, headerCheck */
+#include <rpm/rpmtag.h>
 #include <rpm/rpmpgp.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmbuild.h>

rpm2cpio.c

@@ -3,7 +3,9 @@
 #include "system.h"
 const char *__progname;
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmlib.h>		/* rpmReadPackageFile .. */
+#include <rpm/rpmtag.h>
+#include <rpm/rpmio.h>
 #include <rpm/rpmpgp.h>
 
 #include <rpm/rpmts.h>

rpmdb/db3.c

@@ -10,7 +10,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 #include <sys/ipc.h>
 #endif
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmurl.h>		/* XXX urlPath proto */
 #include <rpm/rpmfileutil.h>	/* rpmioMkPath */

rpmdb/dbconfig.c

@@ -4,7 +4,9 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <popt.h>
+
+#include <rpm/rpmtag.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>

rpmdb/hdrNVR.c

@@ -3,7 +3,10 @@
  */
 
 #include "system.h"
-#include <rpm/rpmlib.h>
+
+#include <rpm/rpmtypes.h>
+#include <rpm/rpmtag.h>
+
 #include "debug.h"
 
 int headerNVR(Header h, const char **np, const char **vp, const char **rp)

rpmdb/rpmdb.c

@@ -14,6 +14,7 @@
 
 #include <regex.h>
 
+#include <rpm/rpmtag.h>
 #include <rpm/rpmurl.h>
 #include <rpm/rpmpgp.h>
 #include <rpm/rpmpgp.h>

rpmdb/rpmdb.h

@@ -6,7 +6,7 @@
  * Access RPM indices using Berkeley DB interface(s).
  */
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmsw.h>
 
 #ifdef __cplusplus

rpmdb/rpmhash.c

@@ -4,7 +4,6 @@
  */
 
 #include "system.h"
-#include <rpm/rpmlib.h>
 #include "rpmdb/rpmhash.h"
 #include "debug.h"
 

rpmdb/sqlite.c

@@ -26,7 +26,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmurl.h>     	/* XXX urlPath proto */

rpmdb/tagname.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmstring.h>
 #include "debug.h"
 

rpmqv.c

@@ -12,6 +12,7 @@ const char *__progname;
 #endif
 
 #include <rpm/rpmcli.h>
+#include <rpm/rpmlib.h>			/* RPMSIGTAG, rpmReadPackageFile .. */
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 

tools/convertdb1.c

@@ -7,7 +7,7 @@ const char *__progname;
 #include <string.h>
 #endif
 
-#include <rpm/rpmlib.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmio.h>
 #include <rpm/rpmmacro.h>

tools/dump.c

@@ -1,7 +1,6 @@
 #include "system.h"
 const char *__progname;
 
-#include <rpm/rpmlib.h>
 #include "rpmdb/header_internal.h"
 #include "debug.h"
 

tools/dumpdb.c

@@ -1,9 +1,10 @@
 #include "system.h"
 const char *__progname;
 
-#include <rpm/rpmlib.h>
 #include "rpmdb/header_internal.h"
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>		/* rpmReadConfigFiles */
 #include <rpm/rpmdb.h>
 
 #include "debug.h"

tools/rpmcache.c

@@ -8,6 +8,8 @@ const char *__progname;
 #include <fnmatch.h>
 #include "rpmio/fts.h"
 
+#include <rpm/rpmtag.h>
+#include <rpm/rpmlib.h>	/* RPM_MACHTABLE, rpmReadPackageFile */
 #include <rpm/rpmcli.h>
 #include <rpm/rpmlog.h>
 

tools/rpmgraph.c

@@ -2,7 +2,7 @@
 const char *__progname;
 
 #include <rpm/rpmcli.h>
-
+#include <rpm/rpmlib.h>		/* rpmReadPackageFile */
 #include <rpm/rpmdb.h>
 #include <rpm/rpmps.h>
 #include <rpm/rpmte.h>

tools/rpminject.c

@@ -4,7 +4,7 @@ const char *__progname;
 #include <rpm/rpmbuild.h>
 #include "build/buildio.h"
 
-#include <rpm/header.h>
+#include <rpm/rpmtag.h>
 #include "lib/rpmlead.h"
 
 #include <err.h>	/* XXX !HAVE_ERR_H: get from misc */

tools/rpmsort.c

@@ -1,10 +1,13 @@
 #include "system.h"
 const char *__progname;
 
-#include <rpm/rpmlib.h>
-#include <rpm/rpmmacro.h>
-#include <rpm/rpmurl.h>
+#include <popt.h>
 
+#include <rpm/rpmlib.h>		/* rpmReadConfigFiles */
+#include <rpm/rpmfileutil.h>
+#include <rpm/rpmurl.h>
+#include <rpm/rpmio.h>
+#include <rpm/rpmtag.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmps.h>
 #include <rpm/rpmte.h>