diff --git a/library/aes.c b/library/aes.c
index 1d3cef6fa..555d32ea1 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -40,9 +40,7 @@
 #include "mbedtls/aesni.h"
 #endif
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_AES_ALT)
 
diff --git a/library/arc4.c b/library/arc4.c
index 0405d0d09..dcc13d539 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -31,9 +31,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_ARC4_ALT)
 
diff --git a/library/aria.c b/library/aria.c
index cfa69c2ad..f78d289a4 100644
--- a/library/aria.c
+++ b/library/aria.c
@@ -31,9 +31,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_ARIA_ALT)
 
diff --git a/library/camellia.c b/library/camellia.c
index 24651a9a8..e90cd7f13 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -32,9 +32,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_CAMELLIA_ALT)
 
diff --git a/library/ccm.c b/library/ccm.c
index f922564bb..e0d43334f 100644
--- a/library/ccm.c
+++ b/library/ccm.c
@@ -36,9 +36,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */
 
 #if !defined(MBEDTLS_CCM_ALT)
 
diff --git a/library/chacha20.c b/library/chacha20.c
index f92e5074a..44d1612bf 100644
--- a/library/chacha20.c
+++ b/library/chacha20.c
@@ -32,9 +32,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_CHACHA20_ALT)
 
diff --git a/library/chachapoly.c b/library/chachapoly.c
index 9ae043b3b..4adf84685 100644
--- a/library/chachapoly.c
+++ b/library/chachapoly.c
@@ -28,9 +28,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_CHACHAPOLY_ALT)
 
diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c
index 71650414a..ed31576a7 100644
--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@@ -36,9 +36,7 @@
 #include <stdio.h>
 #endif
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 /*
  * CTR_DRBG context initialization
diff --git a/library/des.c b/library/des.c
index 0576099ce..65f5681cf 100644
--- a/library/des.c
+++ b/library/des.c
@@ -33,9 +33,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_DES_ALT)
 
diff --git a/library/entropy.c b/library/entropy.c
index 91ca9b047..e3b337ff3 100644
--- a/library/entropy.c
+++ b/library/entropy.c
@@ -40,9 +40,7 @@
 
 #include "mbedtls/platform.h"
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if defined(MBEDTLS_HAVEGE_C)
 #include "mbedtls/havege.h"
diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c
index 9ac96275a..69272fa73 100644
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@@ -37,9 +37,7 @@
 #include <stdio.h>
 #endif
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_PLATFORM_C */
 
 /*
  * HMAC_DRBG context initialization
diff --git a/library/md2.c b/library/md2.c
index 0b2c32246..f8293a1df 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -33,9 +33,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_MD2_ALT)
 
diff --git a/library/md4.c b/library/md4.c
index eb22fcd02..a41221348 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -33,9 +33,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_MD4_ALT)
 
diff --git a/library/md5.c b/library/md5.c
index d62e7c137..e53bfe630 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -32,9 +32,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_MD5_ALT)
 
diff --git a/library/nist_kw.c b/library/nist_kw.c
index 6be6998dc..495c23d06 100644
--- a/library/nist_kw.c
+++ b/library/nist_kw.c
@@ -39,9 +39,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST && MBEDTLS_AES_C */
 
 #if !defined(MBEDTLS_NIST_KW_ALT)
 
diff --git a/library/poly1305.c b/library/poly1305.c
index a2b223303..f38f48a45 100644
--- a/library/poly1305.c
+++ b/library/poly1305.c
@@ -28,9 +28,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_POLY1305_ALT)
 
diff --git a/library/ripemd160.c b/library/ripemd160.c
index 8d76a36bd..55e259e19 100644
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@@ -33,9 +33,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_RIPEMD160_ALT)
 
diff --git a/library/sha1.c b/library/sha1.c
index ce43a4e75..7f0c8757d 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -32,9 +32,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #define SHA1_VALIDATE_RET(cond)                             \
     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA1_BAD_INPUT_DATA )
diff --git a/library/sha256.c b/library/sha256.c
index 256102fe4..6f1306ee6 100644
--- a/library/sha256.c
+++ b/library/sha256.c
@@ -32,9 +32,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #define SHA256_VALIDATE_RET(cond)                           \
     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA256_BAD_INPUT_DATA )
diff --git a/library/sha512.c b/library/sha512.c
index a2f2ebf61..2a0cbe610 100644
--- a/library/sha512.c
+++ b/library/sha512.c
@@ -38,9 +38,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #define SHA512_VALIDATE_RET(cond)                           \
     MBEDTLS_INTERNAL_VALIDATE_RET( cond, MBEDTLS_ERR_SHA512_BAD_INPUT_DATA )
diff --git a/library/xtea.c b/library/xtea.c
index be6a98943..28e6972aa 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -26,9 +26,7 @@
 
 #include <string.h>
 
-#if defined(MBEDTLS_SELF_TEST)
 #include "mbedtls/platform.h"
-#endif /* MBEDTLS_SELF_TEST */
 
 #if !defined(MBEDTLS_XTEA_ALT)