diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
index fd67ba68ef9..a002300ded8 100644
--- a/src/mapi/mapi_abi.py
+++ b/src/mapi/mapi_abi.py
@@ -481,6 +481,10 @@ class ABIPrinter(object):
         print('#ifdef MAPI_TMP_DEFINES')
         print(self.c_public_includes())
         print()
+        print('#ifdef MemoryBarrier')
+        print('#undef MemoryBarrier')
+        print('#endif')
+        print()
         print(self.c_public_declarations(self.prefix_lib))
         print('#undef MAPI_TMP_DEFINES')
         print('#endif /* MAPI_TMP_DEFINES */')