summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/files.c1
-rw-r--r--lib/backend/sqlite.c1
-rw-r--r--lib/depends.c1
-rw-r--r--lib/fprint.c1
-rw-r--r--lib/headerfmt.c1
-rw-r--r--lib/manifest.c3
-rw-r--r--lib/poptI.c2
-rw-r--r--lib/poptQV.c2
-rw-r--r--lib/query.c1
-rw-r--r--lib/relocation.c1
-rw-r--r--lib/rpmal.c1
-rw-r--r--lib/rpmdb.c1
-rw-r--r--lib/rpmfiles.h1
-rw-r--r--lib/rpmfs.c3
-rw-r--r--lib/rpmgi.c1
-rw-r--r--lib/rpminstall.c2
-rw-r--r--lib/rpmlib.h1
-rw-r--r--lib/rpmlock.c1
-rw-r--r--lib/rpmtd.c1
-rw-r--r--lib/rpmte.c1
-rw-r--r--lib/rpmts.h1
-rw-r--r--lib/verify.c1
-rw-r--r--plugins/audit.c2
-rw-r--r--plugins/dbus_announce.c3
-rw-r--r--plugins/fsverity.c1
-rw-r--r--plugins/prioreset.c1
-rw-r--r--plugins/syslog.c2
-rw-r--r--python/rpmarchive-py.c1
-rw-r--r--python/rpmfi-py.c1
-rw-r--r--rpm.c1
-rw-r--r--rpm2archive.c2
-rw-r--r--rpm2cpio.c2
-rw-r--r--rpmio/expression.c3
-rw-r--r--rpmio/rpmfileutil.h1
-rw-r--r--rpmio/rpmlog.c1
-rw-r--r--tools/rpmgraph.c2
36 files changed, 40 insertions, 12 deletions
diff --git a/build/files.c b/build/files.c
index 0c8859f6c..e743f72c4 100644
--- a/build/files.c
+++ b/build/files.c
@@ -21,7 +21,6 @@
#include <elfutils/libdwelf.h>
#endif
-#include <rpm/rpmpgp.h>
#include <rpm/argv.h>
#include <rpm/rpmfc.h>
#include <rpm/rpmfileutil.h> /* rpmDoDigest() */
diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c
index c22a27019..31f77e845 100644
--- a/lib/backend/sqlite.c
+++ b/lib/backend/sqlite.c
@@ -6,6 +6,7 @@
#include <rpm/rpmlog.h>
#include <rpm/rpmfileutil.h>
#include <rpm/rpmmacro.h>
+#include <rpm/rpmstring.h>
#include "lib/rpmdb_internal.h"
#include "debug.h"
diff --git a/lib/depends.c b/lib/depends.c
index 5d16a178d..30234df3d 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -10,6 +10,7 @@
#include <rpm/rpmdb.h>
#include <rpm/rpmds.h>
#include <rpm/rpmfi.h>
+#include <rpm/rpmstring.h>
#include "lib/rpmts_internal.h"
#include "lib/rpmte_internal.h"
diff --git a/lib/fprint.c b/lib/fprint.c
index 1b4073618..26c440a44 100644
--- a/lib/fprint.c
+++ b/lib/fprint.c
@@ -5,6 +5,7 @@
#include "system.h"
#include <rpm/rpmfileutil.h> /* for rpmCleanPath */
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include <rpm/rpmsq.h>
diff --git a/lib/headerfmt.c b/lib/headerfmt.c
index c151c7ad5..971d16f2b 100644
--- a/lib/headerfmt.c
+++ b/lib/headerfmt.c
@@ -8,7 +8,6 @@
#include <rpm/header.h>
#include <rpm/rpmtag.h>
#include <rpm/rpmstring.h>
-#include <rpm/rpmpgp.h>
#include "lib/misc.h" /* format function protos */
#include "debug.h"
diff --git a/lib/manifest.c b/lib/manifest.c
index eba108885..7f4323735 100644
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -4,9 +4,12 @@
#include "system.h"
+#include <string.h>
+
#include <rpm/rpmlog.h>
#include <rpm/rpmfileutil.h>
#include <rpm/argv.h>
+#include <rpm/rpmstring.h>
#include "lib/manifest.h"
diff --git a/lib/poptI.c b/lib/poptI.c
index 26081777d..d40039156 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -5,6 +5,8 @@
#include "system.h"
+#include <string.h>
+
#include <rpm/rpmcli.h>
#include "debug.h"
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 9b6101009..36f3f692e 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -4,8 +4,10 @@
*/
#include "system.h"
+#include <string.h>
#include <rpm/rpmcli.h>
+#include <rpm/rpmstring.h>
#include "lib/rpmgi.h" /* XXX for giFlags */
#include "debug.h"
diff --git a/lib/query.c b/lib/query.c
index b81d8c770..ea2748cb4 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -17,6 +17,7 @@
#include <rpm/rpmsq.h>
#include <rpm/rpmlog.h>
#include <rpm/rpmfileutil.h> /* rpmCleanPath */
+#include <rpm/rpmstring.h>
#include "lib/rpmgi.h"
#include "lib/manifest.h"
diff --git a/lib/relocation.c b/lib/relocation.c
index 3ba4cfeab..1b92dc206 100644
--- a/lib/relocation.c
+++ b/lib/relocation.c
@@ -6,6 +6,7 @@
#include <rpm/rpmfileutil.h>
#include <rpm/rpmmacro.h>
#include <rpm/rpmlog.h>
+#include <rpm/rpmstring.h>
#include "lib/rpmfs.h"
#include "lib/misc.h"
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 758e4da84..2123664b6 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -7,6 +7,7 @@
#include <rpm/rpmte.h>
#include <rpm/rpmfi.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmstrpool.h>
#include "lib/rpmal.h"
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 2fa1f00fa..01d49a641 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -19,7 +19,6 @@
#include <rpm/rpmtypes.h>
#include <rpm/rpmurl.h>
#include <rpm/rpmpgp.h>
-#include <rpm/rpmpgp.h>
#include <rpm/rpmmacro.h>
#include <rpm/rpmsq.h>
#include <rpm/rpmstring.h>
diff --git a/lib/rpmfiles.h b/lib/rpmfiles.h
index e0adbd8af..15ab5ccfb 100644
--- a/lib/rpmfiles.h
+++ b/lib/rpmfiles.h
@@ -10,7 +10,6 @@
#include <unistd.h>
#include <rpm/rpmtypes.h>
-#include <rpm/rpmpgp.h>
/** \ingroup rpmfiles
* File types.
diff --git a/lib/rpmfs.c b/lib/rpmfs.c
index 7d807e06b..84887a004 100644
--- a/lib/rpmfs.c
+++ b/lib/rpmfs.c
@@ -1,3 +1,6 @@
+#include <stdlib.h>
+#include <string.h>
+
#include "system.h"
#include "lib/rpmfs.h"
#include "debug.h"
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index 5b5468d76..739b7cd19 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -4,6 +4,7 @@
#include "system.h"
#include <errno.h>
+#include <string.h>
#include <rpm/rpmtypes.h>
#include <rpm/rpmlib.h> /* rpmReadPackageFile */
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 302ec0ba1..3d35a181c 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -4,6 +4,8 @@
#include "system.h"
+#include <string.h>
+
#include <rpm/rpmcli.h>
#include <rpm/rpmtag.h>
#include <rpm/rpmlib.h> /* rpmReadPackageFile, vercmp etc */
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 72ee724e8..0879d04e5 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -12,7 +12,6 @@
#include <rpm/header.h>
#include <rpm/rpmtag.h>
#include <rpm/rpmds.h> /* XXX move rpmlib provides to rpmds instead */
-#include <rpm/rpmpgp.h>
#include <rpm/rpmver.h>
#ifdef _RPM_4_4_COMPAT
diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index 1d588b3c5..b889e79c3 100644
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -3,6 +3,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <string.h>
#include <rpm/rpmlog.h>
#include <rpm/rpmfileutil.h>
diff --git a/lib/rpmtd.c b/lib/rpmtd.c
index 41c6a50e8..e2f519418 100644
--- a/lib/rpmtd.c
+++ b/lib/rpmtd.c
@@ -2,7 +2,6 @@
#include <rpm/rpmtd.h>
#include <rpm/rpmstring.h>
-#include <rpm/rpmpgp.h>
#include <rpm/rpmstrpool.h>
#include "lib/misc.h" /* format function prototypes */
diff --git a/lib/rpmte.c b/lib/rpmte.c
index fe9782953..3663604e7 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -9,6 +9,7 @@
#include <rpm/rpmmacro.h>
#include <rpm/rpmds.h>
#include <rpm/rpmfi.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include <rpm/rpmdb.h>
#include <rpm/rpmlog.h>
diff --git a/lib/rpmts.h b/lib/rpmts.h
index eca179009..5c6844c14 100644
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -12,7 +12,6 @@
#include <rpm/rpmte.h>
#include <rpm/rpmps.h>
#include <rpm/rpmsw.h>
-#include <rpm/rpmpgp.h>
#include <rpm/rpmfi.h>
#include <rpm/rpmcallback.h>
diff --git a/lib/verify.c b/lib/verify.c
index 5b97fbf27..256c5bcf3 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -21,6 +21,7 @@
#include <rpm/rpmts.h>
#include <rpm/rpmdb.h>
#include <rpm/rpmfileutil.h>
+#include <rpm/rpmstring.h>
#include "lib/misc.h"
#include "lib/rpmchroot.h"
diff --git a/plugins/audit.c b/plugins/audit.c
index e2532267d..e821c2691 100644
--- a/plugins/audit.c
+++ b/plugins/audit.c
@@ -1,7 +1,9 @@
#include "system.h"
+#include <stdlib.h>
#include <libaudit.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include "lib/rpmplugin.h"
diff --git a/plugins/dbus_announce.c b/plugins/dbus_announce.c
index a82b23908..9e9b77bc9 100644
--- a/plugins/dbus_announce.c
+++ b/plugins/dbus_announce.c
@@ -1,7 +1,10 @@
#include "system.h"
+#include <stdlib.h>
+
#include <dbus/dbus.h>
#include <rpm/rpmlog.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include <rpm/rpmdb.h>
#include "lib/rpmplugin.h"
diff --git a/plugins/fsverity.c b/plugins/fsverity.c
index 1e7f38b38..40b66919e 100644
--- a/plugins/fsverity.c
+++ b/plugins/fsverity.c
@@ -18,6 +18,7 @@
#include <rpm/rpmlog.h>
#include <rpmio/rpmstring.h>
#include <rpmio/rpmmacro.h>
+#include <rpmio/rpmpgp.h>
#include "lib/rpmfs.h"
#include "lib/rpmplugin.h"
diff --git a/plugins/prioreset.c b/plugins/prioreset.c
index d4f158a3e..926b802e8 100644
--- a/plugins/prioreset.c
+++ b/plugins/prioreset.c
@@ -1,5 +1,6 @@
#include "system.h"
+#include <string.h>
#include <errno.h>
#include <sys/resource.h>
#if defined(__linux__)
diff --git a/plugins/syslog.c b/plugins/syslog.c
index 5f22f981c..056fc5ae6 100644
--- a/plugins/syslog.c
+++ b/plugins/syslog.c
@@ -1,7 +1,9 @@
#include "system.h"
+#include <stdlib.h>
#include <syslog.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include "lib/rpmplugin.h"
diff --git a/python/rpmarchive-py.c b/python/rpmarchive-py.c
index aa2a05194..626d868f2 100644
--- a/python/rpmarchive-py.c
+++ b/python/rpmarchive-py.c
@@ -1,7 +1,6 @@
#include "rpmsystem-py.h"
#include <rpm/rpmtypes.h>
-#include <rpm/rpmpgp.h>
#include "header-py.h"
#include "rpmfi-py.h"
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 90099ee20..3700008f7 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -1,7 +1,6 @@
#include "rpmsystem-py.h"
#include <rpm/rpmtypes.h>
-#include <rpm/rpmpgp.h>
#include "header-py.h"
#include "rpmfi-py.h"
diff --git a/rpm.c b/rpm.c
index 5482dd1de..f651c6c6d 100644
--- a/rpm.c
+++ b/rpm.c
@@ -4,6 +4,7 @@
#include <rpm/rpmlib.h> /* RPMSIGTAG, rpmReadPackageFile .. */
#include <rpm/rpmlog.h>
#include <rpm/rpmps.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmts.h>
#include "cliutils.h"
diff --git a/rpm2archive.c b/rpm2archive.c
index cb39c7a71..d465bc26b 100644
--- a/rpm2archive.c
+++ b/rpm2archive.c
@@ -4,9 +4,9 @@
#include <rpm/rpmlib.h> /* rpmReadPackageFile .. */
#include <rpm/rpmfi.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmtag.h>
#include <rpm/rpmio.h>
-#include <rpm/rpmpgp.h>
#include <rpm/rpmurl.h>
#include <rpm/rpmts.h>
diff --git a/rpm2cpio.c b/rpm2cpio.c
index 493cfead3..fcc3b3079 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -3,9 +3,9 @@
#include "system.h"
#include <rpm/rpmlib.h> /* rpmReadPackageFile .. */
+#include <rpm/rpmstring.h>
#include <rpm/rpmtag.h>
#include <rpm/rpmio.h>
-#include <rpm/rpmpgp.h>
#include <rpm/rpmts.h>
#include <unistd.h>
diff --git a/rpmio/expression.c b/rpmio/expression.c
index ccd0e26f7..f6867fa25 100644
--- a/rpmio/expression.c
+++ b/rpmio/expression.c
@@ -13,8 +13,11 @@
#include "system.h"
+#include <string.h>
+
#include <rpm/rpmlog.h>
#include <rpm/rpmmacro.h>
+#include <rpm/rpmstring.h>
#include <rpm/rpmver.h>
#include "rpmio/rpmmacro_internal.h"
#include "debug.h"
diff --git a/rpmio/rpmfileutil.h b/rpmio/rpmfileutil.h
index e41d3f6a3..c4f754af0 100644
--- a/rpmio/rpmfileutil.h
+++ b/rpmio/rpmfileutil.h
@@ -8,7 +8,6 @@
#include <rpm/rpmutil.h>
#include <rpm/rpmio.h>
-#include <rpm/rpmpgp.h>
#include <rpm/argv.h>
#ifdef __cplusplus
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c
index d52b897fc..4c865b3dd 100644
--- a/rpmio/rpmlog.c
+++ b/rpmio/rpmlog.c
@@ -9,6 +9,7 @@
#include <errno.h>
#include <rpm/rpmlog.h>
#include <rpm/rpmmacro.h>
+#include <rpm/rpmstring.h>
#include "debug.h"
typedef struct rpmlogCtx_s * rpmlogCtx;
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index bab68364e..e1a7b4d92 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -1,5 +1,7 @@
#include "system.h"
+#include <string.h>
+
#include <rpm/rpmcli.h>
#include <rpm/rpmlib.h> /* rpmReadPackageFile */
#include <rpm/rpmdb.h>
View Lorry Controller Status