Make rpmerr.h private, include directly where needed.

14 files changed, 13 insertions, 1 deletions

diff --git a/lib/fs.c b/lib/fs.c
index 68fbbf755..90778f495 100644
--- a/lib/fs.c
+++ b/lib/fs.c
@@ -5,6 +5,7 @@
 #include "system.h"
 #include <rpmlib.h>
 #include <rpmmacro.h>	/* XXX for rpmGetPath */
+#include "rpmerr.h"
 #include "debug.h"
 
 
diff --git a/lib/idtx.c b/lib/idtx.c
index 5685a719e..0166aa1fd 100644
--- a/lib/idtx.c
+++ b/lib/idtx.c
@@ -5,6 +5,7 @@
 #include "rpmdb.h"
 #include "rpmts.h"
 #include "rpmmacro.h"
+#include "rpmerr.h"
 
 static int reverse = -1;
 
diff --git a/lib/misc.c b/lib/misc.c
index d5c7f8216..ba3900514 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -11,6 +11,7 @@ const char * RPMVERSION = VERSION;
 #include <rpmurl.h>
 #include <rpmmacro.h>	/* XXX for rpmGetPath */
 #include <rpmlib.h>
+#include "rpmerr.h"
 #include "legacy.h"
 #include "misc.h"
 #include "debug.h"
diff --git a/lib/package.c b/lib/package.c
index 50c4943bf..3aa0fc523 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -15,6 +15,7 @@
 #include "legacy.h"	/* XXX legacyRetrofit() */
 #include "rpmlead.h"
 
+#include "rpmerr.h"
 #include "header_internal.h"	/* XXX headerCheck */
 #include "signature.h"
 #include "debug.h"
diff --git a/lib/psm.c b/lib/psm.c
index 836f35be7..5f6927f7d 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -31,6 +31,7 @@
 #include "legacy.h"		/* XXX rpmfiBuildFNames() */
 #include "misc.h"		/* XXX stripTrailingChar() */
 #include "rpmdb.h"		/* XXX for db_chrootDone */
+#include "rpmerr.h"
 #include "debug.h"
 
 #define	_PSM_DEBUG	0
diff --git a/lib/query.c b/lib/query.c
index d877b62d8..79609fbe6 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -19,6 +19,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 #include "misc.h"
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index d88f29d6c..9750847cc 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -12,6 +12,7 @@
 
 #include "rpmts.h"
 
+#include "rpmerr.h"
 #include "rpmlead.h"
 #include "signature.h"
 #include "misc.h"	/* XXX for makeTempFile() */
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index e04f0cc62..ca7dfc046 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -13,6 +13,7 @@
 #include <rpmdb.h>
 #include <rpmmacro.h>		/* XXX rpmExpand */
 #include "manifest.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 321223965..886c35726 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -14,6 +14,7 @@
 #include "rpmts.h"
 
 #include "manifest.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 int rpmcliPackagesTotal = 0;
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index 20f81c3c5..9b4239681 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -10,6 +10,7 @@
 
 #include "signature.h"
 #include "rpmlead.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 static unsigned char lead_magic[] = {
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 5b6b0aad1..2e7758f16 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -10,7 +10,6 @@
 
 #include "rpmio.h"
 #include "rpmmessages.h"
-#include "rpmerr.h"
 #include "header.h"
 #include <popt.h>
 
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index bd60b593c..f106401e1 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -18,6 +18,7 @@
 #include <rpmmacro.h>
 #include <rpmlua.h>
 
+#include "rpmerr.h"
 #include "misc.h"
 #include "debug.h"
 
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 1524f65cf..624dbdca4 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -14,6 +14,7 @@
 #include "rpmds.h"
 #include "rpmfi.h"
 #include "rpmlock.h"
+#include "rpmerr.h"
 
 #define	_RPMTE_INTERNAL		/* XXX te->h */
 #include "rpmte.h"
diff --git a/lib/signature.c b/lib/signature.c
index 29d4f17d4..0d5dbfbb0 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -11,6 +11,7 @@
 
 #include "rpmts.h"
 
+#include "rpmerr.h"
 #include "misc.h"	/* XXX for dosetenv() and makeTempFile() */
 #include "legacy.h"	/* XXX for mdbinfile() */
 #include "rpmlead.h"