Switch to restart context internally
diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h
index 111ef03..59d9d3d 100644
--- a/include/mbedtls/ecp.h
+++ b/include/mbedtls/ecp.h
@@ -112,16 +112,6 @@
 }
 mbedtls_ecp_point;
 
-#if defined(MBEDTLS_ECP_EARLY_RETURN)
-/**
- * \brief           ECP context for resuming multiplication after returning
- *                  \c MBEDTLS_ERR_ECP_IN_PROGRESS
- *
- * \note            Opaque struct
- */
-typedef struct mbedtls_ecp_restart_mul mbedtls_ecp_restart_mul_ctx;
-#endif
-
 /**
  * \brief           ECP group structure
  *
@@ -163,9 +153,6 @@
     void *t_data;                       /*!< unused                         */
     mbedtls_ecp_point *T;       /*!<  pre-computed points for ecp_mul_comb()        */
     size_t T_size;      /*!<  number for pre-computed points                */
-#if defined(MBEDTLS_ECP_EARLY_RETURN)
-    mbedtls_ecp_restart_mul_ctx *rsm;       /*!<  temporary */
-#endif
 }
 mbedtls_ecp_group;
 
@@ -186,6 +173,13 @@
 
 #if defined(MBEDTLS_ECP_EARLY_RETURN)
 /**
+ * \brief           Internal restart context for multiplication
+ *
+ * \note            Opaque struct
+ */
+typedef struct mbedtls_ecp_restart_mul mbedtls_ecp_restart_mul_ctx;
+
+/**
  * \brief           General context for resuming ECC operations
  */
 typedef struct