diff --git a/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c b/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c
index 9c6f21844..663999b5d 100644
--- a/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c
+++ b/boot/bootutil/src/fault_injection_hardening_delay_rng_mbedtls.c
@@ -8,7 +8,6 @@
 
 #ifdef FIH_ENABLE_DELAY
 
-#include "mcuboot-mbedtls-cfg.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/entropy.h"
 
diff --git a/boot/cypress/MCUBootApp/config/mcuboot_crypto_config.h b/boot/cypress/MCUBootApp/config/mcuboot_crypto_config.h
index efb1bda4c..e6998002c 100644
--- a/boot/cypress/MCUBootApp/config/mcuboot_crypto_config.h
+++ b/boot/cypress/MCUBootApp/config/mcuboot_crypto_config.h
@@ -3596,8 +3596,6 @@
 #include MBEDTLS_USER_CONFIG_FILE
 #endif
 
-#include "mbedtls/check_config.h"
-
 #ifdef MCUBOOT_ENC_IMAGES
 #define MBEDTLS_SHA256_DIGEST_SIZE (32)
 #define MBEDTLS_AES_KEY_SIZE 16
diff --git a/boot/zephyr/include/config-asn1.h b/boot/zephyr/include/config-asn1.h
index 6acb0e9ac..b9d70df43 100644
--- a/boot/zephyr/include/config-asn1.h
+++ b/boot/zephyr/include/config-asn1.h
@@ -41,6 +41,4 @@
 // #define MBEDTLS_OID_C
 // #define MBEDTLS_SHA256_C
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_ASN1_H */
diff --git a/boot/zephyr/include/config-ec.h b/boot/zephyr/include/config-ec.h
index f16279c6c..f6c690b8c 100644
--- a/boot/zephyr/include/config-ec.h
+++ b/boot/zephyr/include/config-ec.h
@@ -91,6 +91,4 @@
 #define MBEDTLS_NIST_KW_C
 #endif /* MCUBOOT_ENC_IMAGES */
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_ECDSA */
diff --git a/boot/zephyr/include/config-ed25519.h b/boot/zephyr/include/config-ed25519.h
index 4e822cdb8..2766ee254 100644
--- a/boot/zephyr/include/config-ed25519.h
+++ b/boot/zephyr/include/config-ed25519.h
@@ -73,6 +73,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA */
diff --git a/boot/zephyr/include/config-kw.h b/boot/zephyr/include/config-kw.h
index 76d5da788..1198fe5e2 100644
--- a/boot/zephyr/include/config-kw.h
+++ b/boot/zephyr/include/config-kw.h
@@ -63,6 +63,4 @@
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_NIST_KW_C
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_KW */
diff --git a/boot/zephyr/include/config-rsa-kw.h b/boot/zephyr/include/config-rsa-kw.h
index 622548962..ae67df996 100644
--- a/boot/zephyr/include/config-rsa-kw.h
+++ b/boot/zephyr/include/config-rsa-kw.h
@@ -77,6 +77,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA_KW */
diff --git a/boot/zephyr/include/config-rsa.h b/boot/zephyr/include/config-rsa.h
index 1cddcd8da..4b7c75e75 100644
--- a/boot/zephyr/include/config-rsa.h
+++ b/boot/zephyr/include/config-rsa.h
@@ -80,6 +80,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA */
diff --git a/sim/mcuboot-sys/csupport/config-asn1.h b/sim/mcuboot-sys/csupport/config-asn1.h
index 6acb0e9ac..b9d70df43 100644
--- a/sim/mcuboot-sys/csupport/config-asn1.h
+++ b/sim/mcuboot-sys/csupport/config-asn1.h
@@ -41,6 +41,4 @@
 // #define MBEDTLS_OID_C
 // #define MBEDTLS_SHA256_C
 
-#include "mbedtls/check_config.h"
-
 #endif /* MBEDTLS_CONFIG_ASN1_H */
diff --git a/sim/mcuboot-sys/csupport/config-ec-psa.h b/sim/mcuboot-sys/csupport/config-ec-psa.h
index 709330ff8..5dbb4956e 100644
--- a/sim/mcuboot-sys/csupport/config-ec-psa.h
+++ b/sim/mcuboot-sys/csupport/config-ec-psa.h
@@ -32,6 +32,4 @@
 #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
 #endif /* MCUBOOT_SIGN_EC384 */
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_PSA_CRYPTO_CONFIG_ECDSA */
diff --git a/sim/mcuboot-sys/csupport/config-ec.h b/sim/mcuboot-sys/csupport/config-ec.h
index 3b112957e..2ce3b8fc2 100644
--- a/sim/mcuboot-sys/csupport/config-ec.h
+++ b/sim/mcuboot-sys/csupport/config-ec.h
@@ -92,6 +92,4 @@
 #define MBEDTLS_NIST_KW_C
 #endif /* MCUBOOT_ENC_IMAGES */
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_ECDSA */
diff --git a/sim/mcuboot-sys/csupport/config-ed25519.h b/sim/mcuboot-sys/csupport/config-ed25519.h
index 7e4370842..09b3c2112 100644
--- a/sim/mcuboot-sys/csupport/config-ed25519.h
+++ b/sim/mcuboot-sys/csupport/config-ed25519.h
@@ -74,6 +74,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA */
diff --git a/sim/mcuboot-sys/csupport/config-kw.h b/sim/mcuboot-sys/csupport/config-kw.h
index 168e56eee..116eb400a 100644
--- a/sim/mcuboot-sys/csupport/config-kw.h
+++ b/sim/mcuboot-sys/csupport/config-kw.h
@@ -62,6 +62,4 @@
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_NIST_KW_C
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_KW */
diff --git a/sim/mcuboot-sys/csupport/config-rsa-kw.h b/sim/mcuboot-sys/csupport/config-rsa-kw.h
index 1f1f4178a..e06debf47 100644
--- a/sim/mcuboot-sys/csupport/config-rsa-kw.h
+++ b/sim/mcuboot-sys/csupport/config-rsa-kw.h
@@ -81,6 +81,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA_KW */
diff --git a/sim/mcuboot-sys/csupport/config-rsa.h b/sim/mcuboot-sys/csupport/config-rsa.h
index c7767028b..6f174f0e7 100644
--- a/sim/mcuboot-sys/csupport/config-rsa.h
+++ b/sim/mcuboot-sys/csupport/config-rsa.h
@@ -82,6 +82,4 @@
 /* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
-#include "mbedtls/check_config.h"
-
 #endif /* MCUBOOT_MBEDTLS_CONFIG_RSA */