Unexport FSM(I) typedefs, only usable within rpm

lib/cpio.h

@@ -94,6 +94,10 @@ struct cpioCrcPhysicalHeader {
 
 #define	PHYS_HDR_SIZE	110		/* Don't depend on sizeof(struct) */
 
+/* XXX circular includes avoidance... */
+typedef struct fsmIterator_s * FSMI_t;
+typedef struct fsm_s * FSM_t;
+
 #ifdef __cplusplus
 extern "C" {
 #endif

lib/rpmlib.h

@@ -785,16 +785,6 @@ typedef enum rpmFileTypes_e {
     SOCK	= 12	/*!< socket */
 } rpmFileTypes;
 
-/** \ingroup payload
- * Iterator across package file info, forward on install, backward on erase.
- */
-typedef struct fsmIterator_s * FSMI_t;
-
-/** \ingroup payload
- * File state machine data.
- */
-typedef struct fsm_s * FSM_t;
-
 /**
  * Perform simple sanity and range checks on header tag(s).
  * @param il		no. of tags in header