diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 20e4436..af8728d 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -88,7 +88,7 @@
 #endif /* MBEDTLS_SSL_PROTO_TLS1_1 */
 #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
-/* Shorthand for restartable */
+/* Shorthand for restartable ECC */
 #if defined(MBEDTLS_ECP_RESTARTABLE) && \
     defined(MBEDTLS_SSL_CLI_C) && \
     defined(MBEDTLS_SSL_PROTO_TLS1_2) && \
@@ -227,10 +227,14 @@
 #endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION */
 #endif /* MBEDTLS_X509_CRT_PARSE_C */
 #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
+    int ec_restart_enabled;             /*!< Handshake supports EC restart? */
+    mbedtls_ecdsa_restart_ctx rs_ctx;   /*!< ECDSA restart context          */
     enum {
         ssl_ecrs_init = 0,              /*!< just getting started           */
         ssl_ecrs_ecdh_public_done,      /*!< wrote ECDHE public share       */
         ssl_ecrs_ecdh_completed,        /*!< completed ECDHE key exchange   */
+        ssl_ecrs_keys_derived,          /*!< ssl_derive_keys() done         */
+        ssl_ecrs_pk_sign_done,          /*!< done writing CertificateVerify */
     } ecrs_state;                       /*!< state for restartable ECC      */
     size_t ecrs_n;                      /*!< place for seving a length      */
 #endif