diff --git a/include/control.h b/include/control.h
index 8bb0b009..39a24e5c 100644
--- a/include/control.h
+++ b/include/control.h
@@ -15,7 +15,12 @@
 #define SND_CONTROL_DLSYM_VERSION	_dlsym_control_001
 
 /** IEC958 structure */
-typedef struct sndrv_aes_iec958 snd_aes_iec958_t;
+typedef struct snd_aes_iec958 {
+	unsigned char status[24];	/**< AES/IEC958 channel status bits */
+	unsigned char subcode[147];	/**< AES/IEC958 subcode bits */
+	unsigned char pad;		/**< nothing */
+	unsigned char dig_subframe[4];	/**< AES/IEC958 subframe bits */
+} snd_aes_iec958_t;
 
 /** CTL card info container */
 typedef struct _snd_ctl_card_info snd_ctl_card_info_t;
diff --git a/include/pcm.h b/include/pcm.h
index 1bb1b37f..a46bafd7 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -230,9 +230,9 @@ typedef enum _snd_pcm_tstamp {
 } snd_pcm_tstamp_t;
 
 /** Unsigned frames quantity */
-typedef sndrv_pcm_uframes_t snd_pcm_uframes_t;
+typedef unsigned long snd_pcm_uframes_t;
 /** Signed frames quantity */
-typedef sndrv_pcm_sframes_t snd_pcm_sframes_t;
+typedef long snd_pcm_sframes_t;
 /** Timestamp */
 typedef struct timeval snd_timestamp_t;