cleanup library and some basic tests. Includes, add guards to includes

2024-11-22 16:25:43 +01:00 · 2015-02-06 13:43:58 +00:00 · 2015-02-06 13:43:58 +00:00 · 00ab47026b
commit 00ab47026b
parent e83ac1d7d1
100 changed files with 284 additions and 192 deletions
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if !defined(POLARSSL_ARC4_ALT)
 // Regular implementation
--- a/include/polarssl/asn1.h
+++ b/include/polarssl/asn1.h
@ -30,12 +30,12 @@
 #include POLARSSL_CONFIG_FILE
 #endif

+#include <stddef.h>
+
 #if defined(POLARSSL_BIGNUM_C)
 #include "bignum.h"
 #endif

-#include <string.h>
-
 /**
 * \addtogroup asn1_module
 * \{
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@ -24,7 +24,7 @@
 #ifndef POLARSSL_BASE64_H
 #define POLARSSL_BASE64_H

-#include <string.h>
+#include <stddef.h>

 #define POLARSSL_ERR_BASE64_BUFFER_TOO_SMALL               -0x002A  /**< Output buffer too small. */
 #define POLARSSL_ERR_BASE64_INVALID_CHARACTER              -0x002C  /**< Invalid character in input. */
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@ -24,14 +24,14 @@
 #ifndef POLARSSL_BIGNUM_H
 #define POLARSSL_BIGNUM_H

-#include <string.h>
-
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif

+#include <stddef.h>
+
 #if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif
--- a/include/polarssl/blowfish.h
+++ b/include/polarssl/blowfish.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@ -33,6 +33,8 @@
 #include POLARSSL_CONFIG_FILE
 #endif

+#include <stddef.h>
+
 #if defined(POLARSSL_GCM_C) || defined(POLARSSL_CCM_C)
 #define POLARSSL_CIPHER_MODE_AEAD
 #endif
@ -41,8 +43,6 @@
 #define POLARSSL_CIPHER_MODE_WITH_PADDING
 #endif

-#include <string.h>
-
 #if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@ -31,6 +31,7 @@
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+ 
 #include "cipher.h"

 #ifdef __cplusplus
--- a/include/polarssl/ctr_drbg.h
+++ b/include/polarssl/ctr_drbg.h
@ -24,8 +24,6 @@
 #ifndef POLARSSL_CTR_DRBG_H
 #define POLARSSL_CTR_DRBG_H

-#include <string.h>
-
 #include "aes.h"

 #define POLARSSL_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED        -0x0034  /**< The entropy source failed. */
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@ -29,7 +29,9 @@
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+
 #include "ssl.h"
+
 #if defined(POLARSSL_ECP_C)
 #include "ecp.h"
 #endif
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/entropy.h
+++ b/include/polarssl/entropy.h
@ -24,14 +24,14 @@
 #ifndef POLARSSL_ENTROPY_H
 #define POLARSSL_ENTROPY_H

-#include <string.h>
-
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif

+#include <stddef.h>
+
 #if defined(POLARSSL_SHA512_C) && !defined(POLARSSL_ENTROPY_FORCE_SHA256)
 #include "sha512.h"
 #define POLARSSL_ENTROPY_SHA512_ACCUMULATOR
--- a/include/polarssl/entropy_poll.h
+++ b/include/polarssl/entropy_poll.h
@ -24,14 +24,14 @@
 #ifndef POLARSSL_ENTROPY_POLL_H
 #define POLARSSL_ENTROPY_POLL_H

-#include <string.h>
-
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif

+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@ -24,7 +24,7 @@
 #ifndef POLARSSL_ERROR_H
 #define POLARSSL_ERROR_H

-#include <string.h>
+#include <stddef.h>

 /**
 * Error code layout.
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@ -24,7 +24,7 @@
 #ifndef POLARSSL_HAVEGE_H
 #define POLARSSL_HAVEGE_H

-#include <string.h>
+#include <stddef.h>

 #define COLLECT_SIZE 1024

--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@ -26,7 +26,7 @@
 #ifndef POLARSSL_MD_H
 #define POLARSSL_MD_H

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #define POLARSSL_ERR_MD2_FILE_IO_ERROR                 -0x0070  /**< Read/write error in file. */

