diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 9651014..3f3a369 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -760,6 +760,7 @@
     mbedtls_aes_context enc;                /*!< encryption context                  */
     mbedtls_aes_context dec;                /*!< decryption context                  */
     unsigned char mac_key[16];      /*!< authentication key                  */
+    uint32_t ticket_lifetime;
 };
 #endif /* MBEDTLS_SSL_SESSION_TICKETS */
 
@@ -896,10 +897,6 @@
     unsigned int badmac_limit;      /*!< limit of records with a bad MAC    */
 #endif
 
-#if defined(MBEDTLS_SSL_SESSION_TICKETS)
-    int ticket_lifetime;            /*!< session ticket lifetime (seconds)  */
-#endif
-
     unsigned char max_major_ver;    /*!< max. major version used            */
     unsigned char max_minor_ver;    /*!< max. minor version used            */
     unsigned char min_major_ver;    /*!< min. major version used            */
diff --git a/include/mbedtls/ssl_ticket.h b/include/mbedtls/ssl_ticket.h
index d4ef736..0e69513 100644
--- a/include/mbedtls/ssl_ticket.h
+++ b/include/mbedtls/ssl_ticket.h
@@ -31,14 +31,15 @@
 #endif
 
 /* Temporary, WIP */
-int mbedtls_ssl_ticket_write( const mbedtls_ssl_config *conf,
+int mbedtls_ssl_ticket_write( void *p_ticket,
                               const mbedtls_ssl_session *session,
                               unsigned char *start,
                               const unsigned char *end,
-                              size_t *tlen );
+                              size_t *tlen,
+                              uint32_t *ticket_lifetime );
 
 /* Temporary, WIP */
-int mbedtls_ssl_ticket_parse( const mbedtls_ssl_config *conf,
+int mbedtls_ssl_ticket_parse( void *p_ticket,
                               mbedtls_ssl_session *session,
                               unsigned char *buf,
                               size_t len );