diff --git a/ChangeLog.d/issue4212.txt b/ChangeLog.d/issue4212.txt
index d9a7cd5..4943d71 100644
--- a/ChangeLog.d/issue4212.txt
+++ b/ChangeLog.d/issue4212.txt
@@ -1,4 +1,4 @@
-Changes
+API changes
    * Rename functions whose deprecated variants have been removed via #4029:
      mbedtls_ctr_drbg_update_ret  -> mbedtls_ctr_drbg_update
      mbedtls_hmac_drbg_update_ret -> mbedtls_hmac_drbg_update
diff --git a/docs/3.0-migration-guide.d/rename_the__ret_functions.md b/docs/3.0-migration-guide.d/rename_the__ret_functions.md
index 513f167..c6fe714 100644
--- a/docs/3.0-migration-guide.d/rename_the__ret_functions.md
+++ b/docs/3.0-migration-guide.d/rename_the__ret_functions.md
@@ -1,7 +1,9 @@
-Rename mbedtls_*_ret() cryptography functions whose deprecated variants have been removed in #4029
---
+Rename mbedtls_*_ret() cryptography functions whose deprecated variants
+have been removed in #4029
+--------------------------
 
-This change affects users who were using the `mbedtls_*_ret()` criptography functions.
+This change affects users who were using the `mbedtls_*_ret()` cryptography
+functions.
 
 Those functions were created based on now-deprecated functions according to a
 requirement that a function needs to return a value. This change brings back the
diff --git a/include/mbedtls/compat-2.x.h b/include/mbedtls/compat-2.x.h
index fe7aa16..fe07790 100644
--- a/include/mbedtls/compat-2.x.h
+++ b/include/mbedtls/compat-2.x.h
@@ -22,8 +22,6 @@
  *  limitations under the License.
  */
 
-#if ! defined(MBEDTLS_DEPRECATED_REMOVED)
-
 #if defined(MBEDTLS_DEPRECATED_WARNING)
 #warning "Including compat-2.x.h is deprecated"
 #endif
@@ -66,4 +64,3 @@
 #define mbedtls_sha512_ret            mbedtls_sha512
 
 #endif /* MBEDTLS_COMPAT2X_H */
-#endif /* MBEDTLS_DEPRECATED_REMOVED */