--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/md_wrap.h
+++ b/include/polarssl/md_wrap.h
@ -31,6 +31,7 @@
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+ 
 #include "md.h"

 #ifdef __cplusplus
--- a/include/polarssl/memory_buffer_alloc.h
+++ b/include/polarssl/memory_buffer_alloc.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <stdlib.h>
+#include <stddef.h>

 /**
 * \name SECTION: Module settings
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@ -24,7 +24,7 @@
 #ifndef POLARSSL_NET_H
 #define POLARSSL_NET_H

-#include <string.h>
+#include <stddef.h>

 #define POLARSSL_ERR_NET_UNKNOWN_HOST                      -0x0056  /**< Failed to get an IP address for the given hostname. */
 #define POLARSSL_ERR_NET_SOCKET_FAILED                     -0x0042  /**< Failed to open a socket. */
--- a/include/polarssl/oid.h
+++ b/include/polarssl/oid.h
@ -24,14 +24,17 @@
 #ifndef POLARSSL_OID_H
 #define POLARSSL_OID_H

-#include <string.h>
 #if !defined(POLARSSL_CONFIG_FILE)
 #include "config.h"
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
+
 #include "asn1.h"
 #include "pk.h"
+
+#include <stddef.h>
+
 #if defined(POLARSSL_CIPHER_C)
 #include "cipher.h"
 #endif
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@ -42,7 +42,6 @@ typedef INT32 int32_t;
 #include <inttypes.h>
 #endif

-
 #define PADLOCK_RNG 0x000C
 #define PADLOCK_ACE 0x00C0
 #define PADLOCK_PHE 0x0C00
--- a/include/polarssl/pbkdf2.h
+++ b/include/polarssl/pbkdf2.h
@ -27,10 +27,10 @@
 #ifndef POLARSSL_PBKDF2_H
 #define POLARSSL_PBKDF2_H

-#include <string.h>
-
 #include "md.h"

+#include <stddef.h>
+
 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
--- a/include/polarssl/pem.h
+++ b/include/polarssl/pem.h
@ -24,7 +24,7 @@
 #ifndef POLARSSL_PEM_H
 #define POLARSSL_PEM_H

-#include <string.h>
+#include <stddef.h>

 /**
 * \name PEM Error codes
--- a/include/polarssl/pkcs12.h
+++ b/include/polarssl/pkcs12.h
@ -24,12 +24,12 @@
 #ifndef POLARSSL_PKCS12_H
 #define POLARSSL_PKCS12_H

-#include <string.h>
-
 #include "md.h"
 #include "cipher.h"
 #include "asn1.h"

+#include <stddef.h>
+
 #define POLARSSL_ERR_PKCS12_BAD_INPUT_DATA                 -0x1F80  /**< Bad input parameters to function. */
 #define POLARSSL_ERR_PKCS12_FEATURE_UNAVAILABLE            -0x1F00  /**< Feature not available, e.g. unsupported encryption scheme. */
 #define POLARSSL_ERR_PKCS12_PBE_INVALID_FORMAT             -0x1E80  /**< PBE ASN.1 data not as expected. */
--- a/include/polarssl/pkcs5.h
+++ b/include/polarssl/pkcs5.h
@ -26,11 +26,11 @@
 #ifndef POLARSSL_PKCS5_H
 #define POLARSSL_PKCS5_H

-#include <string.h>
-
 #include "asn1.h"
 #include "md.h"

+#include <stddef.h>
+
 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
--- a/include/polarssl/platform.h
+++ b/include/polarssl/platform.h
@ -35,8 +35,6 @@
 #define POLARSSL_PLATFORM_MEMORY
 #endif

-#include <stdio.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@ -50,6 +48,7 @@ extern "C" {
 */

 #if !defined(POLARSSL_PLATFORM_NO_STD_FUNCTIONS)
+#include <stdio.h>
 #include <stdlib.h>
 #if !defined(POLARSSL_PLATFORM_STD_PRINTF)
 #define POLARSSL_PLATFORM_STD_PRINTF   printf /**< Default printf to use  */
@ -88,10 +87,10 @@ extern void (*polarssl_free)( void *ptr );
 */
 int platform_set_malloc_free( void * (*malloc_func)( size_t ),
                              void (*free_func)( void * ) );
