diff --git a/build/names.c b/build/names.c
index 31e142791..2eb8f2596 100644
--- a/build/names.c
+++ b/build/names.c
@@ -7,6 +7,7 @@
 #include "system.h"
 
 #include <rpmbuild.h>
+#include <rpmlog.h>
 #include "debug.h"
 
 typedef const char * ugstr_t;
diff --git a/lib/depends.c b/lib/depends.c
index dd806589f..2e2067f57 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -7,6 +7,7 @@
 #include <rpmcli.h>		/* XXX rpmcliPackagesTotal */
 
 #include <rpmmacro.h>		/* XXX rpmExpand("%{_dependency_whiteout}" */
+#include <rpmlog.h>
 
 #include <rpmdb.h>
 #include "rpmdb/rpmdb_internal.h"	/* XXX response cache needs dbiOpen et al. */
diff --git a/lib/manifest.c b/lib/manifest.c
index ff1911876..cce22af2b 100644
--- a/lib/manifest.c
+++ b/lib/manifest.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmlog.h>
 #include <rpmfileutil.h>
 
 #include <rpmstring.h>
diff --git a/lib/poptALL.c b/lib/poptALL.c
index 07cd72656..b1d7f6eca 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -8,6 +8,7 @@ const char *__progname;
 
 #include <rpmcli.h>
 #include <rpmgi.h>
+#include <rpmlog.h>
 
 #include "debug.h"
 
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 76064ba88..2b9062484 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -5,6 +5,7 @@
 
 #include <rpmlib.h>
 #include <rpmstring.h>
+#include <rpmlog.h>
 
 #include <rpmds.h>
 
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index faca4145f..642d357c8 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmlog.h>
 
 #include "lib/cpio.h"	/* XXX CPIO_FOO */
 #include "lib/fsm.h"	/* XXX newFSM() */
diff --git a/lib/rpmlock.c b/lib/rpmlock.c
index c76074481..87c102f6e 100644
--- a/lib/rpmlock.c
+++ b/lib/rpmlock.c
@@ -2,6 +2,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmlog.h>
 #include <rpmmacro.h>
 #include <rpmfileutil.h>
 
diff --git a/lib/tgi.c b/lib/tgi.c
index 9a97606c4..85465d0f3 100644
--- a/lib/tgi.c
+++ b/lib/tgi.c
@@ -6,7 +6,6 @@
 #include <rpmte.h>
 
 #include <rpmmacro.h>
-#include <rpmmessages.h>
 #include "rpmio/fts.h"
 #include <popt.h>
 
diff --git a/lib/transaction.c b/lib/transaction.c
index 59d56aaad..65d5327e4 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -6,6 +6,7 @@
 #include <rpmlib.h>
 
 #include <rpmmacro.h>	/* XXX for rpmExpand */
+#include <rpmlog.h>
 
 #include "lib/fsm.h"
 #include "lib/psm.h"
diff --git a/lib/trb.c b/lib/trb.c
index 25f8fe9d7..3f07c0494 100644
--- a/lib/trb.c
+++ b/lib/trb.c
@@ -1,6 +1,7 @@
 #include "system.h"
 #include <rpmcli.h>
 #include <rpmts.h>
+#include <rpmlog.h>
 
 #include "debug.h"
 
diff --git a/lib/tthread.c b/lib/tthread.c
index 786b93553..271f1f1af 100644
--- a/lib/tthread.c
+++ b/lib/tthread.c
@@ -6,6 +6,7 @@
 #include <rpmts.h>
 #include <rpmsq.h>	/* XXX for _rpmsq_debug */
 #include <rpmio.h>
+#include <rpmlog.h>
 
 #include "debug.h"
 
diff --git a/lib/verify.c b/lib/verify.c
index f4c14b84e..40474638e 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include <rpmcli.h>
+#include <rpmlog.h>
 
 #include "lib/psm.h"
 #include <rpmfi.h>
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index d9f3259c8..0d90048f8 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -6,6 +6,7 @@
 
 #include <rpmdb.h>
 #include <rpmsq.h>
+#include <rpmlog.h>
 
 #include "header-py.h"
 #include "rpmal-py.h"
diff --git a/rpmdb/sqlite.c b/rpmdb/sqlite.c
index 2ce4a0d6b..3d1b6ae7c 100644
--- a/rpmdb/sqlite.c
+++ b/rpmdb/sqlite.c
@@ -27,6 +27,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include <rpmlog.h>
 #include <rpmmacro.h>
 #include <rpmurl.h>     	/* XXX urlPath proto */
 #include <rpmfileutil.h>	/* rpmioMkpath */
diff --git a/rpmio/macro.c b/rpmio/macro.c
index 4a7fa0d03..2c1ca0416 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -16,7 +16,6 @@
 #include <rpmstring.h>
 #include <rpmfileutil.h>
 #include <rpmurl.h>
