diff --git a/include/mbedtls/rsa.h b/include/mbedtls/rsa.h
index eab8e0d..c0a3a8e 100644
--- a/include/mbedtls/rsa.h
+++ b/include/mbedtls/rsa.h
@@ -97,18 +97,18 @@
     mbedtls_mpi P;                      /*!<  1st prime factor  */
     mbedtls_mpi Q;                      /*!<  2nd prime factor  */
 
-#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* DP,DQ,QP are not used in NO_CRT but temporarily kept for ABI
+     * compatibility. Will be removed on next ABI changing release. */
     mbedtls_mpi DP;                     /*!<  D % (P - 1)       */
     mbedtls_mpi DQ;                     /*!<  D % (Q - 1)       */
     mbedtls_mpi QP;                     /*!<  1 / (Q % P)       */
-#endif /* MBEDTLS_RSA_NO_CRT */
 
     mbedtls_mpi RN;                     /*!<  cached R^2 mod N  */
 
-#if !defined(MBEDTLS_RSA_NO_CRT)
+    /* RP, RQ are not used in NO_CRT but temporarily kept for ABI
+     * compatibility. Will be removed on next ABI changing release. */
     mbedtls_mpi RP;                     /*!<  cached R^2 mod P  */
     mbedtls_mpi RQ;                     /*!<  cached R^2 mod Q  */
-#endif /* MBEDTLS_RSA_NO_CRT */
 
     mbedtls_mpi Vi;                     /*!<  cached blinding value     */
     mbedtls_mpi Vf;                     /*!<  cached un-blinding value  */