-#else /* POLARSSL_PLATFORM_ENTROPY */
+#else /* !POLARSSL_PLATFORM_MEMORY */
 #define polarssl_malloc     malloc
 #define polarssl_free       free
-#endif /* POLARSSL_PLATFORM_ENTROPY */
+#endif /* POLARSSL_PLATFORM_MEMORY */

 /*
 * The function pointers for printf
--- a/include/polarssl/ripemd160.h
+++ b/include/polarssl/ripemd160.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/sha256.h
+++ b/include/polarssl/sha256.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/include/polarssl/sha512.h
+++ b/include/polarssl/sha512.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) || defined(__WATCOMC__)
  #define UL64(x) x##ui64
--- a/include/polarssl/x509_crt.h
+++ b/include/polarssl/x509_crt.h
@ -31,7 +31,6 @@
 #endif

 #include "x509.h"
-
 #include "x509_crl.h"

 /**
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@ -30,7 +30,7 @@
 #include POLARSSL_CONFIG_FILE
 #endif

-#include <string.h>
+#include <stddef.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
--- a/library/aes.c
+++ b/library/aes.c
@ -34,6 +34,8 @@

 #if defined(POLARSSL_AES_C)

+#include <string.h>
+
 #include "polarssl/aes.h"
 #if defined(POLARSSL_PADLOCK_C)
 #include "polarssl/padlock.h"
@ -42,11 +44,14 @@
 #include "polarssl/aesni.h"
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 #if !defined(POLARSSL_AES_ALT)

@ -926,7 +931,6 @@ int aes_crypt_cfb128( aes_context *ctx,
 /*
 * AES-CFB8 buffer encryption/decryption
 */
