diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c
index db20db4..55f9251 100644
--- a/programs/aes/aescrypt2.c
+++ b/programs/aes/aescrypt2.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if defined(_WIN32)
diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index 2318498..9e4f696 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -32,8 +32,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if defined(_WIN32)
diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c
index 5af63f5..d8c626c 100644
--- a/programs/hash/generic_sum.c
+++ b/programs/hash/generic_sum.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/hash/hello.c b/programs/hash/hello.c
index 083dc9d..c6edf33 100644
--- a/programs/hash/hello.c
+++ b/programs/hash/hello.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <stdio.h>
diff --git a/programs/hash/md5sum.c b/programs/hash/md5sum.c
index 2efe8cf..7dc5fdb 100644
--- a/programs/hash/md5sum.c
+++ b/programs/hash/md5sum.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/hash/sha1sum.c b/programs/hash/sha1sum.c
index b5ad223..cc5b42e 100644
--- a/programs/hash/sha1sum.c
+++ b/programs/hash/sha1sum.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c
index aee4e63..659c271 100644
--- a/programs/hash/sha2sum.c
+++ b/programs/hash/sha2sum.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 3558103..31250bd 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index df12e18..8aabeed 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <stdio.h>
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index b9b3a50..8c93ba1 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c
index aaec249..f30ec48 100644
--- a/programs/pkey/ecdsa.c
+++ b/programs/pkey/ecdsa.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include "polarssl/entropy.h"
diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c
index e968786..2fd60d4 100644
--- a/programs/pkey/gen_key.c
+++ b/programs/pkey/gen_key.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c
index a161829..418653c 100644
--- a/programs/pkey/key_app.c
+++ b/programs/pkey/key_app.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 6862835..dad2c13 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c
index bf277fd..93535b3 100644
--- a/programs/pkey/mpi_demo.c
+++ b/programs/pkey/mpi_demo.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <stdio.h>
diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c
index 314aad3..6fcc4af 100644
--- a/programs/pkey/pk_decrypt.c
+++ b/programs/pkey/pk_decrypt.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c
index 9f29849..121e3b1 100644
--- a/programs/pkey/pk_encrypt.c
+++ b/programs/pkey/pk_encrypt.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index d032691..3f3b85f 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c
index 89e9cc1..0ceb601 100644
--- a/programs/pkey/pk_verify.c
+++ b/programs/pkey/pk_verify.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c
index 1e187a8..215669c 100644
--- a/programs/pkey/rsa_decrypt.c
+++ b/programs/pkey/rsa_decrypt.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c
index e8c00d3..e3cd90a 100644
--- a/programs/pkey/rsa_encrypt.c
+++ b/programs/pkey/rsa_encrypt.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index 955f819..95bc823 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <stdio.h>
diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index 27d1474..e854f70 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index 3c9cbdb..252bbf2 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index 43b742e..4e00bdd 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index 3f79262..6736184 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c
index 5234f01..f18d379 100644
--- a/programs/random/gen_entropy.c
+++ b/programs/random/gen_entropy.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include "polarssl/entropy.h"
diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c
index 5889d11..60c0f01 100644
--- a/programs/random/gen_random_ctr_drbg.c
+++ b/programs/random/gen_random_ctr_drbg.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include "polarssl/entropy.h"
diff --git a/programs/random/gen_random_havege.c b/programs/random/gen_random_havege.c
index d9b6051..c1b420a 100644
--- a/programs/random/gen_random_havege.c
+++ b/programs/random/gen_random_havege.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include "polarssl/havege.h"
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 9964936..c8a61c2 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 247d149..1573b8f 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if !defined(POLARSSL_ENTROPY_C) ||  \
diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c
index d1b4a6a..990749e 100644
--- a/programs/ssl/ssl_fork_server.c
+++ b/programs/ssl/ssl_fork_server.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if defined(_WIN32)
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 00d12ca..31c0b6e 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c
index 9e59e7c..4a6db7a 100644
--- a/programs/ssl/ssl_pthread_server.c
+++ b/programs/ssl/ssl_pthread_server.c
@@ -32,8 +32,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if defined(_WIN32)
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index 7c6a255..c9360d9 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #if defined(_WIN32)
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 6b505e9..7e77f6c 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/test/o_p_test.c b/programs/test/o_p_test.c
index 6cbf299..ce1e522 100644
--- a/programs/test/o_p_test.c
+++ b/programs/test/o_p_test.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index 339b07c..301d6c3 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index 30e95c9..c55090a 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/util/pem2der.c b/programs/util/pem2der.c
index 95543b7..dcd3547 100644
--- a/programs/util/pem2der.c
+++ b/programs/util/pem2der.c
@@ -30,7 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
 #endif
diff --git a/programs/util/strerror.c b/programs/util/strerror.c
index a4db94c..b751ca0 100644
--- a/programs/util/strerror.c
+++ b/programs/util/strerror.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <stdlib.h>
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 92b9130..b7f5950 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -31,8 +31,6 @@
 #else
 #define polarssl_printf     printf
 #define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index 33c3588..41eaea1 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index c671888..b402fb1 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c
index 4097554..8d10e3b 100644
--- a/programs/x509/crl_app.c
+++ b/programs/x509/crl_app.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>
diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c
index 3d85044..bf9610a 100644
--- a/programs/x509/req_app.c
+++ b/programs/x509/req_app.c
@@ -30,9 +30,6 @@
 #include "polarssl/platform.h"
 #else
 #define polarssl_printf     printf
-#define polarssl_fprintf    fprintf
-#define polarssl_malloc     malloc
-#define polarssl_free       free
 #endif
 
 #include <string.h>