diff --git a/OpenChange/MAPIStoreAppointmentWrapper.m b/OpenChange/MAPIStoreAppointmentWrapper.m
index cbd62fca8..1f87abad0 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -53,6 +53,7 @@
 #include <gen_ndr/exchange.h>
 #include <gen_ndr/property.h>
 #include <gen_ndr/ndr_property.h>
+#include <util/attr.h>
 #include <libmapi/libmapi.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 174d33f65..1113b02b1 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -25,6 +25,7 @@
    - take the tz definitions from Outlook */
 
 #include <talloc.h>
+#include <util/attr.h>
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 312b20ec4..ec431228c 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -56,6 +56,7 @@
 #undef DEBUG
 #include <stdbool.h>
 #include <gen_ndr/exchange.h>
+#include <util/attr.h>
 #include <libmapiproxy.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m
index 68e9c952d..8ae940af0 100644
--- a/OpenChange/MAPIStoreFAIMessage.m
+++ b/OpenChange/MAPIStoreFAIMessage.m
@@ -26,6 +26,8 @@
 #import "MAPIStoreFAIMessage.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
 #include <mapistore/mapistore.h>
 
 @implementation MAPIStoreFAIMessage
diff --git a/OpenChange/MAPIStoreFAIMessageTable.m b/OpenChange/MAPIStoreFAIMessageTable.m
index 46c23e7d7..fb7b6df1f 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.m
+++ b/OpenChange/MAPIStoreFAIMessageTable.m
@@ -28,6 +28,8 @@
 #import "MAPIStoreFAIMessageTable.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
 #include <mapistore/mapistore.h>
 
 static Class MAPIStoreFAIMessageK = Nil;
diff --git a/OpenChange/MAPIStoreFSBaseContext.m b/OpenChange/MAPIStoreFSBaseContext.m
index d57225056..bb34b4795 100644
--- a/OpenChange/MAPIStoreFSBaseContext.m
+++ b/OpenChange/MAPIStoreFSBaseContext.m
@@ -34,9 +34,6 @@
 
 #import "MAPIStoreFSBaseContext.h"
 
-#undef DEBUG
-#include <mapistore/mapistore.h>
-
 static Class MAPIStoreFSFolderK;
 
 @implementation MAPIStoreFSBaseContext
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index ec4220b87..4630f7246 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -51,6 +51,7 @@
 #include <gen_ndr/exchange.h>
 
 #undef DEBUG
+#include <util/attr.h>
 #include <libmapiproxy.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_nameid.h>
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index aac7d66e7..e99ec2059 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -64,6 +64,7 @@
 static Class SOGoMailFolderK;
 
 #undef DEBUG
+#include <util/attr.h>
 #include <libmapi/libmapi.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.h b/OpenChange/MAPIStoreRecurrenceUtils.h
index e1f50c1e8..4fdf8c54e 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.h
+++ b/OpenChange/MAPIStoreRecurrenceUtils.h
@@ -26,9 +26,6 @@
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalRecurrenceRule.h>
 
-#include <stdbool.h>
-#include <gen_ndr/property.h>
-
 @class NSCalendarDate;
 @class iCalRepeatableEntityObject;
 @class iCalRecurrenceRule;
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.m b/OpenChange/MAPIStoreRecurrenceUtils.m
index de279b4fe..4026c5b88 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -32,6 +32,10 @@
 #import "NSDate+MAPIStore.h"
 #import "MAPIStoreRecurrenceUtils.h"
 
+#include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/property.h>
+
 @implementation iCalCalendar (MAPIStoreRecurrence)
 
 - (void) setupRecurrenceWithMasterEntity: (iCalRepeatableEntityObject *) entity
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index 6272f94e1..23dc03b12 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -26,6 +26,8 @@
 #import <Foundation/NSValue.h>
 
 #include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
 #include <gen_ndr/exchange.h>
 
 @class NSData;
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index a278f0594..87e01792a 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -20,13 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef DEBUG
-#include <talloc.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <libmapi/libmapi.h>
-#include <libmapiproxy.h>
-
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
@@ -38,6 +31,10 @@
 
 #import "MAPIStoreTypes.h"
 
+#undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+
 uint8_t *
 MAPIBoolValue (void *memCtx, BOOL value)
 {
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index a651888f4..000bc3ec7 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -28,6 +28,7 @@
 
 #undef DEBUG
 #include <talloc.h>
+#include <util/time.h>
 #include <mapistore/mapistore.h>
 
 @implementation NSArray (MAPIStoreFolders)
diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m
index f998ef27d..e9fe04076 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -24,8 +24,9 @@
 
 #undef DEBUG
 #include <stdbool.h>
-#include <gen_ndr/exchange.h>
 #include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
 
 @implementation NSData (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSDate+MAPIStore.m b/OpenChange/NSDate+MAPIStore.m
index 63d83a0a7..d36ff6729 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -27,8 +27,9 @@
 #import "NSDate+MAPIStore.h"
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 #include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
 
 static NSCalendarDate *refDate = nil;
 
diff --git a/OpenChange/NSString+MAPIStore.m b/OpenChange/NSString+MAPIStore.m
index e6cf8fad7..a4a894b6a 100644
--- a/OpenChange/NSString+MAPIStore.m
+++ b/OpenChange/NSString+MAPIStore.m
@@ -28,6 +28,8 @@
 #import "NSString+MAPIStore.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
 #include <mapistore/mapistore.h>
 
 @implementation NSString (MAPIStoreDataTypes)
diff --git a/OpenChange/SOGoMAPIFSFolder.m b/OpenChange/SOGoMAPIFSFolder.m
index 8389830de..67c592543 100644
--- a/OpenChange/SOGoMAPIFSFolder.m
+++ b/OpenChange/SOGoMAPIFSFolder.m
@@ -35,6 +35,8 @@
 #import "SOGoMAPIFSFolder.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
 #include <libmapiproxy.h>