-#include <rpmmessages.h>
 #include <rpmlog.h>
 
 #ifdef	WITH_LUA
diff --git a/rpmio/rpmlog.h b/rpmio/rpmlog.h
index 5bc6cd03a..c45c350ba 100644
--- a/rpmio/rpmlog.h
+++ b/rpmio/rpmlog.h
@@ -226,6 +226,19 @@ rpmlogCallback rpmlogSetCallback(rpmlogCallback cb);
  */
 FILE * rpmlogSetFile(FILE * fp);
 
+#define	rpmSetVerbosity(_lvl)	\
+	((void)rpmlogSetMask( RPMLOG_UPTO( RPMLOG_PRI(_lvl))))
+#define	rpmIncreaseVerbosity()	\
+    ((void)rpmlogSetMask(((((unsigned)(rpmlogSetMask(0) & 0xff)) << 1) | 1)))
+#define	rpmDecreaseVerbosity()	\
+	((void)rpmlogSetMask((((int)(rpmlogSetMask(0) & 0xff)) >> 1)))
+#define	rpmIsNormal()		\
+	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_NOTICE ))
+#define	rpmIsVerbose()		\
+	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_INFO ))
+#define	rpmIsDebug()		\
+	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_DEBUG ))
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index 79339466e..885b801c4 100644
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -6,25 +6,10 @@
  * @todo Eliminate from API.
  */
 
-#include <rpmlog.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define	rpmSetVerbosity(_lvl)	\
-	((void)rpmlogSetMask( RPMLOG_UPTO( RPMLOG_PRI(_lvl))))
-#define	rpmIncreaseVerbosity()	\
-    ((void)rpmlogSetMask(((((unsigned)(rpmlogSetMask(0) & 0xff)) << 1) | 1)))
-#define	rpmDecreaseVerbosity()	\
-	((void)rpmlogSetMask((((int)(rpmlogSetMask(0) & 0xff)) >> 1)))
-#define	rpmIsNormal()		\
-	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_NOTICE ))
-#define	rpmIsVerbose()		\
-	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_INFO ))
-#define	rpmIsDebug()		\
-	(rpmlogSetMask(0) >= RPMLOG_MASK( RPMLOG_DEBUG ))
-
 /* LCL: ??? */
 typedef const void * fnpyKey;
 
diff --git a/rpmio/tdir.c b/rpmio/tdir.c
index d2812f851..da1ae379f 100644
--- a/rpmio/tdir.c
+++ b/rpmio/tdir.c
@@ -2,7 +2,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/tfts.c b/rpmio/tfts.c
index db2883e73..62a9e5076 100644
--- a/rpmio/tfts.c
+++ b/rpmio/tfts.c
@@ -3,7 +3,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/tget.c b/rpmio/tget.c
index 40adc4a3a..9e4f21eef 100644
--- a/rpmio/tget.c
+++ b/rpmio/tget.c
@@ -2,7 +2,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/tglob.c b/rpmio/tglob.c
index 9f8b7d6e1..fe6d9d050 100644
--- a/rpmio/tglob.c
+++ b/rpmio/tglob.c
@@ -2,7 +2,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/thkp.c b/rpmio/thkp.c
index c57b2eab9..d5a1e0084 100644
--- a/rpmio/thkp.c
+++ b/rpmio/thkp.c
@@ -2,7 +2,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/tput.c b/rpmio/tput.c
index 87810d4a8..2d7eb79fe 100644
--- a/rpmio/tput.c
+++ b/rpmio/tput.c
@@ -2,7 +2,7 @@
 
 #include "rpmio/rpmio_internal.h"
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <popt.h>
 
 #include "debug.h"
diff --git a/rpmio/url.c b/rpmio/url.c
index 164f7d898..773809f31 100644
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -8,7 +8,7 @@
 #include <netinet/in.h>
 
 #include <rpmmacro.h>
-#include <rpmmessages.h>
+#include <rpmlog.h>
 #include <rpmurl.h>
 #include <rpmio.h>
 
diff --git a/rpmqv.c b/rpmqv.c
index ba7506069..25cebcb85 100644
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -13,6 +13,7 @@ const char *__progname;
 
 #include <rpmcli.h>
 #include <rpmbuild.h>
+#include <rpmlog.h>
 
 #include <rpmdb.h>
 #include "rpmdb/rpmdb_internal.h"	/* XXX for freeing dbiTags */
diff --git a/tools/rpmcache.c b/tools/rpmcache.c
index a6c15b09a..22bb36aa2 100644
--- a/tools/rpmcache.c
+++ b/tools/rpmcache.c
@@ -9,6 +9,7 @@ const char *__progname;
 #include "rpmio/fts.h"
 
 #include <rpmcli.h>
+#include <rpmlog.h>
 
 #include <rpmps.h>
 #include <rpmdb.h>