Drop top-level source for our global include directories

Having everything accessible to everything encourages fast and loose
includes from places one shouldn't be using, and makes it easy for
those cases to hide in plain sight as well. There were reasons for
the top-level include back in 2007 but our codebase is a rather
different beast these days. Limiting access through per-target
include directories on everything nicely highlights the exceptions
and makes the whole more controllable and manageable.

This change looks huge, but it's just due to stripping no longer valid
prefixes from all the gazillion internal includes. No rpm-side
functionality is affected, this is just source-level hygiene operation.

CMakeLists.txt

@@ -367,10 +367,10 @@ foreach (flag -fno-strict-overflow -fno-delete-null-pointer-checks)
 	unset(found)
 endforeach()
 
-# generated config.h
+# generated sources
 include_directories(${CMAKE_BINARY_DIR})
-# private includes
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/misc)
+# global private includes
+include_directories(${CMAKE_SOURCE_DIR}/misc)
 # public headers
 include_directories(${CMAKE_SOURCE_DIR}/include)
 

build/CMakeLists.txt

@@ -13,6 +13,12 @@ target_sources(librpmbuild PRIVATE
 	speclua.c
 )
 
+target_include_directories(librpmbuild PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/rpmio
+	${CMAKE_SOURCE_DIR}/lib
+)
+
 target_link_libraries(librpmbuild PUBLIC librpmio librpm)
 target_link_libraries(librpmbuild PRIVATE
 	libmisc

build/build.c

@@ -17,9 +17,9 @@
 
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
-#include "lib/rpmug.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
+#include "rpmug.h"
 
 #include "debug.h"
 

build/files.c

@@ -27,12 +27,12 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
+#include "rpmio_internal.h"	/* XXX rpmioSlurp */
 #include "rpmfts.h"
-#include "lib/rpmfi_internal.h"	/* XXX fi->apath */
-#include "lib/rpmug.h"
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmfi_internal.h"	/* XXX fi->apath */
+#include "rpmug.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 
 #include "debug.h"
 #include <libgen.h>

build/misc.c

@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <rpm/rpmstring.h>
-#include "build/rpmbuild_misc.h"
+#include "rpmbuild_misc.h"
 #include "debug.h"
 
 #define BUF_CHUNK 1024

build/pack.c

@@ -13,12 +13,12 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmlog.h>
 
-#include "rpmio/rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
-#include "lib/fsm.h"
-#include "lib/signature.h"
-#include "lib/rpmlead.h"
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
+#include "fsm.h"
+#include "signature.h"
+#include "rpmlead.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 
 #include "debug.h"
 

build/parseChangelog.c

@@ -7,7 +7,7 @@
 
 #include <rpm/header.h>
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; }

build/parseDescription.c

@@ -7,7 +7,7 @@
 
 #include <rpm/header.h>
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 int parseDescription(rpmSpec spec)

build/parseFiles.c

@@ -7,7 +7,7 @@
 
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 int parseFiles(rpmSpec spec)

build/parseList.c

@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 

build/parsePolicies.c

@@ -9,7 +9,7 @@
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 int parsePolicies(rpmSpec spec)

build/parsePreamble.c

@@ -12,8 +12,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmurl.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 #include "debug.h"
 
 #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; }

build/parsePrep.c

@@ -11,9 +11,9 @@
 #include <rpm/header.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
-#include "lib/rpmug.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
+#include "rpmug.h"
 #include "debug.h"
 
 static void appendBuf(rpmSpec spec, const char *s, int nl)

build/parseReqs.c

@@ -8,8 +8,8 @@
 #include <ctype.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 #include "debug.h"
 
 

build/parseScript.c

@@ -8,10 +8,10 @@
 #include <rpm/header.h>
 #include <rpm/rpmlog.h>
 
-#include "rpmio/rpmlua.h"
-#include "lib/rpmscript.h"	/* script flags */
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmlua.h"
+#include "rpmscript.h"	/* script flags */
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 
 #include "debug.h"
 

build/parseSimpleScript.c

@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 

build/parseSpec.c

@@ -16,8 +16,8 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include "build/rpmbuild_internal.h"
-#include "build/rpmbuild_misc.h"
+#include "rpmbuild_internal.h"
+#include "rpmbuild_misc.h"
 #include "debug.h"
 
 #define SKIPSPACE(s) { while (*(s) && risspace(*(s))) (s)++; }

build/policies.c

@@ -10,8 +10,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/rpmio_internal.h"
-#include "build/rpmbuild_internal.h"
+#include "rpmio_internal.h"
+#include "rpmbuild_internal.h"
 
 #include "debug.h"
 

build/reqprov.c

@@ -8,7 +8,7 @@
 #include <rpm/header.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
