diff --git a/build.c b/build.c
index 93e3d116c..87cf1bb55 100644
--- a/build.c
+++ b/build.c
@@ -12,6 +12,7 @@
 #include "rpmts.h"
 
 #include "build.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**
diff --git a/build/build.c b/build/build.c
index 235be0b57..58b78b546 100644
--- a/build/build.c
+++ b/build/build.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "misc.h" 	/* XXX for makeTempFile */
 
 #include "debug.h"
diff --git a/build/expression.c b/build/expression.c
index db0415b29..985db1a38 100644
--- a/build/expression.c
+++ b/build/expression.c
@@ -15,6 +15,7 @@
 
 #include <rpmbuild.h>
 #include <rpmlib.h>
+#include "rpmerr.h"
 
 #include "debug.h"
 
diff --git a/build/files.c b/build/files.c
index c713b8b4b..584eb34ad 100644
--- a/build/files.c
+++ b/build/files.c
@@ -30,6 +30,7 @@
 
 #include "legacy.h"	/* XXX domd5, expandFileList, compressFileList */
 #include "misc.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 #define	SKIPWHITE(_x)	{while(*(_x) && (xisspace(*_x) || *(_x) == ',')) (_x)++;}
diff --git a/build/pack.c b/build/pack.c
index 5af1faad2..e1a334972 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -24,6 +24,7 @@
 #include "signature.h"
 #include "rpmlead.h"
 #include "misc.h"	/* XXX for makeTempFile */
+#include "rpmerr.h"
 #include "debug.h"
 
 /**
diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c
index a43b7410c..681d943ae 100644
--- a/build/parseBuildInstallClean.c
+++ b/build/parseBuildInstallClean.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 
diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index 6b3b65171..4b95bc68a 100644
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 void addChangelogEntry(Header h, time_t time, const char *name, const char *text)
diff --git a/build/parseDescription.c b/build/parseDescription.c
index 3d0308b9a..41fcf3cbc 100644
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 extern int noLang;
diff --git a/build/parseFiles.c b/build/parseFiles.c
index bb40ac018..1fdb883d7 100644
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /* These have to be global scope to make up for *stupid* compilers */
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index 3009faaab..220b8e986 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "debug.h"
 
 /**
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 3c39bb24b..785530aed 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -7,6 +7,7 @@
 
 #include <rpmio_internal.h>
 #include <rpmbuild.h>
+#include "rpmerr.h"
 #include "misc.h"	/* XXX for splitString */
 #include "debug.h"
 
diff --git a/build/parseReqs.c b/build/parseReqs.c
index fac52a6f3..2d7066657 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**
diff --git a/build/parseScript.c b/build/parseScript.c
index 41e9e9247..cad93f78f 100644
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "rpmbuild.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 #include <rpmlua.h>
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 5506f7a2d..8ccb2e23a 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -9,6 +9,7 @@
 #include <rpmbuild.h>
 #include "rpmds.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 /**
diff --git a/build/poptBT.c b/build/poptBT.c
index 0cedba01a..2b6f8334a 100644
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -10,6 +10,7 @@
 
 #include "build.h"
 #include "legacy.h"	/* XXX _noDirTokens */
+#include "rpmerr.h"
 #include "debug.h"
 
 struct rpmBuildArguments_s         rpmBTArgs;
diff --git a/build/rpmfc.c b/build/rpmfc.c
index f46deae9a..9304e9c9b 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -5,6 +5,7 @@
 #include <rpmbuild.h>
 #include <argv.h>
 #include <rpmfc.h>
+#include "rpmerr.h"
 
 #define	_RPMDS_INTERNAL
 #include <rpmds.h>
diff --git a/build/spec.c b/build/spec.c
index d8765e939..ad3d536f4 100644
--- a/build/spec.c
+++ b/build/spec.c
@@ -9,6 +9,7 @@
 #include "rpmds.h"
 #include "rpmfi.h"
 #include "rpmts.h"
+#include "rpmerr.h"
 
 #include "debug.h"
 
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"
diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index 87fe71ec9..974a3554d 100644
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -15,6 +15,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 #include <rpmurl.h>	/* XXX urlPath proto */
 
 #include <rpmdb_internal.h>
+#include "rpmerr.h"
 
 #include "debug.h"
 
diff --git a/rpmdb/dbconfig.c b/rpmdb/dbconfig.c
index 51fd38946..64e369f45 100644
--- a/rpmdb/dbconfig.c
+++ b/rpmdb/dbconfig.c
@@ -7,6 +7,7 @@
 #include <rpmlib.h>
 #include <rpmmacro.h>
 
+#include "rpmerr.h"
 #include "rpmdb_internal.h"
 #include "debug.h"
 
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 322a49336..ad79a2e0f 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -18,6 +18,7 @@
 #include <rpmmacro.h>
 #include <rpmsq.h>
 
+#include "rpmerr.h"
 #include "rpmdb_internal.h"
 #include "rpmdb.h"
 #include "fprint.h"
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index de3bdb20a..7d8404e0c 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS += -DRPMCONFIGDIR="\"@RPMCONFIGDIR@\""
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
 	argv.h \
-	rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
+	rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmpgp.h \
 	rpmsq.h rpmsw.h 
 
 usrlibdir = $(libdir)
@@ -20,7 +20,7 @@ librpmio_la_SOURCES = \
 	argv.c digest.c fts.c macro.c \
 	rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
 	rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c stubs.c url.c ugid.c \
-	rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h
+	rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h rpmerr.h
 librpmio_la_LDFLAGS = -release 4.4
 librpmio_la_LIBADD = \
 	@WITH_BEECRYPT_LIB@ \
diff --git a/rpmio/rpmerr.h b/rpmio/rpmerr.h
index a0864d909..ad76e25df 100644
--- a/rpmio/rpmerr.h
+++ b/rpmio/rpmerr.h
@@ -3,7 +3,6 @@
 
 /** \ingroup rpmio
  * \file rpmio/rpmerr.h
- * @todo Eliminate from API.
  */
 
 #include "rpmlog.h"
diff --git a/tools/rpmgraph.c b/tools/rpmgraph.c
index f07be716d..2717b46b4 100644
--- a/tools/rpmgraph.c
+++ b/tools/rpmgraph.c
@@ -13,6 +13,7 @@ const char *__progname;
 
 #include "manifest.h"
 #include "misc.h"		/* rpmGlob */
+#include "rpmerr.h"
 #include "debug.h"
 
 static int noDeps = 1;
diff --git a/tools/rpmsort.c b/tools/rpmsort.c
index cb7c67bd6..b29986ecc 100644
--- a/tools/rpmsort.c
+++ b/tools/rpmsort.c
@@ -12,6 +12,7 @@ const char *__progname;
 
 #include "manifest.h"
 #include "misc.h"
+#include "rpmerr.h"
 #include "debug.h"
 
 static int _depends_debug;