diff --git a/build/pack.c b/build/pack.c
index 89fb07d93..c62cccd75 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* fdInitDigest, fdFiniDigest */
 #include "rpmbuild.h"
 
 #include "rpmps.h"
diff --git a/lib/formats.c b/lib/formats.c
index 3e4e83d12..dddabf1f9 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -3,7 +3,7 @@
  */
 
 #include "system.h"
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* for b64, pgpDig*_s */
 #include "rpmlib.h"
 #include "rpmmacro.h"	/* XXX for %_i18ndomains */
 
diff --git a/lib/fsm.c b/lib/fsm.c
index a6ec56f2f..1e62586ca 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* fdGet/SetCpioPos, fdInit/FiniDigest... */
 #include "rpmlib.h"
 
 #include "cpio.h"
diff --git a/lib/package.c b/lib/package.c
index 1ad48c7c7..7764683b4 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -6,7 +6,7 @@
 
 #include <netinet/in.h>
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* fddigest-stuff, FDSTAT_READ, pgpDig*_s */
 #include "rpmlib.h"
 
 #include "rpmts.h"
diff --git a/lib/psm.c b/lib/psm.c
index a8e6e2b2f..b4412da22 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* FDSTAT_*, fdsta_op */
 #include "rpmlib.h"
 #include "rpmmacro.h"
 #include "rpmurl.h"
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 57b2440b9..a18baf2b0 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -5,7 +5,8 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmpgp.h"
+#include "rpmio_internal.h"	/* for fd digest stuff, pgpDig*_s */
 #include "rpmcli.h"
 
 #include "rpmdb.h"
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index dd121cbe3..12bc85ff1 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -13,7 +13,7 @@
 #define __power_pc() 0
 #endif
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* XXX for rpmioSlurp */
 #include "rpmlib.h"
 #include "rpmmacro.h"
 #include "rpmlua.h"
diff --git a/lib/signature.c b/lib/signature.c
index a839232a1..35618f4ea 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* pgpDig*_s, other crypto... */
 #include "rpmlib.h"
 #include "rpmmacro.h"	/* XXX for rpmGetPath() */
 #include "rpmdb.h"
diff --git a/lib/tcpu.c b/lib/tcpu.c
index 1fabd8795..9f45e46e2 100644
--- a/lib/tcpu.c
+++ b/lib/tcpu.c
@@ -1,5 +1,4 @@
 #include "system.h"
-#include "rpmio_internal.h"
 #include "rpmlib.h"
 #include "rpmmacro.h"
 #include "debug.h"
@@ -176,7 +175,6 @@ int main (int argc, char *argv[])
 
     int rc;
 
-_rpmio_debug = 0;
     rc = rpmCpuinfo();
 
     return rc;
diff --git a/lib/tplatform.c b/lib/tplatform.c
index da55567e5..143a523ce 100644
--- a/lib/tplatform.c
+++ b/lib/tplatform.c
@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include "rpmio_internal.h"
+#include "rpmio_internal.h"	/* XXX rpmioSlurp */
 #include "rpmlib.h"
 #include "rpmmacro.h"
 #include "rpmio.h"
diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index f8bfbe4f6..8e294efdd 100644
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -17,7 +17,8 @@
 
 #endif
 
-#include "rpmio_internal.h"
+#include "rpmurl.h"
+#include "rpmio_internal.h"	/* XXX fdInitDigest, fdFiniDigest */
 #include "rpmlead.h"
 #include "rpmlib.h"
 #include "rpmmacro.h"
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index 661ebf7c5..ec983fc60 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -14,7 +14,9 @@
 
 #include <regex.h>
 
-#include "rpmio_internal.h"
+#include "rpmurl.h"
+#include "rpmpgp.h"
+#include "rpmio_internal.h"	/* XXX for base64, pgpDig*_s (signid) */
 #include "rpmmacro.h"
 #include "rpmsq.h"