diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 39a474633..9452f733e 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -35,9 +35,9 @@
 #if defined(_MSC_VER)
 #define inline _inline
 #else
-#if defined(ARMCC_VERSION)
+#if defined(__ARMCC_VERSION)
 #define inline __inline
-#endif /* ARMCC_VERSION */
+#endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
 
 #define POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE            -0x6080  /**< The selected feature is not available. */
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index b50c3738c..2f0f6e89f 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -35,9 +35,9 @@
 #if defined(_MSC_VER)
 #define inline _inline
 #else
-#if defined(ARMCC_VERSION)
+#if defined(__ARMCC_VERSION)
 #define inline __inline
-#endif /* ARMCC_VERSION */
+#endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
 
 #define POLARSSL_ERR_MD_FEATURE_UNAVAILABLE                -0x5080  /**< The selected feature is not available. */
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index c77f244b5..d98eaedc5 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -44,9 +44,9 @@
 #if defined(_MSC_VER)
 #define inline _inline
 #else
-#if defined(ARMCC_VERSION)
+#if defined(__ARMCC_VERSION)
 #define inline __inline
-#endif /* ARMCC_VERSION */
+#endif /* __ARMCC_VERSION */
 #endif /*_MSC_VER */
 
 /*