-#include "build/rpmbuild_internal.h"
+#include "rpmbuild_internal.h"
 #include "debug.h"
 
 int addReqProv(Package pkg, rpmTagVal tagN,

build/rpmbuild_internal.h

@@ -4,8 +4,8 @@
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmutil.h>
 #include <rpm/rpmstrpool.h>
-#include "build/rpmbuild_misc.h"
-#include "rpmio/rpmlua.h"
+#include "rpmbuild_misc.h"
+#include "rpmlua.h"
 
 #define HASHTYPE fileRenameHash
 #define HTKEYTYPE const char *

build/rpmfc.c

@@ -21,9 +21,9 @@
 #include <rpm/rpmfi.h>
 #include <rpm/rpmstrpool.h>
 
-#include "lib/rpmug.h"
-#include "lib/rpmfi_internal.h"		/* rpmfiles stuff for now */
-#include "build/rpmbuild_internal.h"
+#include "rpmug.h"
+#include "rpmfi_internal.h"		/* rpmfiles stuff for now */
+#include "rpmbuild_internal.h"
 
 #include "debug.h"
 

build/spec.c

@@ -13,8 +13,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
 
-#include "lib/rpmfi_internal.h"		/* rpmfiles stuff */
-#include "build/rpmbuild_internal.h"
+#include "rpmfi_internal.h"		/* rpmfiles stuff */
+#include "rpmbuild_internal.h"
 
 #include "debug.h"
 

build/speclua.c

@@ -3,8 +3,8 @@
 
 #include <lua.h>
 
-#include "rpmio/rpmlua.h"
-#include "build/rpmbuild_internal.h"
+#include "rpmlua.h"
+#include "rpmbuild_internal.h"
 
 #include "debug.h"
 

lib/CMakeLists.txt

@@ -12,6 +12,11 @@ target_compile_definitions(librpm PRIVATE
 	LIBRPMALIAS_EXECPATH="${CMAKE_INSTALL_FULL_BINDIR}"
 )
 
+target_include_directories(librpm PRIVATE
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/rpmio
+)
+
 target_sources(librpm PRIVATE
 	backend/dbi.c backend/dbi.h backend/dummydb.c
 	backend/dbiset.c backend/dbiset.h
@@ -61,7 +66,7 @@ if(WITH_CAP)
 endif()
 
 add_custom_command(OUTPUT tagtbl.C
-	COMMAND AWK=gawk ${CMAKE_CURRENT_SOURCE_DIR}/gentagtbl.sh ${CMAKE_SOURCE_DIR}/include/rpm/rpmtag.h > tagtbl.C
+	COMMAND AWK=gawk ${CMAKE_CURRENT_SOURCE_DIR}/gentagtbl.sh ${CMAKE_SOURCE_DIR}/include/rpm/rpmtag.h > ${CMAKE_BINARY_DIR}/tagtbl.C
 	DEPENDS ${CMAKE_SOURCE_DIR}/include/rpm/rpmtag.h gentagtbl.sh
 )
 

lib/backend/bdb_ro.c

@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "lib/rpmdb_internal.h"
+#include "rpmdb_internal.h"
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 

lib/backend/dbi.c

@@ -10,7 +10,7 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
 #include <rpm/header.h>
-#include "lib/rpmdb_internal.h"
+#include "rpmdb_internal.h"
 #include "debug.h"
 
 const struct rpmdbOps_s *backends[] = {

lib/backend/dummydb.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "lib/rpmdb_internal.h"
+#include "rpmdb_internal.h"
 
 #include "debug.h"
 

lib/backend/ndb/glue.c

@@ -4,13 +4,13 @@
 #include <stdlib.h>
 #include <fcntl.h>
 
-#include "lib/rpmdb_internal.h"
+#include "rpmdb_internal.h"
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 
-#include "lib/backend/ndb/rpmpkg.h"
-#include "lib/backend/ndb/rpmxdb.h"
-#include "lib/backend/ndb/rpmidx.h"
+#include "backend/ndb/rpmpkg.h"
+#include "backend/ndb/rpmxdb.h"
+#include "backend/ndb/rpmidx.h"
 
 #include "debug.h"
 

lib/backend/sqlite.c

@@ -7,7 +7,7 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmstring.h>
-#include "lib/rpmdb_internal.h"
+#include "rpmdb_internal.h"
 
 #include "debug.h"
 

lib/cpio.c

@@ -24,7 +24,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmarchive.h>
 
-#include "lib/cpio.h"
+#include "cpio.h"
 
 #include "debug.h"
 

lib/depends.c

@@ -12,13 +12,13 @@
 #include <rpm/rpmfi.h>
 #include <rpm/rpmstring.h>
 
-#include "lib/rpmts_internal.h"
-#include "lib/rpmte_internal.h"
-#include "lib/rpmds_internal.h"
-#include "lib/rpmfi_internal.h" /* rpmfiles stuff for now */
-#include "lib/misc.h"
+#include "rpmts_internal.h"
+#include "rpmte_internal.h"
+#include "rpmds_internal.h"
+#include "rpmfi_internal.h" /* rpmfiles stuff for now */
+#include "misc.h"
 
-#include "lib/backend/dbiset.h"
+#include "backend/dbiset.h"
 
 #include "debug.h"
 

lib/formats.c

@@ -14,10 +14,10 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/rpmpgpval.h"
-#include "lib/manifest.h"
-#include "lib/misc.h"
-#include "lib/signature.h"
+#include "rpmpgpval.h"
+#include "manifest.h"
+#include "misc.h"
+#include "signature.h"
 
 #include "debug.h"
 

lib/fprint.c

@@ -9,11 +9,11 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmsq.h>
 
-#include "lib/rpmdb_internal.h"
-#include "lib/rpmfi_internal.h"
-#include "lib/rpmte_internal.h"
-#include "lib/fprint.h"
-#include "lib/misc.h"
+#include "rpmdb_internal.h"
+#include "rpmfi_internal.h"
+#include "rpmte_internal.h"
+#include "fprint.h"
+#include "misc.h"
 #include "debug.h"
 #include <libgen.h>
 

lib/fsm.c

@@ -18,12 +18,12 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 
-#include "rpmio/rpmio_internal.h"	/* fdInit/FiniDigest */
-#include "lib/fsm.h"
-#include "lib/rpmte_internal.h"	/* XXX rpmfs */
-#include "lib/rpmfi_internal.h" /* rpmfiSetOnChdir */
-#include "lib/rpmplugins.h"	/* rpm plugins hooks */
-#include "lib/rpmug.h"
+#include "rpmio_internal.h"	/* fdInit/FiniDigest */
+#include "fsm.h"
+#include "rpmte_internal.h"	/* XXX rpmfs */
+#include "rpmfi_internal.h" /* rpmfiSetOnChdir */
+#include "rpmplugins.h"	/* rpm plugins hooks */
+#include "rpmug.h"
 
 #include "debug.h"
 

lib/header.c

@@ -14,8 +14,8 @@
 #include <inttypes.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmstring.h>
-#include "lib/header_internal.h"
-#include "lib/misc.h"			/* tag function proto */
+#include "header_internal.h"
+#include "misc.h"			/* tag function proto */
 
 #include "debug.h"
 

lib/headerfmt.c

@@ -8,7 +8,7 @@
 #include <rpm/header.h>
 #include <rpm/rpmtag.h>
 #include <rpm/rpmstring.h>
-#include "lib/misc.h"		/* format function protos */
+#include "misc.h"		/* format function protos */
 
 #include "debug.h"
 

lib/manifest.c

@@ -12,7 +12,7 @@
 #include <rpm/argv.h>
 #include <rpm/rpmstring.h>
 
-#include "lib/manifest.h"
+#include "manifest.h"
 
 #include "debug.h"
 

lib/misc.h

@@ -9,7 +9,7 @@
 #include <string.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/header.h>		/* for headerGetFlags typedef, duh.. */
-#include "lib/rpmfs.h"
+#include "rpmfs.h"
 
 typedef const struct headerFmt_s * headerFmt;
 

lib/order.c

@@ -9,8 +9,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmds.h>
 
-#include "lib/rpmte_internal.h"	/* XXX tsortInfo_s */
-#include "lib/rpmts_internal.h"
+#include "rpmte_internal.h"	/* XXX tsortInfo_s */
+#include "rpmts_internal.h"
 
 #include "debug.h"
 

lib/package.c

@@ -13,10 +13,10 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmkeyring.h>
 
-#include "lib/rpmlead.h"
-#include "rpmio/rpmio_internal.h"	/* fd digest bits */
-#include "lib/header_internal.h"	/* XXX headerCheck */
-#include "lib/rpmvs.h"
+#include "rpmlead.h"
+#include "rpmio_internal.h"	/* fd digest bits */
+#include "header_internal.h"	/* XXX headerCheck */
+#include "rpmvs.h"
 
 #include "debug.h"
 

lib/poptQV.c

@@ -8,7 +8,7 @@
 
 #include <rpm/rpmcli.h>
 #include <rpm/rpmstring.h>
-#include "lib/rpmgi.h"	/* XXX for giFlags */
+#include "rpmgi.h"	/* XXX for giFlags */
 
 #include "debug.h"
 

lib/psm.c

@@ -18,18 +18,18 @@
 #include <rpm/argv.h>
 #include <rpm/rpmbase64.h>
 
-#include "lib/fsm.h"		/* XXX CPIO_FOO/FSM_FOO constants */
-#include "lib/rpmchroot.h"
-#include "lib/rpmfi_internal.h" /* XXX replaced/states... */
-#include "lib/rpmte_internal.h"	/* XXX internal apis */
-#include "lib/rpmdb_internal.h" /* rpmdbAdd/Remove */
-#include "lib/rpmts_internal.h" /* rpmtsPlugins() etc */
-#include "lib/rpmds_internal.h" /* rpmdsFilterTi() */
-#include "lib/rpmscript.h"
-#include "lib/misc.h"
-#include "lib/rpmtriggers.h"
+#include "fsm.h"		/* XXX CPIO_FOO/FSM_FOO constants */
+#include "rpmchroot.h"
+#include "rpmfi_internal.h" /* XXX replaced/states... */
+#include "rpmte_internal.h"	/* XXX internal apis */
+#include "rpmdb_internal.h" /* rpmdbAdd/Remove */
+#include "rpmts_internal.h" /* rpmtsPlugins() etc */
+#include "rpmds_internal.h" /* rpmdsFilterTi() */
+#include "rpmscript.h"
+#include "misc.h"
+#include "rpmtriggers.h"
 
-#include "lib/rpmplugins.h"
+#include "rpmplugins.h"
 
 #include "debug.h"
 

lib/query.c

@@ -19,8 +19,8 @@
 #include <rpm/rpmfileutil.h>	/* rpmCleanPath */
 #include <rpm/rpmstring.h>
 
-#include "lib/rpmgi.h"
-#include "lib/manifest.h"
+#include "rpmgi.h"
+#include "manifest.h"
 
 #include "debug.h"
 

lib/relocation.c

@@ -8,8 +8,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
 
-#include "lib/rpmfs.h"
-#include "lib/misc.h"
+#include "rpmfs.h"
+#include "misc.h"
 
 #include "debug.h"
 

lib/rpmal.c

@@ -10,12 +10,12 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmstrpool.h>
 
-#include "lib/rpmal.h"
-#include "lib/misc.h"
-#include "lib/rpmte_internal.h"
-#include "lib/rpmds_internal.h"
-#include "lib/rpmfi_internal.h"
-#include "lib/rpmts_internal.h"
+#include "rpmal.h"
+#include "misc.h"
+#include "rpmte_internal.h"
+#include "rpmds_internal.h"
+#include "rpmfi_internal.h"
+#include "rpmts_internal.h"
 
 #include "debug.h"
 

lib/rpmchecksig.c

@@ -17,10 +17,10 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmkeyring.h>
 
-#include "rpmio/rpmio_internal.h" 	/* fdSetBundle() */
-#include "lib/rpmlead.h"
-#include "lib/header_internal.h"
-#include "lib/rpmvs.h"
+#include "rpmio_internal.h" 	/* fdSetBundle() */
+#include "rpmlead.h"
+#include "header_internal.h"
+#include "rpmvs.h"
 
 #include "debug.h"
 

lib/rpmchroot.c

@@ -4,8 +4,8 @@
 #include <fcntl.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
-#include "lib/rpmchroot.h"
-#include "lib/rpmug.h"
+#include "rpmchroot.h"
+#include "rpmug.h"
 #include "debug.h"
 
 int _rpm_nouserns = 0;

lib/rpmdb.c

@@ -29,13 +29,13 @@
 #include <rpm/rpmts.h>
 #include <rpm/argv.h>
 
-#include "lib/rpmchroot.h"
-#include "lib/rpmdb_internal.h"
-#include "lib/fprint.h"
-#include "lib/header_internal.h"	/* XXX for headerSetInstance() */
-#include "lib/backend/dbi.h"
-#include "lib/backend/dbiset.h"
-#include "lib/misc.h"
+#include "rpmchroot.h"
+#include "rpmdb_internal.h"
+#include "fprint.h"
+#include "header_internal.h"	/* XXX for headerSetInstance() */
+#include "backend/dbi.h"
+#include "backend/dbiset.h"
+#include "misc.h"
 #include "debug.h"
 
 #define HASHTYPE dbChk

lib/rpmdb_internal.h

@@ -6,7 +6,7 @@
 #include <rpm/rpmsw.h>
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmutil.h>
-#include "lib/backend/dbi.h"
+#include "backend/dbi.h"
 
 #ifdef __cplusplus
 extern "C" {

lib/rpmds.c

@@ -9,7 +9,7 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstrpool.h>
 
-#include "lib/rpmds_internal.h"
+#include "rpmds_internal.h"
 
 #include "debug.h"
 

lib/rpmfi.c

@@ -15,12 +15,12 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "lib/rpmfi_internal.h"
-#include "lib/rpmte_internal.h"	/* relocations */
-#include "lib/cpio.h"	/* XXX CPIO_FOO */
-#include "lib/fsm.h"	/* rpmpsm stuff for now */
-#include "lib/rpmug.h"
-#include "rpmio/rpmio_internal.h"       /* fdInit/FiniDigest */
+#include "rpmfi_internal.h"
+#include "rpmte_internal.h"	/* relocations */
+#include "cpio.h"	/* XXX CPIO_FOO */
+#include "fsm.h"	/* rpmpsm stuff for now */
+#include "rpmug.h"
+#include "rpmio_internal.h"       /* fdInit/FiniDigest */
 
 #include "debug.h"
 

lib/rpmfi_internal.h

@@ -4,8 +4,8 @@
 #include <rpm/header.h>
 #include <rpm/rpmfi.h>
 #include <rpm/rpmstrpool.h>
-#include "lib/fprint.h"
-#include "lib/cpio.h"
+#include "fprint.h"
+#include "cpio.h"
 
 #define	RPMFIMAGIC	0x09697923
 

lib/rpmfs.c

@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "system.h"
-#include "lib/rpmfs.h"
+#include "rpmfs.h"
 #include "debug.h"
 
 struct rpmfs_s {

lib/rpmgi.c

@@ -13,8 +13,8 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmlog.h>
 
-#include "lib/rpmgi.h"
-#include "lib/manifest.h"
+#include "rpmgi.h"
+#include "manifest.h"
 
 #include "debug.h"
 

lib/rpminstall.c

@@ -16,8 +16,8 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
 
-#include "lib/rpmgi.h"
-#include "lib/manifest.h"
+#include "rpmgi.h"
+#include "manifest.h"
 #include "debug.h"
 
 static int rpmcliPackagesTotal = 0;

lib/rpmlead.c

@@ -11,9 +11,9 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
 
-#include "lib/signature.h"
-#include "lib/header_internal.h"	/* Freadall() */
-#include "lib/rpmlead.h"
+#include "signature.h"
+#include "header_internal.h"	/* Freadall() */
+#include "rpmlead.h"
 
 #include "debug.h"
 

lib/rpmlock.c

@@ -8,7 +8,7 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
 
-#include "lib/rpmlock.h"
+#include "rpmlock.h"
 
 #include "debug.h"
 

lib/rpmplugins.c

@@ -7,7 +7,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmts.h>
 
-#include "lib/rpmplugins.h"
+#include "rpmplugins.h"
 #include <dlfcn.h>
 
 

lib/rpmplugins.h

@@ -3,7 +3,7 @@
 
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmfi.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 #ifdef __cplusplus
 extern "C" {

lib/rpmrc.c

@@ -32,10 +32,10 @@
 #include <rpm/rpmlog.h>
 #include <rpm/argv.h>
 
-#include "rpmio/rpmlua.h"
-#include "rpmio/rpmio_internal.h"	/* XXX for rpmioSlurp */
-#include "lib/misc.h"
-#include "lib/backend/dbi.h"
+#include "rpmlua.h"
+#include "rpmio_internal.h"	/* XXX for rpmioSlurp */
+#include "misc.h"
+#include "backend/dbi.h"
 
 #include "debug.h"
 

lib/rpmscript.c

@@ -14,12 +14,12 @@
 #include <rpm/header.h>
 #include <rpm/rpmds.h>
 
-#include "rpmio/rpmlua.h"
-#include "lib/rpmscript.h"
-#include "rpmio/rpmio_internal.h"
+#include "rpmlua.h"
+#include "rpmscript.h"
+#include "rpmio_internal.h"
 
-#include "lib/rpmchroot.h"
-#include "lib/rpmplugins.h"     /* rpm plugins hooks */
+#include "rpmchroot.h"
+#include "rpmplugins.h"     /* rpm plugins hooks */
 
 #include "debug.h"
 

lib/rpmtd.c

@@ -3,7 +3,7 @@
 #include <rpm/rpmtd.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmstrpool.h>
-#include "lib/misc.h"		/* format function prototypes */
+#include "misc.h"		/* format function prototypes */
 
 #include "debug.h"
 

lib/rpmte.c

@@ -14,13 +14,13 @@
 #include <rpm/rpmdb.h>
 #include <rpm/rpmlog.h>
 
-#include "lib/misc.h"
-#include "lib/rpmplugins.h"
-#include "lib/rpmte_internal.h"
+#include "misc.h"
+#include "rpmplugins.h"
+#include "rpmte_internal.h"
 /* strpool-related interfaces */
-#include "lib/rpmfi_internal.h"
-#include "lib/rpmds_internal.h"
-#include "lib/rpmts_internal.h"
+#include "rpmfi_internal.h"
+#include "rpmds_internal.h"
+#include "rpmts_internal.h"
 
 #include "debug.h"
 

lib/rpmte_internal.h

@@ -4,7 +4,7 @@
 #include <rpm/rpmte.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmtag.h>
-#include "lib/rpmfs.h"
+#include "rpmfs.h"
 
 typedef enum pkgGoal_e {
     PKG_NONE		= 0,

lib/rpmtriggers.c

@@ -6,13 +6,13 @@
 #include <rpm/rpmfi.h>
 #include <stdlib.h>
 
-#include "lib/rpmtriggers.h"
-#include "lib/rpmts_internal.h"
-#include "lib/rpmdb_internal.h"
-#include "lib/rpmds_internal.h"
-#include "lib/rpmfi_internal.h"
-#include "lib/rpmte_internal.h"
-#include "lib/rpmchroot.h"
+#include "rpmtriggers.h"
+#include "rpmts_internal.h"
+#include "rpmdb_internal.h"
+#include "rpmds_internal.h"
+#include "rpmfi_internal.h"
+#include "rpmte_internal.h"
+#include "rpmchroot.h"
 
 #define TRIGGER_PRIORITY_BOUND 10000
 

lib/rpmtriggers.h

@@ -2,7 +2,7 @@
 #define _RPMTRIGGERS_H
 
 #include <rpm/rpmutil.h>
-#include "lib/rpmscript.h"
+#include "rpmscript.h"
 
 struct triggerInfo_s {
     unsigned int hdrNum;

lib/rpmts.c

@@ -24,14 +24,14 @@
 #include <rpm/rpmsq.h>
 #include <rpm/rpmte.h>
 
-#include "rpmio/rpmpgpval.h"
-#include "lib/rpmal.h"
-#include "lib/rpmchroot.h"
-#include "lib/rpmplugins.h"
-#include "lib/rpmts_internal.h"
-#include "lib/rpmte_internal.h"
-#include "lib/misc.h"
-#include "lib/rpmtriggers.h"
+#include "rpmpgpval.h"
+#include "rpmal.h"
+#include "rpmchroot.h"
+#include "rpmplugins.h"
+#include "rpmts_internal.h"
+#include "rpmte_internal.h"
+#include "misc.h"
+#include "rpmtriggers.h"
 
 #include "debug.h"
 

lib/rpmts_internal.h

@@ -4,12 +4,12 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmstrpool.h>
 
-#include "lib/rpmal.h"		/* XXX availablePackage */
-#include "lib/fprint.h"
-#include "lib/rpmlock.h"
-#include "lib/rpmdb_internal.h"
-#include "lib/rpmscript.h"
-#include "lib/rpmtriggers.h"
+#include "rpmal.h"		/* XXX availablePackage */
+#include "fprint.h"
+#include "rpmlock.h"
+#include "rpmdb_internal.h"
+#include "rpmscript.h"
+#include "rpmtriggers.h"
 
 typedef struct diskspaceInfo_s * rpmDiskSpaceInfo;
 

lib/rpmug.c

@@ -5,8 +5,8 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmmacro.h>
 
-#include "lib/misc.h"
-#include "lib/rpmug.h"
+#include "misc.h"
+#include "rpmug.h"
 #include "debug.h"
 
 static char *pwpath = NULL;

lib/rpmvs.c

@@ -4,8 +4,8 @@
 #include <rpm/rpmkeyring.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmlog.h>
-#include "lib/rpmvs.h"
-#include "rpmio/rpmpgpval.h"
+#include "rpmvs.h"
+#include "rpmpgpval.h"
 
 #include "debug.h"
 

lib/rpmvs.h

@@ -3,7 +3,7 @@
 
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmts.h> /* for rpmVSFlags */
-#include "lib/header_internal.h"
+#include "header_internal.h"
 
 /* siginfo range bits */
 enum {

lib/signature.c

@@ -13,9 +13,9 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 
-#include "lib/rpmlead.h"
-#include "lib/header_internal.h"
-#include "lib/signature.h"
+#include "rpmlead.h"
+#include "header_internal.h"
+#include "signature.h"
 
 #include "debug.h"
 

lib/tagexts.c

@@ -11,7 +11,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmbase64.h>
-#include "lib/misc.h"		/* tag function proto */
+#include "misc.h"		/* tag function proto */
 
 #include "debug.h"
 

lib/tagname.c

@@ -23,7 +23,7 @@ struct headerTagTableEntry_s {
     int extension;		/*!< Extension or "real" tag */
 };
 
-#include "lib/tagtbl.C"
+#include "tagtbl.C"
 
 #define TABLESIZE (sizeof(rpmTagTable) / sizeof(rpmTagTable[0]) - 1)
 static const int rpmTagTableSize = TABLESIZE;

lib/transaction.c

@@ -29,19 +29,19 @@
 #include <rpm/rpmsq.h>
 #include <rpm/rpmkeyring.h>
 
-#include "lib/fprint.h"
-#include "lib/misc.h"
-#include "lib/rpmchroot.h"
-#include "lib/rpmlock.h"
-#include "lib/rpmds_internal.h"
-#include "lib/rpmfi_internal.h"	/* only internal apis */
-#include "lib/rpmte_internal.h"	/* only internal apis */
-#include "lib/rpmts_internal.h"
-#include "lib/rpmvs.h"
-#include "rpmio/rpmhook.h"
-#include "lib/rpmtriggers.h"
+#include "fprint.h"
+#include "misc.h"
+#include "rpmchroot.h"
+#include "rpmlock.h"
+#include "rpmds_internal.h"
+#include "rpmfi_internal.h"	/* only internal apis */
+#include "rpmte_internal.h"	/* only internal apis */
+#include "rpmts_internal.h"
+#include "rpmvs.h"
+#include "rpmhook.h"
+#include "rpmtriggers.h"
 
-#include "lib/rpmplugins.h"
+#include "rpmplugins.h"
 
 #include "debug.h"
 

lib/verify.c

@@ -23,10 +23,10 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmstring.h>
 
-#include "lib/misc.h"
-#include "lib/rpmchroot.h"
-#include "lib/rpmte_internal.h"	/* rpmteProcess() */
-#include "lib/rpmug.h"
+#include "misc.h"
+#include "rpmchroot.h"
+#include "rpmte_internal.h"	/* rpmteProcess() */
+#include "rpmug.h"
 
 #include "debug.h"
 

plugins/CMakeLists.txt

@@ -35,6 +35,7 @@ endif()
 if(WITH_FSVERITY)
 	add_library(fsverity MODULE fsverity.c)
 	target_link_libraries(fsverity PRIVATE PkgConfig::FSVERITY)
+	target_include_directories(fsverity PRIVATE ${CMAKE_SOURCE_DIR}/sign)
 endif()
 
 set(plugindir ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins)
@@ -42,6 +43,8 @@ set(plugindir ${CMAKE_INSTALL_FULL_LIBDIR}/rpm-plugins)
 get_property(plugins DIRECTORY PROPERTY BUILDSYSTEM_TARGETS)
 foreach(plugin ${plugins})
 	target_link_libraries(${plugin} PRIVATE librpmio librpm)
+	# XX this is wrong, but required while rpmplugin.h is there
+	target_include_directories(${plugin} PRIVATE ${CMAKE_SOURCE_DIR}/lib)
 	install(TARGETS ${plugin} DESTINATION ${plugindir})
 endforeach()
 

plugins/audit.c

@@ -5,7 +5,7 @@
 
 #include <rpm/rpmstring.h>
 #include <rpm/rpmts.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 struct teop {
     rpmte te;

plugins/dbus_announce.c

@@ -7,7 +7,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmdb.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 struct dbus_announce_data {
     DBusConnection * bus;

plugins/fapolicyd.c

@@ -3,7 +3,7 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>

plugins/fsverity.c

@@ -20,8 +20,8 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmpgp.h>
 
-#include "lib/rpmplugin.h"
-#include "sign/rpmsignverity.h"
+#include "rpmplugin.h"
+#include "rpmsignverity.h"
 
 static int sign_config_files = 0;
 

plugins/ima.c

@@ -11,7 +11,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmmacro.h>
 
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 #define XATTR_NAME_IMA "security.ima"
 

plugins/prioreset.c

@@ -8,7 +8,7 @@
 #endif
 
 #include <rpm/rpmlog.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 #include "debug.h"
 

plugins/selinux.c

@@ -7,7 +7,7 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmts.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 #include "debug.h"
 

plugins/syslog.c

@@ -5,7 +5,7 @@
 
 #include <rpm/rpmstring.h>
 #include <rpm/rpmts.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 struct logstat {
     int logging;

plugins/systemd_inhibit.c

@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmts.h>
-#include "lib/rpmplugin.h"
+#include "rpmplugin.h"
 
 static int lock_fd = -1;
 

rpmio/CMakeLists.txt

@@ -8,6 +8,7 @@ target_sources(librpmio PRIVATE
 	rpmstrpool.c rpmmacro_internal.h rpmlua.c rpmlua.h lposix.c
 )
 target_compile_definitions(librpmio PRIVATE RPM_CONFIGDIR="${RPM_CONFIGDIR}")
+target_include_directories(librpmio PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if (WITH_INTERNAL_OPENPGP)
 	target_sources(librpmio PRIVATE rpmpgp_internal.h rpmpgp_internal.c)

rpmio/digest.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include "rpmio/rpmpgp_internal.h"
+#include "rpmpgp_internal.h"
 
 #include "debug.h"
 

rpmio/digest_libgcrypt.c

@@ -3,8 +3,8 @@
 #include <gcrypt.h>
 
 #include <rpm/rpmcrypto.h>
-#include "rpmio/rpmpgp_internal.h"
-#include "rpmio/rpmio_internal.h"
+#include "rpmpgp_internal.h"
+#include "rpmio_internal.h"
 #include "debug.h"
 
 /**

rpmio/digest_openssl.c

@@ -5,7 +5,7 @@
 #include <openssl/dsa.h>
 #include <rpm/rpmcrypto.h>
 
-#include "rpmio/rpmpgp_internal.h"
+#include "rpmpgp_internal.h"
 
 struct DIGEST_CTX_s {
     rpmDigestFlags flags;	/*!< Bit(s) to control digest operation. */

rpmio/expression.c

@@ -19,9 +19,9 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmver.h>
-#include "rpmio/rpmmacro_internal.h"
-#include "rpmio/rpmhook.h"
-#include "rpmio/rpmlua.h"
+#include "rpmmacro_internal.h"
+#include "rpmhook.h"
+#include "rpmlua.h"
 #include "debug.h"
 
 /* #define DEBUG_PARSER 1 */

rpmio/lposix.c

@@ -28,7 +28,7 @@
 #include <utime.h>
 #include <rpm/rpmutil.h>
 #include <lua.h>
-#include "rpmio/rpmio_internal.h"
+#include "rpmio_internal.h"
 
 #define MYNAME		"posix"
 #define MYVERSION	MYNAME " library for " LUA_VERSION " / Nov 2003"

rpmio/macro.c

@@ -28,8 +28,8 @@
 #include <rpm/rpmmacro.h>
 #include <rpm/argv.h>
 
-#include "rpmio/rpmlua.h"
-#include "rpmio/rpmmacro_internal.h"
+#include "rpmlua.h"
+#include "rpmmacro_internal.h"
 #include "debug.h"
 
 enum macroFlags_e {

rpmio/rgetopt.c

@@ -8,7 +8,7 @@ extern int optind;
 #endif
 
 #include <rpm/argv.h>
-#include "rpmio/rpmmacro_internal.h"
+#include "rpmmacro_internal.h"
 
 int rgetopt(int argc, char * const argv[], const char *opts,
 		rgetoptcb callback, void *data)

rpmio/rpmfileutil.c

@@ -14,7 +14,7 @@
 #include <rpm/rpmlog.h>
 #include <rpm/argv.h>
 
-#include "rpmio/rpmio_internal.h"
+#include "rpmio_internal.h"
 
 #include "debug.h"
 

rpmio/rpmhook.c

@@ -6,7 +6,7 @@
 #include <stdarg.h>
 
 #include <rpm/rpmstring.h>
-#include "rpmio/rpmhook.h"
+#include "rpmhook.h"
 
 #include "debug.h"
 

rpmio/rpmio.c

@@ -16,7 +16,7 @@
 #include <rpm/rpmsw.h>
 #include <rpm/rpmurl.h>
 
-#include "rpmio/rpmio_internal.h"
+#include "rpmio_internal.h"
 
 #include "debug.h"
 

rpmio/rpmlua.c

@@ -26,11 +26,11 @@
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmbase64.h>
 #include <rpm/rpmver.h>
-#include "rpmio/rpmhook.h"
+#include "rpmhook.h"
 
-#include "rpmio/rpmlua.h"
-#include "rpmio/rpmio_internal.h"
-#include "rpmio/rpmmacro_internal.h"
+#include "rpmlua.h"
+#include "rpmio_internal.h"
+#include "rpmmacro_internal.h"
 
 #include "debug.h"
 

rpmio/rpmpgp.c

@@ -10,8 +10,8 @@
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
 
-#include "rpmio/rpmpgpval.h"
-#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
+#include "rpmpgpval.h"
+#include "rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include "debug.h"
 

rpmio/rpmpgp_internal.c

@@ -11,9 +11,9 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmbase64.h>
 
-#include "rpmio/rpmpgpval.h"
-#include "rpmio/rpmpgp_internal.h"
-#include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
+#include "rpmpgpval.h"
+#include "rpmpgp_internal.h"
+#include "rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include "debug.h"