Use proper addressing for our public headers everywhere

9 files changed, 15 insertions, 15 deletions

diff --git a/lib/cpio.c b/lib/cpio.c
index 5403db3c8..e029ba929 100644
--- a/lib/cpio.c
+++ b/lib/cpio.c
@@ -22,9 +22,9 @@
 #include <rpm/rpmio.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
+#include <rpm/rpmarchive.h>
 
 #include "lib/cpio.h"
-#include "lib/rpmarchive.h"
 
 #include "debug.h"
 
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 13c4a17f6..24872658d 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -11,6 +11,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmmacro.h>	/* XXX rpmCleanPath */
 #include <rpm/rpmds.h>
+#include <rpm/rpmbase64.h>
 #include <errno.h>
 #include <fcntl.h>
 
@@ -20,7 +21,6 @@
 #include "lib/fsm.h"	/* rpmpsm stuff for now */
 #include "lib/rpmug.h"
 #include "rpmio/rpmio_internal.h"       /* fdInit/FiniDigest */
-#include "rpmio/rpmbase64.h"
 
 #include "debug.h"
 
diff --git a/plugins/fsverity.c b/plugins/fsverity.c
index f1557d078..4c3c279fb 100644
--- a/plugins/fsverity.c
+++ b/plugins/fsverity.c
@@ -16,9 +16,9 @@
 #include <rpm/rpmfiles.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlog.h>
-#include <rpmio/rpmstring.h>
-#include <rpmio/rpmmacro.h>
-#include <rpmio/rpmpgp.h>
+#include <rpm/rpmstring.h>
+#include <rpm/rpmmacro.h>
+#include <rpm/rpmpgp.h>
 
 #include "lib/rpmfs.h"
 #include "lib/rpmplugin.h"
diff --git a/plugins/ima.c b/plugins/ima.c
index fb5cee008..9b8d6d6b8 100644
--- a/plugins/ima.c
+++ b/plugins/ima.c
@@ -8,8 +8,8 @@
 #include <rpm/rpmfiles.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlog.h>
-#include <rpmio/rpmstring.h>
-#include <rpmio/rpmmacro.h>
+#include <rpm/rpmstring.h>
+#include <rpm/rpmmacro.h>
 
 #include "lib/rpmfs.h"
 #include "lib/rpmplugin.h"
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 28133beb2..710ef1ebd 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -23,7 +23,7 @@ librpmio_la_SOURCES = \
 	rpmio_internal.h rpmhook.h rpmvercmp.c rpmver.c \
 	rpmstring.c rpmfileutil.c rpmglob.c \
 	rpmkeyring.c rpmstrpool.c rpmmacro_internal.h \
-	rpmlua.c rpmlua.h rpmcrypto.h
+	rpmlua.c rpmlua.h
 
 if WITH_OPENSSL
 librpmio_la_SOURCES += digest_openssl.c
diff --git a/rpmio/rgetopt.c b/rpmio/rgetopt.c
index a56ca857a..f789fa8fe 100644
--- a/rpmio/rgetopt.c
+++ b/rpmio/rgetopt.c
@@ -7,7 +7,7 @@ extern char *optarg;
 extern int optind;
 #endif
 
-#include "rpmio/argv.h"
+#include <rpm/argv.h>
 #include "rpmio/rpmmacro_internal.h"
 
 int rgetopt(int argc, char * const argv[], const char *opts,
diff --git a/sign/rpmsignfiles.c b/sign/rpmsignfiles.c
index dd5a2b974..80ef233c3 100644
--- a/sign/rpmsignfiles.c
+++ b/sign/rpmsignfiles.c
@@ -12,8 +12,8 @@
 #include <rpm/rpmlog.h>		/* rpmlog */
 #include <rpm/rpmfi.h>
 #include <rpm/rpmcrypto.h>	/* rpmDigestLength */
-#include "lib/header.h"		/* HEADERGET_MINMEM */
-#include "lib/rpmtypes.h"	/* rpmRC */
+#include <rpm/header.h>		/* HEADERGET_MINMEM */
+#include <rpm/rpmtypes.h>	/* rpmRC */
 
 #include "sign/rpmsignfiles.h"
 
diff --git a/sign/rpmsignverity.c b/sign/rpmsignverity.c
index e62bf68b1..b00e18990 100644
--- a/sign/rpmsignverity.c
+++ b/sign/rpmsignverity.c
@@ -10,12 +10,12 @@
 #include <rpm/rpmlog.h>		/* rpmlog */
 #include <rpm/rpmfi.h>
 #include <rpm/rpmcrypto.h>		/* rpmDigestLength */
-#include "lib/header.h"		/* HEADERGET_MINMEM */
+#include <rpm/header.h>		/* HEADERGET_MINMEM */
+#include <rpm/rpmtypes.h>	/* rpmRC */
+#include <rpm/rpmbase64.h>
 #include "lib/header_internal.h"
-#include "lib/rpmtypes.h"	/* rpmRC */
 #include <libfsverity.h>
 #include "rpmio/rpmio_internal.h"
-#include "rpmio/rpmbase64.h"
 #include "lib/rpmvs.h"
 
 #include "sign/rpmsignverity.h"
diff --git a/system.h b/system.h
index 9c14ab96f..a5d236843 100644
--- a/system.h
+++ b/system.h
@@ -61,7 +61,7 @@ char * stpncpy(char * dest, const char * src, size_t n);
 extern int fdatasync(int fildes);
 #endif
 
-#include "rpmio/rpmutil.h"
+#include <rpm/rpmutil.h>
 /* compatibility macros to avoid a mass-renaming all over the codebase */
 #define xmalloc(_size) rmalloc((_size))
 #define xmallocn(_nmemb, _size) rreallocn(NULL, (_nmemb), (_size))