diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index b84d047..df60ee5 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_snprintf   snprintf
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
 #endif
 
 #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) ||  \
@@ -58,10 +57,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 int main( int argc, char *argv[] )
 {
     FILE *f;
diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c
index a37b66a..5f3e278 100644
--- a/programs/pkey/pk_verify.c
+++ b/programs/pkey/pk_verify.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_snprintf   snprintf
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
 #endif
 
 #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_MD_C) || \
@@ -54,10 +53,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 int main( int argc, char *argv[] )
 {
     FILE *f;
diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index ff6e4cc..1da7304 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_snprintf   snprintf
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
 #endif
 
 #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) ||  \
@@ -59,10 +58,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 int main( int argc, char *argv[] )
 {
     FILE *f;
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index a3c81d4..eda810c 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_snprintf   snprintf
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
 #endif
 
 #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) ||  \
@@ -58,10 +57,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 int main( int argc, char *argv[] )
 {
     FILE *f;
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 2933ab3..7331ac1 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_printf     printf
 #define mbedtls_fprintf    fprintf
-#define mbedtls_printf     printf
 #define mbedtls_snprintf   snprintf
 #endif
 
@@ -62,12 +61,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
-#if !defined  snprintf
-#define  snprintf  _snprintf
-#endif
-#endif
-
 #define DFL_SERVER_NAME         "localhost"
 #define DFL_SERVER_ADDR         NULL
 #define DFL_SERVER_PORT         "4433"
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index e68b4ed..953da6a 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -75,10 +75,6 @@
 #include "mbedtls/memory_buffer_alloc.h"
 #endif
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 /*
  * For heap usage estimates, we need an estimate of the overhead per allocated
  * block. ptmalloc2/3 (used in gnu libc for instance) uses 2 size_t per block,
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index 43dc44c..25eeed4 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #define mbedtls_snprintf   snprintf
 #define mbedtls_printf     printf
-#define mbedtls_snprintf   snprintf
 #endif
 
 #if defined(MBEDTLS_RSA_C) && defined(MBEDTLS_X509_CRT_PARSE_C) && \
@@ -44,10 +43,6 @@
 #include <string.h>
 #endif
 
-#if defined _MSC_VER && !defined snprintf
-#define snprintf _snprintf
-#endif
-
 #define MAX_CLIENT_CERTS    8
 
 #if !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_X509_CRT_PARSE_C) || \