diff --git a/include/mbedtls/gf128mul.h b/include/mbedtls/gf128mul.h
index 41de39c42..33d06eaaa 100644
--- a/include/mbedtls/gf128mul.h
+++ b/include/mbedtls/gf128mul.h
@@ -30,7 +30,7 @@ extern "C" {
 /**
  * \brief          Big-Endian definition for 128 bits elements
  */
-typedef unsigned char be128[16];
+typedef unsigned char mbedtls_be128[16];
 
 /**
  * \brief          Multiplication in GF(128):
@@ -39,7 +39,7 @@ typedef unsigned char be128[16];
  * \param x        the 128-bits number you want to multiply
  * \param r        result
  */
-void gf128mul_x_ble(be128 r, const be128 x);
+void mbedtls_gf128mul_x_ble(mbedtls_be128 r, const mbedtls_be128 x);
 
 
 
diff --git a/library/aes.c b/library/aes.c
index 766aa21a7..1f21587b6 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1013,7 +1013,7 @@ int mbedtls_aes_crypt_xex( mbedtls_aes_context *crypt_ctx,
 
     do
     {
-        gf128mul_x_ble( t_buf, t_buf );
+        mbedtls_gf128mul_x_ble( t_buf, t_buf );
 
 first:
         /* PP <- T xor P */