diff --git a/ChangeLog b/ChangeLog
index f8b573c92..7a1b2b3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIStoreTypes.h: removed PRIx64 definitions, that
+	can be found in the libc inttypes.h.
+
 2011-06-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxAppointmentEditor.js (_getDate):
diff --git a/OpenChange/MAPIStoreFSFolder.m b/OpenChange/MAPIStoreFSFolder.m
index f68fe5103..b4582e732 100644
--- a/OpenChange/MAPIStoreFSFolder.m
+++ b/OpenChange/MAPIStoreFSFolder.m
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <inttypes.h>
+
 #import <Foundation/NSArray.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index 0636862e7..fbcaf93a7 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -20,6 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <inttypes.h>
+
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index 4ab5d7869..fd20b8e73 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -39,22 +39,6 @@ double *MAPIDoubleValue (void *memCtx, double value);
 id NSObjectFromSPropValue (const struct SPropValue *);
 id NSObjectFromMAPISPropValue (const struct mapi_SPropValue *);
 
-#ifndef PRIx64
-#if __WORDSIZE == 64
-  #define PRIx64        "lx"
-#else
-  #define PRIx64        "llx"
-#endif
-#endif
-
-#ifndef PRIX64
-#if __WORDSIZE == 64
-  #define PRIX64        "lX"
-#else
-  #define PRIX64        "llX"
-#endif
-#endif
-
 static inline NSNumber *
 MAPIPropertyKey (enum MAPITAGS propTag)
 {