-#include <stdio.h>
 int aes_crypt_cfb8( aes_context *ctx,
                       int mode,
                       size_t length,
@ -996,9 +1000,6 @@ int aes_crypt_ctr( aes_context *ctx,
 #endif /* !POLARSSL_AES_ALT */

 #if defined(POLARSSL_SELF_TEST)
-
-#include <stdio.h>
-
 /*
 * AES test vectors from:
 *
--- a/library/aesni.c
+++ b/library/aesni.c
@ -34,7 +34,8 @@
 #if defined(POLARSSL_AESNI_C)

 #include "polarssl/aesni.h"
-#include <stdio.h>
+
+#include <string.h>

 #if defined(POLARSSL_HAVE_X86_64)

--- a/library/arc4.c
+++ b/library/arc4.c
@ -35,11 +35,16 @@

 #include "polarssl/arc4.h"

+#include <string.h>
+
+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 #if !defined(POLARSSL_ARC4_ALT)

@ -126,10 +131,6 @@ int arc4_crypt( arc4_context *ctx, size_t length, const unsigned char *input,
 #endif /* !POLARSSL_ARC4_ALT */

 #if defined(POLARSSL_SELF_TEST)
-
-#include <string.h>
-#include <stdio.h>
-
 /*
 * ARC4 tests vectors as posted by Eric Rescorla in sep. 1994:
 *
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@ -30,6 +30,8 @@

 #include "polarssl/asn1.h"

+#include <string.h>
+
 #if defined(POLARSSL_BIGNUM_C)
 #include "polarssl/bignum.h"
 #endif
@ -37,13 +39,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <string.h>
-#include <stdlib.h>
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/asn1write.c
+++ b/library/asn1write.c
@ -30,6 +30,8 @@

 #include "polarssl/asn1write.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
--- a/library/base64.c
+++ b/library/base64.c
@ -37,11 +37,15 @@ typedef UINT32 uint32_t;
 #include <inttypes.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
+#include <string.h>
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 static const unsigned char base64_enc_map[64] =
 {
@ -221,9 +225,6 @@ int base64_decode( unsigned char *dst, size_t *dlen,

 #if defined(POLARSSL_SELF_TEST)

-#include <string.h>
-#include <stdio.h>
-
 static const unsigned char base64_test_dec[64] =
 {
    0x24, 0x48, 0x6E, 0x56, 0x87, 0x62, 0x5A, 0xBD,
--- a/library/bignum.c
+++ b/library/bignum.c
@ -38,16 +38,18 @@
 #include "polarssl/bignum.h"
 #include "polarssl/bn_mul.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
+#include <stdlib.h>
 #define polarssl_printf     printf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/blowfish.c
+++ b/library/blowfish.c
@ -36,6 +36,8 @@

 #include "polarssl/blowfish.h"

+#include <string.h>
+
 #if !defined(POLARSSL_BLOWFISH_ALT)

 /* Implementation that should never be optimized out by the compiler */
--- a/library/camellia.c
+++ b/library/camellia.c
@ -36,11 +36,15 @@

 #include "polarssl/camellia.h"

+#if defined(POLARSSL_SELF_TEST)
+#include <string.h>
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 #if !defined(POLARSSL_CAMELLIA_ALT)

@ -689,8 +693,6 @@ int camellia_crypt_ctr( camellia_context *ctx,

 #if defined(POLARSSL_SELF_TEST)

-#include <stdio.h>
-
 /*
 * Camellia test vectors from:
 *
--- a/library/ccm.c
+++ b/library/ccm.c
@ -39,6 +39,17 @@

 #include "polarssl/ccm.h"

+#include <string.h>
+
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdio.h>
+#define polarssl_printf printf
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */
+
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
@ -333,14 +344,6 @@ int ccm_auth_decrypt( ccm_context *ctx, size_t length,


 #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#include <stdio.h>
-#define polarssl_printf printf
-#endif
-
 /*
 * Examples 1 to 3 from SP800-38C Appendix C
 */
--- a/library/cipher.c
+++ b/library/cipher.c
@ -35,6 +35,9 @@
 #include "polarssl/cipher.h"
 #include "polarssl/cipher_wrap.h"

+#include <stdlib.h>
+#include <string.h>
+
 #if defined(POLARSSL_GCM_C)
 #include "polarssl/gcm.h"
 #endif
@ -43,8 +46,6 @@
 #include "polarssl/ccm.h"
 #endif

-#include <stdlib.h>
-
 #if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER)
 #define POLARSSL_CIPHER_MODE_STREAM
 #endif
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@ -65,12 +65,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 #if defined(POLARSSL_GCM_C)
 /* shared by all GCM ciphers */
 static void *gcm_ctx_alloc( void )
--- a/library/ctr_drbg.c
+++ b/library/ctr_drbg.c
@ -35,15 +35,20 @@

 #include "polarssl/ctr_drbg.h"

+#include <string.h>
+
 #if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
@ -443,8 +448,6 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )

 #if defined(POLARSSL_SELF_TEST)

-#include <stdio.h>
-
 static unsigned char entropy_source_pr[96] =
    { 0xc1, 0x80, 0x81, 0xa6, 0x5d, 0x44, 0x02, 0x16,
      0x19, 0xb3, 0xf1, 0x80, 0xb1, 0xc9, 0x20, 0x02,
--- a/library/debug.c
+++ b/library/debug.c
@ -31,8 +31,8 @@
 #include "polarssl/debug.h"

 #include <stdarg.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>

 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #if !defined  snprintf
--- a/library/des.c
+++ b/library/des.c
@ -36,11 +36,16 @@

 #include "polarssl/des.h"

+#include <string.h>
+
+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 #if !defined(POLARSSL_DES_ALT)

@ -802,9 +807,6 @@ int des3_crypt_cbc( des3_context *ctx,
 #endif /* !POLARSSL_DES_ALT */

 #if defined(POLARSSL_SELF_TEST)
-
-#include <stdio.h>
-
 /*
 * DES and 3DES test vectors from:
 *
--- a/library/dhm.c
+++ b/library/dhm.c
@ -35,6 +35,8 @@

 #include "polarssl/dhm.h"

+#include <string.h>
+
 #if defined(POLARSSL_PEM_PARSE_C)
 #include "polarssl/pem.h"
 #endif
--- a/library/ecdh.c
+++ b/library/ecdh.c
@ -37,6 +37,8 @@

 #include "polarssl/ecdh.h"

+#include <string.h>
+
 /*
 * Generate public key: simple wrapper around ecp_gen_keypair
 */
--- a/library/ecdsa.c
+++ b/library/ecdsa.c
@ -37,6 +37,8 @@
 #include "polarssl/ecdsa.h"
 #include "polarssl/asn1write.h"

+#include <string.h>
+
 #if defined(POLARSSL_ECDSA_DETERMINISTIC)
 #include "polarssl/hmac_drbg.h"
 #endif
--- a/library/ecp.c
+++ b/library/ecp.c
@ -51,16 +51,17 @@

 #include "polarssl/ecp.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_printf     printf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
    !defined(EFI32)
 #define strcasecmp _stricmp
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@ -30,6 +30,8 @@

 #include "polarssl/ecp.h"

+#include <string.h>
+
 #if defined(_MSC_VER) && !defined(inline)
 #define inline _inline
 #else
--- a/library/entropy.c
+++ b/library/entropy.c
@ -31,10 +31,21 @@
 #include "polarssl/entropy.h"
 #include "polarssl/entropy_poll.h"

+#include <string.h>
+
 #if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
+#include <stdio.h>
+#define polarssl_printf     printf
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */
+
 #if defined(POLARSSL_HAVEGE_C)
 #include "polarssl/havege.h"
 #endif
@ -378,14 +389,6 @@ int entropy_update_seed_file( entropy_context *ctx, const char *path )
 #endif /* POLARSSL_FS_IO */

 #if defined(POLARSSL_SELF_TEST)
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#include <stdio.h>
-#define polarssl_printf     printf
-#endif
-
 /*
 * Dummy source function
 */
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@ -32,6 +32,7 @@
 #include "polarssl/entropy_poll.h"

 #if defined(POLARSSL_TIMING_C)
+#include <string.h>
 #include "polarssl/timing.h"
 #endif
 #if defined(POLARSSL_HAVEGE_C)
--- a/library/error.c
+++ b/library/error.c
@ -28,10 +28,13 @@

 #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY)
 #include "polarssl/error.h"
+#include <string.h>
 #endif

 #if defined(POLARSSL_ERROR_C)

+#include <stdio.h>
+
 #if defined(POLARSSL_AES_C)
 #include "polarssl/aes.h"
 #endif
@ -172,9 +175,6 @@
 #include "polarssl/xtea.h"
 #endif

-#include <stdio.h>
-#include <string.h>
-
 #if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
    !defined(EFI32)
 #define  snprintf  _snprintf
@ -746,8 +746,6 @@ void error_strerror( int ret, char *buf, size_t buflen )

 #if defined(POLARSSL_ERROR_STRERROR_DUMMY)

-#include <string.h>
-
 /*
 * Provide an non-function in case POLARSSL_ERROR_C is not defined
 */
--- a/library/gcm.c
+++ b/library/gcm.c
@ -40,15 +40,20 @@

 #include "polarssl/gcm.h"

+#include <string.h>
+
 #if defined(POLARSSL_AESNI_C)
 #include "polarssl/aesni.h"
 #endif

+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */

 /*
 * 32-bit integer manipulation macros (big endian)
@ -496,9 +501,6 @@ void gcm_free( gcm_context *ctx )
 }

 #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
-
-#include <stdio.h>
-
 /*
 * AES-GCM test vectors from:
 *
--- a/library/hmac_drbg.c
+++ b/library/hmac_drbg.c
@ -36,15 +36,20 @@

 #include "polarssl/hmac_drbg.h"

+#include <string.h>
+
 #if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_SELF_TEST */
+#endif /* POLARSSL_PLATFORM_C */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
@ -376,8 +381,6 @@ int hmac_drbg_update_seed_file( hmac_drbg_context *ctx, const char *path )

 #if defined(POLARSSL_SELF_TEST)

-#include <stdio.h>
-
 #if !defined(POLARSSL_SHA1_C)
 /* Dummy checkup routine */
 int hmac_drbg_self_test( int verbose )
--- a/library/md.c
+++ b/library/md.c
@ -36,6 +36,7 @@
 #include "polarssl/md_wrap.h"

 #include <stdlib.h>
+#include <string.h>

 #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
    !defined(EFI32)
--- a/library/md2.c
+++ b/library/md2.c
@ -36,15 +36,18 @@

 #include "polarssl/md2.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/md4.c
+++ b/library/md4.c
@ -36,15 +36,20 @@

 #include "polarssl/md4.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/md5.c
+++ b/library/md5.c
@ -35,15 +35,20 @@

 #include "polarssl/md5.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/md_wrap.c
+++ b/library/md_wrap.c
@ -65,12 +65,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/memory_buffer_alloc.c
+++ b/library/memory_buffer_alloc.c
@ -33,8 +33,13 @@
 #include <string.h>

 #if defined(POLARSSL_MEMORY_DEBUG)
+#if defined(POLARSSL_PLATFORM_C)
+#include "polarssl/platform.h"
+#else
 #include <stdio.h>
-#endif
+#define polarssl_fprintf fprintf
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_MEMORY_DEBUG */
 #if defined(POLARSSL_MEMORY_BACKTRACE)
 #include <execinfo.h>
 #endif
@ -43,12 +48,6 @@
 #include "polarssl/threading.h"
 #endif

-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_fprintf fprintf
-#endif
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/net.c
+++ b/library/net.c
@ -30,6 +30,8 @@

 #include "polarssl/net.h"

+#include <string.h>
+
 #if (defined(_WIN32) || defined(_WIN32_WCE)) && !defined(EFIX64) && \
    !defined(EFI32)

--- a/library/oid.c
+++ b/library/oid.c
@ -33,12 +33,13 @@
 #include "polarssl/oid.h"
 #include "polarssl/rsa.h"

+#include <stdio.h>
+#include <string.h>
+
 #if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C)
 #include "polarssl/x509.h"
 #endif

-#include <stdio.h>
-
 /*
 * Macro to automatically add the size of #define'd OIDs
 */
--- a/library/pem.c
+++ b/library/pem.c
@ -34,15 +34,16 @@
 #include "polarssl/md5.h"
 #include "polarssl/cipher.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/pk.c
+++ b/library/pk.c
@ -27,7 +27,6 @@
 #endif

 #if defined(POLARSSL_PK_C)
-
 #include "polarssl/pk.h"
 #include "polarssl/pk_wrap.h"

--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@ -27,12 +27,13 @@
 #endif

 #if defined(POLARSSL_PK_C)
-
 #include "polarssl/pk_wrap.h"

 /* Even if RSA not activated, for the sake of RSA-alt */
 #include "polarssl/rsa.h"

+#include <string.h>
+
 #if defined(POLARSSL_ECP_C)
 #include "polarssl/ecp.h"
 #endif
--- a/library/pkcs11.c
+++ b/library/pkcs11.c
@ -27,6 +27,7 @@
 #include "polarssl/pkcs11.h"

 #if defined(POLARSSL_PKCS11_C)
+
 #include "polarssl/md.h"
 #include "polarssl/oid.h"
 #include "polarssl/x509_crt.h"
--- a/library/pkcs12.c
+++ b/library/pkcs12.c
@ -38,6 +38,8 @@
 #include "polarssl/asn1.h"
 #include "polarssl/cipher.h"

+#include <string.h>
+
 #if defined(POLARSSL_ARC4_C)
 #include "polarssl/arc4.h"
 #endif
--- a/library/pkcs5.c
+++ b/library/pkcs5.c
@ -43,9 +43,12 @@
 #include "polarssl/cipher.h"
 #include "polarssl/oid.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
 #endif

@ -295,8 +298,6 @@ int pkcs5_self_test( int verbose )
 }
 #else

-#include <stdio.h>
-
 #define MAX_TESTS   6

 size_t plen[MAX_TESTS] =
--- a/library/pkparse.c
+++ b/library/pkparse.c
@ -32,6 +32,8 @@
 #include "polarssl/asn1.h"
 #include "polarssl/oid.h"

+#include <string.h>
+
 #if defined(POLARSSL_RSA_C)
 #include "polarssl/rsa.h"
 #endif
--- a/library/pkwrite.c
+++ b/library/pkwrite.c
@ -32,6 +32,8 @@
 #include "polarssl/asn1write.h"
 #include "polarssl/oid.h"

+#include <string.h>
+
 #if defined(POLARSSL_RSA_C)
 #include "polarssl/rsa.h"
 #endif
--- a/library/ripemd160.c
+++ b/library/ripemd160.c
@ -36,19 +36,20 @@

 #include "polarssl/ripemd160.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

 #if defined(POLARSSL_SELF_TEST)
-#include <string.h>
-#endif
-
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /*
 * 32-bit integer manipulation macros (little endian)
--- a/library/rsa.c
+++ b/library/rsa.c
@ -37,16 +37,20 @@
 #include "polarssl/rsa.h"
 #include "polarssl/oid.h"

+#include <string.h>
+
 #if defined(POLARSSL_PKCS1_V21)
 #include "polarssl/md.h"
 #endif

+#if defined(POLARSSL_PKCS1_V15) && !defined(__OpenBSD__)
 #include <stdlib.h>
-#include <stdio.h>
+#endif

 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
 #endif

--- a/library/sha1.c
+++ b/library/sha1.c
@ -35,15 +35,20 @@

 #include "polarssl/sha1.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/sha256.c
+++ b/library/sha256.c
@ -35,15 +35,20 @@

 #include "polarssl/sha256.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/sha512.c
+++ b/library/sha512.c
@ -35,15 +35,20 @@

 #include "polarssl/sha512.h"

-#if defined(POLARSSL_FS_IO) || defined(POLARSSL_SELF_TEST)
+#include <string.h>
+
+#if defined(POLARSSL_FS_IO)
 #include <stdio.h>
 #endif

+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@ -34,15 +34,16 @@

 #include "polarssl/ssl_cache.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 void ssl_cache_init( ssl_cache_context *cache )
 {
    memset( cache, 0, sizeof( ssl_cache_context ) );
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@ -33,7 +33,8 @@
 #include "polarssl/ssl_ciphersuites.h"
 #include "polarssl/ssl.h"

-#include <stdlib.h>
+// #include <stdlib.h>
+#include <string.h>

 #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
    !defined(EFI32)
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@ -31,16 +31,16 @@
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"

+#include <string.h>
+
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-#include <stdio.h>
-
 #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
 #include <basetsd.h>
 typedef UINT32 uint32_t;
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@ -30,6 +30,9 @@

 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"
+
+#include <string.h>
+
 #if defined(POLARSSL_ECP_C)
 #include "polarssl/ecp.h"
 #endif
@ -37,13 +40,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-#include <stdio.h>
-
 #if defined(POLARSSL_HAVE_TIME)
 #include <time.h>
 #endif
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@ -39,6 +39,8 @@
 #include "polarssl/debug.h"
 #include "polarssl/ssl.h"

+#include <string.h>
+
 #if defined(POLARSSL_X509_CRT_PARSE_C) && \
    defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE)
 #include "polarssl/oid.h"
@ -47,12 +49,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <stdlib.h>
-
 #if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
    !defined(EFI32)
 #define strcasecmp _stricmp
--- a/library/x509.c
+++ b/library/x509.c
@ -41,6 +41,9 @@
 #include "polarssl/x509.h"
 #include "polarssl/asn1.h"
 #include "polarssl/oid.h"
+
+#include <string.h>
+
 #if defined(POLARSSL_PEM_PARSE_C)
 #include "polarssl/pem.h"
 #endif
@ -48,21 +51,19 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
+#include <stdlib.h>
 #define polarssl_printf     printf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <string.h>
-#include <stdlib.h>
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 #include <windows.h>
 #else
 #include <time.h>
 #endif

-#include <stdio.h>
-
 #if defined(POLARSSL_FS_IO)
 #if !defined(_WIN32)
 #include <sys/types.h>
--- a/library/x509_create.c
+++ b/library/x509_create.c
@ -32,6 +32,8 @@
 #include "polarssl/asn1write.h"
 #include "polarssl/oid.h"

+#include <string.h>
+
 #if defined(_MSC_VER) && !defined strncasecmp && !defined(EFIX64) && \
    !defined(EFI32)
 #define strncasecmp _strnicmp
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@ -40,6 +40,9 @@

 #include "polarssl/x509_crl.h"
 #include "polarssl/oid.h"
+
+#include <string.h>
+
 #if defined(POLARSSL_PEM_PARSE_C)
 #include "polarssl/pem.h"
 #endif
@ -47,14 +50,12 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <string.h>
-#include <stdlib.h>
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
-
 #include <windows.h>
 #else
 #include <time.h>
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@ -40,6 +40,10 @@

 #include "polarssl/x509_crt.h"
 #include "polarssl/oid.h"
+
+#include <stdio.h>
+#include <string.h>
+
 #if defined(POLARSSL_PEM_PARSE_C)
 #include "polarssl/pem.h"
 #endif
@ -47,6 +51,7 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif
@ -55,22 +60,19 @@
 #include "polarssl/threading.h"
 #endif

-#include <string.h>
-#include <stdlib.h>
 #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
 #include <windows.h>
 #else
 #include <time.h>
 #endif

-#include <stdio.h>
-
 #if defined(POLARSSL_FS_IO)
+#include <stdio.h>
 #if !defined(_WIN32) || defined(EFIX64) || defined(EFI32)
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#endif
+#endif /* !_WIN32 || EFIX64 || EFI32 */
 #endif

 /* Implementation that should never be optimized out by the compiler */
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@ -40,6 +40,9 @@

 #include "polarssl/x509_csr.h"
 #include "polarssl/oid.h"
+
+#include <string.h>
+
 #if defined(POLARSSL_PEM_PARSE_C)
 #include "polarssl/pem.h"
 #endif
@ -47,13 +50,11 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdlib.h>
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif

-#include <string.h>
-#include <stdlib.h>
-
 #if defined(POLARSSL_FS_IO) || defined(EFIX64) || defined(EFI32)
 #include <stdio.h>
 #endif
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@ -39,6 +39,8 @@
 #include "polarssl/asn1write.h"
 #include "polarssl/sha1.h"

+#include <string.h>
+
 #if defined(POLARSSL_PEM_WRITE_C)
 #include "polarssl/pem.h"
 #endif /* POLARSSL_PEM_WRITE_C */
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@ -37,13 +37,13 @@
 #include "polarssl/oid.h"
 #include "polarssl/asn1write.h"

+#include <string.h>
+#include <stdlib.h>
+
 #if defined(POLARSSL_PEM_WRITE_C)
 #include "polarssl/pem.h"
 #endif

-#include <string.h>
-#include <stdlib.h>
-
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
    volatile unsigned char *p = v; while( n-- ) *p++ = 0;
--- a/library/xtea.c
+++ b/library/xtea.c
@ -30,11 +30,16 @@

 #include "polarssl/xtea.h"

+#include <string.h>
+
+#if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST */

 #if !defined(POLARSSL_XTEA_ALT)

@ -190,9 +195,6 @@ int xtea_crypt_cbc( xtea_context *ctx, int mode, size_t length,

 #if defined(POLARSSL_SELF_TEST)

-#include <string.h>
-#include <stdio.h>
-
 /*
 * XTEA tests vectors (non-official)
 */
--- a/tests/scripts/generate_code.pl
+++ b/tests/scripts/generate_code.pl
@ -65,12 +65,12 @@ print TEST_FILE << "END";
 #include POLARSSL_CONFIG_FILE
 #endif

+$test_helpers
+
 $suite_pre_code
 $suite_header
 $suite_post_code

-$test_helpers
-
 END

 $test_main =~ s/SUITE_PRE_DEP/$suite_pre_code/;
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@ -1,6 +1,9 @@
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
+#define polarssl_printf     printf
+#define polarssl_fprintf    fprintf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif
--- a/tests/suites/main_test.function
+++ b/tests/suites/main_test.function
@ -1,15 +1,3 @@
-#include <stdio.h>
-#include <string.h>
-
-#if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
-#else
-#define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
-#endif
-
 #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C)
 #include "polarssl/memory_buffer_alloc.h"
 #endif
--- a/tests/suites/test_suite_ctr_drbg.function
+++ b/tests/suites/test_suite_ctr_drbg.function
@ -1,6 +1,8 @@
 /* BEGIN_HEADER */
 #include <polarssl/ctr_drbg.h>

+#include <string.h>
+
 int test_offset_idx;
 int entropy_func( void *data, unsigned char *buf, size_t len )
 {
--- a/tests/suites/test_suite_hmac_drbg.function
+++ b/tests/suites/test_suite_hmac_drbg.function
@ -1,6 +1,8 @@
 /* BEGIN_HEADER */
 #include <polarssl/hmac_drbg.h>

+#include <string.h>
+
 typedef struct
 {
    unsigned char *p;