diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 987e2cf..0178c5e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3384,8 +3384,7 @@
     ssl->ticket_lifetime = SSL_DEFAULT_TICKET_LIFETIME;
 #endif
 
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
-    defined(POLARSSL_SSL_SET_CURVES)
+#if defined(POLARSSL_SSL_SET_CURVES)
     ssl->curve_list = ecp_grp_id_list( );
 #endif
 
@@ -3801,6 +3800,16 @@
 }
 #endif /* POLARSSL_DHM_C */
 
+#if defined(POLARSSL_SSL_SET_CURVES)
+/*
+ * Set the allowed elliptic curves
+ */
+void ssl_set_curves( ssl_context *ssl, const ecp_group_id *curve_list )
+{
+  ssl->curve_list = curve_list;
+}
+#endif
+
 #if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)
 int ssl_set_hostname( ssl_context *ssl, const char *hostname )
 {
@@ -4616,13 +4625,3 @@
 
 #endif
 
-#if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
-    defined(POLARSSL_SSL_SET_CURVES)
-/*
- * Set the allowed ECDH curves.
- */
-void ssl_set_curves( ssl_context *ssl, const ecp_group_id *curve_list )
-{
-  ssl->curve_list = curve_list;
-}
-#endif