Switch to <rpm/foo.h> style for public headers

- adjust include paths accordingly

22 files changed, 32 insertions, 32 deletions

diff --git a/python/Makefile.am b/python/Makefile.am
index ebe33a39f..a1818b9bd 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -3,7 +3,7 @@
 EXTRA_DIST = rpmdebug-py.c rpm/__init__.py
 
 if PYTHON
-AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
 AM_CPPFLAGS += -I$(top_srcdir)/python
 AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
 AM_CPPFLAGS += @WITH_NSS_INCLUDE@
diff --git a/python/header-py.c b/python/header-py.c
index cfd5e1772..09568b3f2 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -4,12 +4,12 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmstring.h>
+#include <rpm/rpmlib.h>
+#include <rpm/rpmstring.h>
 
 #include "lib/legacy.h"	/* XXX expand/compressFilelist(), providePackageNVR() */
 
-#include <rpmts.h>	/* XXX rpmtsCreate/rpmtsFree */
+#include <rpm/rpmts.h>	/* XXX rpmtsCreate/rpmtsFree */
 
 #include "header-py.h"
 #include "rpmds-py.h"
diff --git a/python/header-py.h b/python/header-py.h
index f7cd5c723..5410d721d 100644
--- a/python/header-py.h
+++ b/python/header-py.h
@@ -1,7 +1,7 @@
 #ifndef RPMPYTHON_HEADER
 #define RPMPYTHON_HEADER
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 /** \ingroup py_c
  * \file python/header-py.h
diff --git a/python/rpmal-py.c b/python/rpmal-py.c
index f941aa24f..84df79b97 100644
--- a/python/rpmal-py.c
+++ b/python/rpmal-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 #include "rpmal-py.h"
 #include "rpmds-py.h"
diff --git a/python/rpmal-py.h b/python/rpmal-py.h
index 4e939fccf..810c5ed2e 100644
--- a/python/rpmal-py.h
+++ b/python/rpmal-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMAL_PY
 #define H_RPMAL_PY
 
-#include <rpmal.h>
+#include <rpm/rpmal.h>
 
 /** \ingroup py_c
  * \file python/rpmal-py.h
diff --git a/python/rpmdb-py.c b/python/rpmdb-py.c
index 026d319c6..c07350ea3 100644
--- a/python/rpmdb-py.c
+++ b/python/rpmdb-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 #include "rpmdb-py.h"
 #include "rpmmi-py.h"
diff --git a/python/rpmdb-py.h b/python/rpmdb-py.h
index a4883cd79..0e6284e95 100644
--- a/python/rpmdb-py.h
+++ b/python/rpmdb-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMDB_PY
 #define H_RPMDB_PY
 
-#include <rpmdb.h>
+#include <rpm/rpmdb.h>
 
 /** \ingroup py_c
  * \file python/rpmdb-py.h
diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 6dc563f4e..a7a3179e5 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmstring.h>
+#include <rpm/rpmlib.h>
+#include <rpm/rpmstring.h>
 
 #include "header-py.h"
 #include "rpmds-py.h"
diff --git a/python/rpmds-py.h b/python/rpmds-py.h
index 42670a1e2..c029e97dc 100644
--- a/python/rpmds-py.h
+++ b/python/rpmds-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMDS_PY
 #define H_RPMDS_PY
 
-#include <rpmds.h>
+#include <rpm/rpmds.h>
 
 /** \ingroup py_c
  * \file python/rpmds-py.h
diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index a69cba27d..ffdc29de5 100644
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmio.h>	/* XXX fdGetFILE */
+#include <rpm/rpmio.h>	/* XXX fdGetFILE */
 
 #include "header-py.h"	/* XXX pyrpmError */
 #include "rpmfd-py.h"
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 0cc4e0ff5..5508d5a88 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 #include "header-py.h"
 #include "rpmfi-py.h"
diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h
index 37cde0ec2..cb7575009 100644
--- a/python/rpmfi-py.h
+++ b/python/rpmfi-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMFI_PY
 #define H_RPMFI_PY
 
