Include rpmtypes.h first instead of rpmtag.h everywhere

20 files changed, 23 insertions, 19 deletions

diff --git a/build/parseReqs.c b/build/parseReqs.c
index 4112a4b88..54230c7ec 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmlog.h>
 #include "debug.h"
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 403125da7..418988f5e 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* RPM_MACHTABLE & related */
 #include <rpm/rpmbuild.h>
 #include <rpm/rpmds.h>
diff --git a/lib/backend/db3.c b/lib/backend/db3.c
index 05c7d8284..4ddd71707 100644
--- a/lib/backend/db3.c
+++ b/lib/backend/db3.c
@@ -10,7 +10,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 #include <sys/ipc.h>
 #endif
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>	/* rpmioMkPath */
 #include <rpm/rpmlog.h>
diff --git a/lib/backend/dbconfig.c b/lib/backend/dbconfig.c
index fd7e11aef..8a601ffdc 100644
--- a/lib/backend/dbconfig.c
+++ b/lib/backend/dbconfig.c
@@ -6,7 +6,7 @@
 
 #include <popt.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
diff --git a/lib/backend/sqlite.c b/lib/backend/sqlite.c
index 5178c8711..994b53b54 100644
--- a/lib/backend/sqlite.c
+++ b/lib/backend/sqlite.c
@@ -28,7 +28,7 @@
 
 #include <sqlite3.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>	/* rpmioMkpath */
diff --git a/lib/formats.c b/lib/formats.c
index 1fadfd420..30f64ad15 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmtd.h>
 #include <rpm/rpmds.h>
 #include <rpm/rpmfi.h>
diff --git a/lib/header.c b/lib/header.c
index dfd6df7fa..fce6880b3 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -10,7 +10,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmstring.h>
 #include "lib/header_internal.h"
 
diff --git a/lib/header_internal.c b/lib/header_internal.c
index a48351437..2d504fd6f 100644
--- a/lib/header_internal.c
+++ b/lib/header_internal.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include "lib/header_internal.h"
 
 #include "debug.h"
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 17ef97707..c9e68df48 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -14,7 +14,7 @@
 
 #include <regex.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmurl.h>
 #include <rpm/rpmpgp.h>
 #include <rpm/rpmpgp.h>
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 9181642d3..557ff345f 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -3,7 +3,7 @@
  */
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* rpmvercmp */
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlog.h>
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index ed1a74539..12fea2390 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -3,7 +3,7 @@
  */
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* rpmReadPackageFile */
 #include <rpm/rpmte.h>		/* XXX rpmElementType */
 #include <rpm/rpmts.h>
diff --git a/lib/rpmtag.h b/lib/rpmtag.h
index 2da6b4950..ff9b26c22 100644
--- a/lib/rpmtag.h
+++ b/lib/rpmtag.h
@@ -1,6 +1,8 @@
 #ifndef _RPMTAG_H
 #define _RPMTAG_H
 
+#include <rpm/rpmtypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/rpmte.c b/lib/rpmte.c
index 3633c7477..e397c74d3 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -4,7 +4,7 @@
  */
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* RPM_MACHTABLE_* */
 #include <rpm/rpmds.h>
 #include <rpm/rpmfi.h>
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 7c81dc169..f80cd1749 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -4,7 +4,7 @@
  */
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>			/* rpmReadPackage etc */
 #include <rpm/rpmurl.h>
 #include "rpmio/digest.h"
diff --git a/lib/rpmtypes.h b/lib/rpmtypes.h
index af04c74b7..66ee500e5 100644
--- a/lib/rpmtypes.h
+++ b/lib/rpmtypes.h
@@ -9,7 +9,6 @@
  */
 
 #include <rpm/rpmints.h>
-#include <rpm/rpmtag.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -95,4 +94,7 @@ typedef	enum rpmRC_e {
 }
 #endif
 
+/* XXX included late as rpmtag.h depends on our definitions here... */
+#include <rpm/rpmtag.h>
+
 #endif /* _RPMTYPES_H */
diff --git a/lib/signature.c b/lib/signature.c
index fe57310c8..fe1f5c3c7 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -6,7 +6,7 @@
 
 #include <popt.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* XXX RPMSIGTAG* & related */
 #include <rpm/rpmmacro.h>	/* XXX for rpmGetPath() */
 #include <rpm/rpmdb.h>
diff --git a/lib/tagexts.c b/lib/tagexts.c
index df562372f..1e1740809 100644
--- a/lib/tagexts.c
+++ b/lib/tagexts.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* rpmGetFilesystem*() */
 #include <rpm/rpmmacro.h>	/* XXX for %_i18ndomains */
 #include <rpm/rpmfi.h>
diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 24effd359..dc05d5b31 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmlib.h>		/* rpmvercmp */
 
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index 8f870e44d..9729e3f9e 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmpgp.h>
 
 #include "header-py.h"
diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index 9564bfaa3..5647265a0 100644
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -7,7 +7,7 @@ const char *__progname;
 
 #include <fnmatch.h>
 
-#include <rpm/rpmtag.h>
+#include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>	/* RPM_MACHTABLE, rpmReadPackageFile */
 #include <rpm/rpmcli.h>
 #include <rpm/rpmlog.h>