diff --git a/lib/rpmds.c b/lib/rpmds.c
index 4de501bf1..ee91740a8 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -5,7 +5,6 @@
 
 #include "rpmlib.h"
 
-#define	_RPMDS_INTERNAL
 #include "rpmds.h"
 
 #include "debug.h"
@@ -21,6 +20,28 @@ int _rpmds_nopromote = 1;
 
 int _rpmds_unspecified_epoch_noise = 0;
 
+/**
+ * A package dependency set.
+ */
+struct rpmds_s {
+    const char * Type;		/*!< Tag name. */
+    const char * DNEVR;		/*!< Formatted dependency string. */
+    Header h;			/*!< Header for dependency set (or NULL) */
+    const char ** N;		/*!< Name. */
+    const char ** EVR;		/*!< Epoch-Version-Release. */
+    int32_t * Flags;		/*!< Bit(s) identifying context/comparison. */
+    uint32_t * Color;		/*!< Bit(s) calculated from file color(s). */
+    int32_t * Refs;		/*!< No. of file refs. */
+    int32_t BT;			/*!< Package build time tie breaker. */
+    rpmTag tagN;		/*!< Header tag. */
+    rpmTagType Nt, EVRt, Ft;	/*!< Tag data types. */
+    int32_t Count;		/*!< No. of elements */
+    int i;			/*!< Element index. */
+    unsigned l;			/*!< Low element (bsearch). */
+    unsigned u;			/*!< High element (bsearch). */
+    int nopromote;		/*!< Don't promote Epoch: in rpmdsCompare()? */
+    int nrefs;			/*!< Reference count. */
+};
 rpmds XrpmdsUnlink(rpmds ds, const char * msg, const char * fn, unsigned ln)
 {
     if (ds == NULL) return NULL;
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 8984aae41..32bc25a0e 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -21,31 +21,6 @@ extern int _rpmds_debug;
  */
 extern int _rpmds_nopromote;
 
-#if defined(_RPMDS_INTERNAL)
-/**
- * A package dependency set.
- */
-struct rpmds_s {
-    const char * Type;		/*!< Tag name. */
-    const char * DNEVR;		/*!< Formatted dependency string. */
-    Header h;			/*!< Header for dependency set (or NULL) */
-    const char ** N;		/*!< Name. */
-    const char ** EVR;		/*!< Epoch-Version-Release. */
-    int32_t * Flags;		/*!< Bit(s) identifying context/comparison. */
-    uint32_t * Color;		/*!< Bit(s) calculated from file color(s). */
-    int32_t * Refs;		/*!< No. of file refs. */
-    int32_t BT;			/*!< Package build time tie breaker. */
-    rpmTag tagN;		/*!< Header tag. */
-    rpmTagType Nt, EVRt, Ft;	/*!< Tag data types. */
-    int32_t Count;		/*!< No. of elements */
-    int i;			/*!< Element index. */
-    unsigned l;			/*!< Low element (bsearch). */
-    unsigned u;			/*!< High element (bsearch). */
-    int nopromote;		/*!< Don't promote Epoch: in rpmdsCompare()? */
-    int nrefs;			/*!< Reference count. */
-};
-#endif	/* _RPMDS_INTERNAL */
-
 /**
  * Unreference a dependency set instance.
  * @param ds		dependency set