diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index e5da547c74..01458c52f6 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -645,6 +645,12 @@ struct mbedtls_ssl_transform
  * make space for the fixed IV.
  *
  */
+#if MBEDTLS_SSL_CID_OUT_LEN_MAX > MBEDTLS_SSL_CID_IN_LEN_MAX
+#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_OUT_LEN_MAX
+#else
+#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_IN_LEN_MAX
+#endif
+
 typedef struct
 {
     uint8_t ctr[8];         /*!< Record sequence number        */
@@ -656,6 +662,11 @@ typedef struct
     size_t data_offset;     /*!< Offset of record content */
     size_t data_len;        /*!< Length of record content */
 
+#if defined(MBEDTLS_SSL_CID)
+    uint8_t cid_len;
+    unsigned char cid[ SSL_CID_LEN_MAX ];
+#endif /* MBEDTLS_SSL_CID */
+
 } mbedtls_record;
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)