-#include <rpmfi.h>
+#include <rpm/rpmfi.h>
 
 /** \ingroup py_c
  * \file python/rpmfi-py.h
diff --git a/python/rpmmacro-py.c b/python/rpmmacro-py.c
index 148786298..9e58ef277 100644
--- a/python/rpmmacro-py.c
+++ b/python/rpmmacro-py.c
@@ -7,7 +7,7 @@
 #include "structmember.h"
 
 #include "rpmmacro-py.h"
-#include <rpmmacro.h>
+#include <rpm/rpmmacro.h>
 
 #include "debug.h"
 
diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
index 0988a9557..783be04d2 100644
--- a/python/rpmmi-py.c
+++ b/python/rpmmi-py.c
@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmdb.h>
+#include <rpm/rpmlib.h>
+#include <rpm/rpmdb.h>
 
 #include "rpmmi-py.h"
 #include "header-py.h"
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 0d90048f8..b6b509ecf 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -4,9 +4,9 @@
 
 #include "system.h"
 
-#include <rpmdb.h>
-#include <rpmsq.h>
-#include <rpmlog.h>
+#include <rpm/rpmdb.h>
+#include <rpm/rpmsq.h>
+#include <rpm/rpmlog.h>
 
 #include "header-py.h"
 #include "rpmal-py.h"
diff --git a/python/rpmps-py.c b/python/rpmps-py.c
index d31f42647..df20140d9 100644
--- a/python/rpmps-py.c
+++ b/python/rpmps-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 #include "rpmps-py.h"
 
diff --git a/python/rpmps-py.h b/python/rpmps-py.h
index 0970a9703..86844f622 100644
--- a/python/rpmps-py.h
+++ b/python/rpmps-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMPS_PY
 #define H_RPMPS_PY
 
-#include <rpmps.h>
+#include <rpm/rpmps.h>
 
 /** \ingroup py_c
  * \file python/rpmps-py.h
diff --git a/python/rpmte-py.c b/python/rpmte-py.c
index 95131854a..cc8db45f5 100644
--- a/python/rpmte-py.c
+++ b/python/rpmte-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include <rpm/rpmlib.h>
 
 #include "header-py.h"	/* XXX tagNumFromPyObject */
 #include "rpmds-py.h"
diff --git a/python/rpmte-py.h b/python/rpmte-py.h
index 8dd6315d0..103827409 100644
--- a/python/rpmte-py.h
+++ b/python/rpmte-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMTE_PY
 #define H_RPMTE_PY
 
-#include <rpmte.h>
+#include <rpm/rpmte.h>
 
 /** \ingroup py_c
  * \file python/rpmte-py.h
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 6d90cc766..46571d2d6 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -4,11 +4,11 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmpgp.h>
-#include <rpmdb.h>
-#include <rpmbuild.h>
-#include <idtx.h>
+#include <rpm/rpmlib.h>
+#include <rpm/rpmpgp.h>
+#include <rpm/rpmdb.h>
+#include <rpm/rpmbuild.h>
+#include <rpm/idtx.h>
 
 #include "header-py.h"
 #include "rpmds-py.h"	/* XXX for rpmdsNew */
diff --git a/python/rpmts-py.h b/python/rpmts-py.h
index f4ccf171b..fbc64e049 100644
--- a/python/rpmts-py.h
+++ b/python/rpmts-py.h
@@ -1,7 +1,7 @@
 #ifndef H_RPMTS_PY
 #define H_RPMTS_PY
 
-#include <rpmts.h>
+#include <rpm/rpmts.h>
 
 /** \ingroup py_c
  * \file python/rpmts-py.h
diff --git a/python/spec-py.h b/python/spec-py.h
index d69098399..8004d1efd 100644
--- a/python/spec-py.h
+++ b/python/spec-py.h
@@ -1,7 +1,7 @@
 #ifndef RPMPYTHON_SPEC
 #define RPMPYTHON_SPEC
 
-#include <rpmbuild.h>
+#include <rpm/rpmbuild.h>
 
 /** \ingroup py_c
  * \file python/spec-py.h