diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m
index 81a9dfb9c..0611c6347 100644
--- a/OpenChange/MAPIStoreFAIMessage.m
+++ b/OpenChange/MAPIStoreFAIMessage.m
@@ -28,6 +28,7 @@
 #import "MAPIStoreFAIMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
 #include <talloc.h>
 #include <util/time.h>
 #include <mapistore/mapistore.h>
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index f77ecea68..c5270d055 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -31,6 +31,7 @@
 #import "MAPIStoreFallbackContext.h"
 
 #undef DEBUG
+#include <inttypes.h>
 #include <mapistore/mapistore.h>
 
 @implementation MAPIStoreFallbackContext
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.m b/OpenChange/MAPIStoreRecurrenceUtils.m
index 010066e43..09d6ce793 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -32,6 +33,7 @@
 #import "NSDate+MAPIStore.h"
 #import "MAPIStoreRecurrenceUtils.h"
 
+#include <stdbool.h>
 #include <talloc.h>
 #include <util/time.h>
 #include <gen_ndr/property.h>
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index 1192ce124..7a41245d4 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -29,6 +29,7 @@
 #import "NSArray+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
 #include <talloc.h>
 #include <util/time.h>
 #include <gen_ndr/exchange.h>
diff --git a/OpenChange/NSDate+MAPIStore.m b/OpenChange/NSDate+MAPIStore.m
index 1c09fd0a2..eb873978b 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -27,6 +27,7 @@
 #import "NSDate+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
 #include <talloc.h>
 #include <util/time.h>
 #include <mapistore/mapistore.h>