diff --git a/build.c b/build.c index 581fbd5..826e8b9 100644 --- a/build.c +++ b/build.c @@ -4,8 +4,8 @@ #include "system.h" -#include -#include +#include "rpmcli.h" +#include "rpmbuild.h" #include "build.h" #include "debug.h" diff --git a/build/build.c b/build/build.c index 18d13b7..e392fc9 100644 --- a/build/build.c +++ b/build/build.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "debug.h" diff --git a/build/expression.c b/build/expression.c index 8921c32..92773f5 100644 --- a/build/expression.c +++ b/build/expression.c @@ -13,8 +13,8 @@ #include "system.h" -#include -#include +#include "rpmbuild.h" +#include "rpmlib.h" #include "debug.h" diff --git a/build/files.c b/build/files.c index 0429d43..97226e2 100644 --- a/build/files.c +++ b/build/files.c @@ -11,8 +11,8 @@ #include #include /* getOutputFrom() */ -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "buildio.h" diff --git a/build/myftw.c b/build/myftw.c index 65199ac..64c8099 100644 --- a/build/myftw.c +++ b/build/myftw.c @@ -24,7 +24,7 @@ Cambridge, MA 02139, USA. */ #include "system.h" -#include +#include "rpmio.h" #ifndef NAMLEN #define NAMLEN(a) strlen((a)->d_name) diff --git a/build/pack.c b/build/pack.c index f378779..4b09d0c 100644 --- a/build/pack.c +++ b/build/pack.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "buildio.h" #include "misc.h" diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 4ba0218..693b3e4 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "debug.h" /*@access FD_t @*/ /* compared with NULL */ diff --git a/build/parsePrep.c b/build/parsePrep.c index 1728abc..9665fe1 100644 --- a/build/parsePrep.c +++ b/build/parsePrep.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "debug.h" /*@access StringBuf @*/ /* compared with NULL */ diff --git a/build/parseSpec.c b/build/parseSpec.c index 2fa374b..0e0f376 100644 --- a/build/parseSpec.c +++ b/build/parseSpec.c @@ -8,8 +8,8 @@ /*@unchecked@*/ static int _debug = 0; -#include -#include +#include "rpmio_internal.h" +#include "rpmbuild.h" #include "debug.h" /*@access FD_t @*/ /* compared with NULL */ diff --git a/build/poptBT.c b/build/poptBT.c index d78938a..0793917 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmcli.h" +#include "rpmbuild.h" #include "build.h" #include "debug.h" diff --git a/lib/depends.c b/lib/depends.c index 5c36423..d28b44e 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -8,8 +8,8 @@ #include "system.h" -#include -#include /* XXX for rpmExpand() */ +#include "rpmlib.h" +#include "rpmmacro.h" /* XXX for rpmExpand() */ #include "depends.h" #include "rpmdb.h" /* XXX response cache needs dbiOpen et al. */ diff --git a/lib/formats.c b/lib/formats.c index 91fb26d..523e571 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -3,8 +3,8 @@ */ #include "system.h" -#include -#include /* XXX for %_i18ndomains */ +#include "rpmlib.h" +#include "rpmmacro.h" /* XXX for %_i18ndomains */ #include "rpmpgp.h" #include "manifest.h" #include "misc.h" diff --git a/lib/fs.c b/lib/fs.c index a1e0f5d..bf09f69 100644 --- a/lib/fs.c +++ b/lib/fs.c @@ -4,8 +4,8 @@ */ #include "system.h" -#include -#include /* XXX for rpmGetPath */ +#include "rpmlib.h" +#include "rpmmacro.h" /* XXX for rpmGetPath */ #include "debug.h" /*@-usereleased -onlytrans@*/ diff --git a/lib/manifest.c b/lib/manifest.c index 287b4d3..d821379 100644 --- a/lib/manifest.c +++ b/lib/manifest.c @@ -4,8 +4,8 @@ #include "system.h" -#include -#include +#include "rpmio_internal.h" +#include "rpmlib.h" #include "stringbuf.h" #include "manifest.h" diff --git a/lib/misc.c b/lib/misc.c index e9d6d1e..76f27c4 100644 --- a/lib/misc.c +++ b/lib/misc.c @@ -10,9 +10,9 @@ static int _debug = 0; const char * RPMVERSION = VERSION; #include "rpmio_internal.h" -#include -#include -#include /* XXX for rpmGetPath */ +#include "rpmlib.h" +#include "rpmurl.h" +#include "rpmmacro.h" /* XXX for rpmGetPath */ #include "misc.h" #include "debug.h" diff --git a/lib/package.c b/lib/package.c index 861055c..d5f4ef6 100644 --- a/lib/package.c +++ b/lib/package.c @@ -6,7 +6,7 @@ #include -#include +#include "rpmlib.h" #include "misc.h" #include "rpmlead.h" diff --git a/lib/poptI.c b/lib/poptI.c index 07638d2..c7a6a5a 100644 --- a/lib/poptI.c +++ b/lib/poptI.c @@ -5,7 +5,7 @@ #include "system.h" -#include +#include "rpmcli.h" #include "debug.h" diff --git a/lib/poptK.c b/lib/poptK.c index 572e323..b0dccb0 100644 --- a/lib/poptK.c +++ b/lib/poptK.c @@ -5,7 +5,7 @@ #include "system.h" -#include +#include "rpmcli.h" #include "debug.h" diff --git a/lib/poptQV.c b/lib/poptQV.c index 0c94414..831d2af 100644 --- a/lib/poptQV.c +++ b/lib/poptQV.c @@ -5,8 +5,8 @@ #include "system.h" -#include -#include +#include "rpmcli.h" +#include "rpmbuild.h" #include "debug.h" diff --git a/lib/problems.c b/lib/problems.c index 1de912b..fc8cabe 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -4,7 +4,7 @@ #include "system.h" -#include +#include "rpmlib.h" #include "depends.h" #include "misc.h" diff --git a/lib/psm.c b/lib/psm.c index 0c8efe9..4a2e676 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -6,8 +6,8 @@ #include "system.h" #include "psm.h" -#include -#include +#include "rpmmacro.h" +#include "rpmurl.h" #include "depends.h" diff --git a/lib/query.c b/lib/query.c index 7e9f8c8..50e67fe 100644 --- a/lib/query.c +++ b/lib/query.c @@ -11,8 +11,8 @@ /*@=incondefs@*/ #endif -#include -#include +#include "rpmcli.h" +#include "rpmbuild.h" #include "manifest.h" #include "debug.h" diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c index 327937e..3867a26 100644 --- a/lib/rpmchecksig.c +++ b/lib/rpmchecksig.c @@ -5,7 +5,7 @@ #include "system.h" -#include +#include "rpmcli.h" #include "rpmlead.h" #include "signature.h" diff --git a/lib/rpminstall.c b/lib/rpminstall.c index bc70a91..4af7519 100644 --- a/lib/rpminstall.c +++ b/lib/rpminstall.c @@ -4,7 +4,7 @@ #include "system.h" -#include +#include "rpmcli.h" #include "manifest.h" #include "misc.h" /* XXX for rpmGlob() */ diff --git a/lib/rpmlead.c b/lib/rpmlead.c index 9a19e8b..498cdae 100644 --- a/lib/rpmlead.c +++ b/lib/rpmlead.c @@ -10,7 +10,7 @@ #include -#include +#include "rpmlib.h" #include "rpmlead.h" #include "debug.h" diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c index 0ff73a1..ebe85b8 100644 --- a/lib/rpmlibprov.c +++ b/lib/rpmlibprov.c @@ -4,7 +4,7 @@ #include "system.h" -#include +#include "rpmlib.h" #include "debug.h" static struct rpmlibProvides_s { diff --git a/lib/rpmrc.c b/lib/rpmrc.c index 48cee8c..fb3abe9 100644 --- a/lib/rpmrc.c +++ b/lib/rpmrc.c @@ -13,8 +13,8 @@ #define __power_pc() 0 #endif -#include -#include +#include "rpmlib.h" +#include "rpmmacro.h" #include "misc.h" #include "debug.h" diff --git a/lib/rpmvercmp.c b/lib/rpmvercmp.c index 95b6f20..b4283aa 100644 --- a/lib/rpmvercmp.c +++ b/lib/rpmvercmp.c @@ -4,7 +4,7 @@ #include "system.h" -#include +#include "rpmlib.h" #include "debug.h" diff --git a/lib/signature.c b/lib/signature.c index a1fff6c..27d0125 100644 --- a/lib/signature.c +++ b/lib/signature.c @@ -14,8 +14,8 @@ #include "system.h" #include "rpmio_internal.h" -#include -#include /* XXX for rpmGetPath() */ +#include "rpmlib.h" +#include "rpmmacro.h" /* XXX for rpmGetPath() */ #include "md5.h" #include "misc.h" /* XXX for dosetenv() and makeTempFile() */ diff --git a/lib/tagName.c b/lib/tagName.c index 11dc044..8cb035a 100644 --- a/lib/tagName.c +++ b/lib/tagName.c @@ -4,7 +4,7 @@ #include "system.h" -#include +#include "rpmlib.h" #include "debug.h" const char *const tagName(int tag) diff --git a/lib/transaction.c b/lib/transaction.c index 1d63f21..37fdbac 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -4,7 +4,7 @@ #include "system.h" -#include /* XXX for rpmExpand */ +#include "rpmmacro.h" /* XXX for rpmExpand */ #include "psm.h" diff --git a/lib/verify.c b/lib/verify.c index 38b578d..6fb1277 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -6,7 +6,7 @@ #include "system.h" #include "psm.h" -#include +#include "rpmcli.h" #include "ugid.h" #include "misc.h" /* XXX for uidToUname() and gnameToGid() */ diff --git a/python/upgrade.c b/python/upgrade.c index d8488bc..6b1d434 100644 --- a/python/upgrade.c +++ b/python/upgrade.c @@ -11,7 +11,7 @@ #include /* XXX rpmio.h */ #include /* XXX rpmio.h */ -#include +#include "rpmlib.h" #include "hash.h" #include "upgrade.h" diff --git a/rpmdb/db1.c b/rpmdb/db1.c index 081aa66..beade25 100644 --- a/rpmdb/db1.c +++ b/rpmdb/db1.c @@ -9,10 +9,10 @@ #define _mymemset(_a, _b, _c) -#include -#include -#include /* XXX rpmGenPath */ -#include /* XXX urlGetPath */ +#include "rpmio_internal.h" +#include "rpmlib.h" +#include "rpmmacro.h" /* XXX rpmGenPath */ +#include "rpmurl.h" /* XXX urlGetPath */ #include "falloc.h" #include "misc.h" diff --git a/rpmdb/db3.c b/rpmdb/db3.c index 4fdbb25..29f6d53 100644 --- a/rpmdb/db3.c +++ b/rpmdb/db3.c @@ -25,9 +25,9 @@ typedef int int32_t; #include -#include -#include -#include /* XXX urlPath proto */ +#include "rpmlib.h" +#include "rpmmacro.h" +#include "rpmurl.h" /* XXX urlPath proto */ #include "rpmdb.h" diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c index 4e8294e..3ff323b 100644 --- a/rpmdb/dbconfig.c +++ b/rpmdb/dbconfig.c @@ -17,8 +17,8 @@ typedef int int32_t; #include -#include -#include +#include "rpmlib.h" +#include "rpmmacro.h" #include "rpmdb.h" #include "debug.h" diff --git a/rpmdb/falloc.c b/rpmdb/falloc.c index 469f015..162c42e 100644 --- a/rpmdb/falloc.c +++ b/rpmdb/falloc.c @@ -12,9 +12,9 @@ */ #include "system.h" -#include -#include -#include +#include "rpmio_internal.h" +#include "rpmmessages.h" +#include "rpmerr.h" #include "falloc.h" #include "debug.h" diff --git a/rpmdb/fprint.c b/rpmdb/fprint.c index d6da7cf..60b39ab 100644 --- a/rpmdb/fprint.c +++ b/rpmdb/fprint.c @@ -4,8 +4,8 @@ #include "system.h" -#include -#include /* XXX for rpmCleanPath */ +#include "rpmdb.h" +#include "rpmmacro.h" /* XXX for rpmCleanPath */ #include "fprint.h" #include "debug.h" diff --git a/rpmdb/poptDB.c b/rpmdb/poptDB.c index ef6cc2c..36323ef 100644 --- a/rpmdb/poptDB.c +++ b/rpmdb/poptDB.c @@ -5,7 +5,7 @@ #include "system.h" -#include +#include "rpmcli.h" #include "debug.h" diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 36fcf97..f03195d 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -29,7 +29,7 @@ extern void regfree (/*@only@*/ regex_t *preg) /*@=declundef =exportheader @*/ #endif -#include +#include "rpmcli.h" #include "rpmdb.h" #include "fprint.h" diff --git a/rpmdb/rpmhash.c b/rpmdb/rpmhash.c index 751fd90..a2540f9 100644 --- a/rpmdb/rpmhash.c +++ b/rpmdb/rpmhash.c @@ -4,7 +4,7 @@ */ #include "system.h" -#include +#include "rpmlib.h" #include "rpmhash.h" #include "debug.h" diff --git a/rpmio/macro.c b/rpmio/macro.c index 95fb238..1b589ce 100644 --- a/rpmio/macro.c +++ b/rpmio/macro.c @@ -42,13 +42,13 @@ typedef FILE * FD_t; #else -#include -#include -#include +#include "rpmio_internal.h" +#include "rpmmessages.h" +#include "rpmerr.h" #endif -#include +#include "rpmmacro.h" #include "debug.h" diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c index c39dfdc..244cdd1 100644 --- a/rpmio/rpmio.c +++ b/rpmio/rpmio.c @@ -64,7 +64,7 @@ static int inet_aton(const char *cp, struct in_addr *inp) #include "dns.h" #endif -#include +#include "rpmio_internal.h" #undef fdFileno #undef fdOpen #undef fdRead diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c index 7669f80..3de6250 100644 --- a/rpmio/rpmrpc.c +++ b/rpmio/rpmrpc.c @@ -4,7 +4,7 @@ */ #include "system.h" -#include +#include "rpmio_internal.h" #include #include "ugid.h" #include "debug.h" diff --git a/rpmio/url.c b/rpmio/url.c index 4c2e3da..1e956b0 100644 --- a/rpmio/url.c +++ b/rpmio/url.c @@ -7,9 +7,9 @@ #include -#include -#include -#include +#include "rpmmacro.h" +#include "rpmmessages.h" +#include "rpmio_internal.h" #include "debug.h" diff --git a/rpmqv.c b/rpmqv.c index 54e3d1c..3de0534 100755 --- a/rpmqv.c +++ b/rpmqv.c @@ -10,8 +10,8 @@ #define IAM_RPMK #endif -#include -#include +#include "rpmcli.h" +#include "rpmbuild.h" #define POPT_NODEPS 1025 #define POPT_FORCE 1026 diff --git a/tools/dump.c b/tools/dump.c index 584372f..fc8a814 100644 --- a/tools/dump.c +++ b/tools/dump.c @@ -1,6 +1,6 @@ #include "system.h" -#include +#include "rpmlib.h" #include "header_internal.h" #include "debug.h" diff --git a/tools/dumpdb.c b/tools/dumpdb.c index 66fdd64..6f52730 100644 --- a/tools/dumpdb.c +++ b/tools/dumpdb.c @@ -1,6 +1,6 @@ #include "system.h" -#include +#include "rpmlib.h" #include "header_internal.h" #include "debug.h" diff --git a/tools/rpmsort.c b/tools/rpmsort.c index a2faa18..558dc57 100644 --- a/tools/rpmsort.c +++ b/tools/rpmsort.c @@ -1,8 +1,8 @@ #include "system.h" -#include -#include -#include +#include "rpmlib.h" +#include "rpmmacro.h" +#include "rpmurl.h" #include "depends.h"