diff --git a/library/cipher.c b/library/cipher.c
index 277811a..f0a770a 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -44,7 +44,8 @@
 #define POLARSSL_CIPHER_MODE_STREAM
 #endif
 
-#if defined(_MSC_VER) && !defined strcasecmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strcasecmp _stricmp
 #endif
 
diff --git a/library/debug.c b/library/debug.c
index fb0ec71..371cbf9 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -36,13 +36,15 @@
 #include <stdio.h>
 #endif
 
-#if defined(_MSC_VER) && !defined  snprintf
+#if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32)
+#if !defined  snprintf
 #define  snprintf  _snprintf
 #endif
 
-#if defined(_MSC_VER) && !defined vsnprintf
+#if !defined vsnprintf
 #define vsnprintf _vsnprintf
 #endif
+#endif /* _MSC_VER */
 
 char *debug_fmt( const char *format, ... )
 {
diff --git a/library/error.c b/library/error.c
index 3f4bc93..9d76f19 100644
--- a/library/error.c
+++ b/library/error.c
@@ -160,7 +160,8 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined  snprintf
+#if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #define  snprintf  _snprintf
 #endif
 
diff --git a/library/md.c b/library/md.c
index 073f932..af66756 100644
--- a/library/md.c
+++ b/library/md.c
@@ -36,8 +36,9 @@
 
 #include <stdlib.h>
 
-#if defined(_MSC_VER) && !defined strcasecmp
-#define  snprintf  _stricmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
+#define strcasecmp  _stricmp
 #endif
 
 static const int supported_digests[] = {
diff --git a/library/oid.c b/library/oid.c
index f0f43d8..b0b551d 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -542,7 +542,8 @@
 FN_OID_GET_ATTR2(oid_get_pkcs12_pbe_alg, oid_pkcs12_pbe_alg_t, pkcs12_pbe_alg, md_type_t, md_alg, cipher_type_t, cipher_alg);
 #endif /* POLARSSL_PKCS12_C */
 
-#if defined(_MSC_VER) && !defined snprintf
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #include <stdarg.h>
 
 #if !defined vsnprintf
diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c
index e1a8626..615e967 100644
--- a/library/ssl_ciphersuites.c
+++ b/library/ssl_ciphersuites.c
@@ -34,7 +34,8 @@
 
 #include <stdlib.h>
 
-#if defined(_MSC_VER) && !defined strcasecmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strcasecmp _stricmp
 #endif
 
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c86e774..b8bc188 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -47,7 +47,8 @@
 
 #include <stdlib.h>
 
-#if defined(_MSC_VER) && !defined strcasecmp
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strcasecmp _stricmp
 #endif
 
diff --git a/library/x509.c b/library/x509.c
index 27040b9..2ba1e86 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -429,7 +429,8 @@
 }
 #endif /* POLARSSL_FS_IO */
 
-#if defined(_MSC_VER) && !defined snprintf
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #include <stdarg.h>
 
 #if !defined vsnprintf
diff --git a/library/x509_create.c b/library/x509_create.c
index 1cb88c7..fdf2a72 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -31,7 +31,8 @@
 #include "polarssl/asn1write.h"
 #include "polarssl/oid.h"
 
-#if defined(_MSC_VER) && !defined strncasecmp
+#if defined(_MSC_VER) && !defined strncasecmp && !defined(EFIX64) && \
+    !defined(EFI32)
 #define strncasecmp _strnicmp
 #endif
 
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 90ceabd..60a54f2 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -545,7 +545,8 @@
 }
 #endif /* POLARSSL_FS_IO */
 
-#if defined(_MSC_VER) && !defined snprintf
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #include <stdarg.h>
 
 #if !defined vsnprintf
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 9470132..6a127b2 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1039,7 +1039,8 @@
 }
 #endif /* POLARSSL_FS_IO */
 
-#if defined(_MSC_VER) && !defined snprintf
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #include <stdarg.h>
 
 #if !defined vsnprintf
diff --git a/library/x509_csr.c b/library/x509_csr.c
index 4dec9b9..c0c7679 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -302,7 +302,8 @@
 }
 #endif /* POLARSSL_FS_IO */
 
-#if defined(_MSC_VER) && !defined snprintf
+#if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \
+    !defined(EFI32)
 #include <stdarg.h>
 
 #if !defined vsnprintf