diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 18bb7441e..39a474633 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -32,9 +32,13 @@
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #define inline _inline
-#endif
+#else
+#if defined(ARMCC_VERSION)
+#define inline __inline
+#endif /* ARMCC_VERSION */
+#endif /*_MSC_VER */
 
 #define POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE            -0x6080  /**< The selected feature is not available. */
 #define POLARSSL_ERR_CIPHER_BAD_INPUT_DATA                 -0x6100  /**< Bad input parameters to function. */
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index 94b85c384..b50c3738c 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -32,9 +32,13 @@
 
 #include <string.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #define inline _inline
-#endif
+#else
+#if defined(ARMCC_VERSION)
+#define inline __inline
+#endif /* ARMCC_VERSION */
+#endif /*_MSC_VER */
 
 #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected feature is not available. */
 #define POLARSSL_ERR_MD_BAD_INPUT_DATA                     -0x5100  /**< Bad input parameters to function. */
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 5a699ccba..c77f244b5 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -41,9 +41,13 @@
 #include "polarssl/pkcs11.h"
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #define inline _inline
-#endif
+#else
+#if defined(ARMCC_VERSION)
+#define inline __inline
+#endif /* ARMCC_VERSION */
+#endif /*_MSC_VER */
 
 /*
  * SSL Error codes