diff --git a/OpenChange/Codepages.h b/OpenChange/Codepages.h
index 783077b2a..60d8223d8 100644
--- a/OpenChange/Codepages.h
+++ b/OpenChange/Codepages.h
@@ -18,6 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSString.h>
 
 
 @interface Codepages
diff --git a/OpenChange/Codepages.m b/OpenChange/Codepages.m
index db9693dcf..8776ffe22 100644
--- a/OpenChange/Codepages.m
+++ b/OpenChange/Codepages.m
@@ -18,6 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import "Codepages.h"
+#import <Foundation/NSArray.h>
 
 @implementation Codepages
 
diff --git a/OpenChange/MAPIApplication.h b/OpenChange/MAPIApplication.h
index b66a0848b..44fdaa15a 100644
--- a/OpenChange/MAPIApplication.h
+++ b/OpenChange/MAPIApplication.h
@@ -23,6 +23,7 @@
 #ifndef MAPIAPPLICATION_H
 #define MAPIAPPLICATION_H
 
+#import <NGObjWeb/SoApplication.h>
 
 @class MAPIStoreUserContext;
 
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index 12cbee067..818ec1199 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -20,11 +20,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSTimeZone.h>
+#import <WEExtensions/WEResourceManager.h>
 
+#import <SOGo/SOGoProductLoader.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
 #import <Appointments/iCalEntityObject+SOGo.h>
 
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreTypes.h"
 
+#import "MAPIApplication.h"
 
 MAPIApplication *MAPIApp = nil;
 
diff --git a/OpenChange/MAPIStoreActiveTables.h b/OpenChange/MAPIStoreActiveTables.h
index af314a059..8459bd9c1 100644
--- a/OpenChange/MAPIStoreActiveTables.h
+++ b/OpenChange/MAPIStoreActiveTables.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREACTIVETABLES_H
 #define MAPISTOREACTIVETABLES_H
 
+#import <Foundation/NSObject.h>
 
 @class NSMutableArray;
 
diff --git a/OpenChange/MAPIStoreActiveTables.m b/OpenChange/MAPIStoreActiveTables.m
index bdaa4e954..a9cb0c254 100644
--- a/OpenChange/MAPIStoreActiveTables.m
+++ b/OpenChange/MAPIStoreActiveTables.m
@@ -24,8 +24,13 @@
    instances of a given table, independently from its store and context.
    Primary useful for notifications across different connections. */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreTable.h"
 
+#import "MAPIStoreActiveTables.h"
 
 @interface MAPIStoreActiveTableRecord : NSObject
 {
diff --git a/OpenChange/MAPIStoreAppointmentWrapper.h b/OpenChange/MAPIStoreAppointmentWrapper.h
index ac11177ef..d114076fe 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.h
+++ b/OpenChange/MAPIStoreAppointmentWrapper.h
@@ -23,8 +23,11 @@
 #ifndef MAPISTORECALENDARWRAPPER_H
 #define MAPISTORECALENDARWRAPPER_H
 
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
 
+#import "MAPIStoreObjectProxy.h"
 
 @class NSTimeZone;
 
diff --git a/OpenChange/MAPIStoreAppointmentWrapper.m b/OpenChange/MAPIStoreAppointmentWrapper.m
index 789558c5c..11a189500 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -20,20 +20,51 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalEventChanges.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTrigger.h>
+#import <NGCards/iCalTimeZonePeriod.h>
 #import <NGCards/NSString+NGCards.h>
+#import <SOGo/SOGoDomainDefaults.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserManager.h>
 
 #import "iCalTimeZone+MAPIStore.h"
+#import "MAPIStoreRecurrenceUtils.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreTypes.h"
 #import "NSArray+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreAppointmentWrapper.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#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>
+#include <mapistore/mapistore_nameid.h>
 
 static NSCharacterSet *hexCharacterSet = nil;
 
diff --git a/OpenChange/MAPIStoreAttachment.h b/OpenChange/MAPIStoreAttachment.h
index 1d6ccbd7f..bfa779b85 100644
--- a/OpenChange/MAPIStoreAttachment.h
+++ b/OpenChange/MAPIStoreAttachment.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREATTACHMENT_H
 #define MAPISTOREATTACHMENT_H
 
+#import "MAPIStoreObject.h"
 
 @class NSData;
 @class MAPIStoreEmbeddedMessage;
diff --git a/OpenChange/MAPIStoreAttachment.m b/OpenChange/MAPIStoreAttachment.m
index d2a0be196..cb85911e3 100644
--- a/OpenChange/MAPIStoreAttachment.m
+++ b/OpenChange/MAPIStoreAttachment.m
@@ -20,10 +20,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSData.h>
 
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreEmbeddedMessage.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreAttachment
 
diff --git a/OpenChange/MAPIStoreAttachmentTable.h b/OpenChange/MAPIStoreAttachmentTable.h
index df961ae2f..d066a7b8c 100644
--- a/OpenChange/MAPIStoreAttachmentTable.h
+++ b/OpenChange/MAPIStoreAttachmentTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREATTACHMENTTABLE_H
 #define MAPISTOREATTACHMENTTABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreAttachmentTable : MAPIStoreTable
 @end
diff --git a/OpenChange/MAPIStoreAttachmentTable.m b/OpenChange/MAPIStoreAttachmentTable.m
index 2b6e936de..61c82dd1b 100644
--- a/OpenChange/MAPIStoreAttachmentTable.m
+++ b/OpenChange/MAPIStoreAttachmentTable.m
@@ -20,8 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
+#import "MAPIStoreMessage.h"
 
+#import "MAPIStoreAttachmentTable.h"
 
 @implementation MAPIStoreAttachmentTable
 
diff --git a/OpenChange/MAPIStoreAuthenticator.h b/OpenChange/MAPIStoreAuthenticator.h
index fc3c09a70..ce88a60be 100644
--- a/OpenChange/MAPIStoreAuthenticator.h
+++ b/OpenChange/MAPIStoreAuthenticator.h
@@ -24,6 +24,7 @@
 #ifndef MAPISTOREAUTHENTICATOR_H
 #define MAPISTOREAUTHENTICATOR_H
 
+#import <Foundation/NSObject.h>
 
 @class NSString;
 @class NSURL;
diff --git a/OpenChange/MAPIStoreAuthenticator.m b/OpenChange/MAPIStoreAuthenticator.m
index e28c6c84f..41e4ed081 100644
--- a/OpenChange/MAPIStoreAuthenticator.m
+++ b/OpenChange/MAPIStoreAuthenticator.m
@@ -20,8 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSURL.h>
 
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoPermissions.h>
 
+#import "MAPIStoreAuthenticator.h"
 
 @implementation MAPIStoreAuthenticator
 
diff --git a/OpenChange/MAPIStoreCalendarAttachment.h b/OpenChange/MAPIStoreCalendarAttachment.h
index a64253e2d..b0a35d6b2 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.h
+++ b/OpenChange/MAPIStoreCalendarAttachment.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARATTACHMENT_H
 #define MAPISTORECALENDARATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSTimeZone;
 
diff --git a/OpenChange/MAPIStoreCalendarAttachment.m b/OpenChange/MAPIStoreCalendarAttachment.m
index 7c42d97a5..e101e735b 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.m
+++ b/OpenChange/MAPIStoreCalendarAttachment.m
@@ -20,18 +20,30 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import "iCalEvent+MAPIStore.h"
+#import "MAPIStoreCalendarEmbeddedMessage.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreCalendarAttachment.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreCalendarAttachment
 
diff --git a/OpenChange/MAPIStoreCalendarContext.h b/OpenChange/MAPIStoreCalendarContext.h
index b6ed0dcd7..e6f804805 100644
--- a/OpenChange/MAPIStoreCalendarContext.h
+++ b/OpenChange/MAPIStoreCalendarContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARCONTEXT_H
 #define MAPISTORECALENDARCONTEXT_H
 
+#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreCalendarContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m
index 47db587f5..035741afb 100644
--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@@ -20,10 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
+#import <Appointments/SOGoAppointmentFolders.h>
 
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreCalendarFolder.h"
+#import "MAPIStoreUserContext.h"
 
+#import "MAPIStoreCalendarContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreCalendarFolderK;
 
diff --git a/OpenChange/MAPIStoreCalendarEmbeddedMessage.h b/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
index 82d98dc14..3e27c575c 100644
--- a/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
+++ b/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDAREMBEDDEDMESSAGE_H
 #define MAPISTORECALENDAREMBEDDEDMESSAGE_H
 
+#import "MAPIStoreEmbeddedMessage.h"
 
 @class MAPIStoreAppointmentWrapper;
 
diff --git a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
index 5c1a8d07f..986b106d3 100644
--- a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
@@ -20,15 +20,26 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 
+#import <SOGo/SOGoUser.h>
 #import "iCalEvent+MAPIStore.h"
 
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreCalendarAttachment.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
 
+#import "MAPIStoreCalendarEmbeddedMessage.h"
 
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreCalendarEmbeddedMessage
 
diff --git a/OpenChange/MAPIStoreCalendarFolder.h b/OpenChange/MAPIStoreCalendarFolder.h
index 66d59a218..fd6c5d20f 100644
--- a/OpenChange/MAPIStoreCalendarFolder.h
+++ b/OpenChange/MAPIStoreCalendarFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARFOLDER_H
 #define MAPISTORECALENDARFOLDER_H
 
+#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreCalendarFolder.m b/OpenChange/MAPIStoreCalendarFolder.m
index 4c6d7c9ca..5079c65cc 100644
--- a/OpenChange/MAPIStoreCalendarFolder.m
+++ b/OpenChange/MAPIStoreCalendarFolder.m
@@ -20,12 +20,29 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoPermissions.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+#import <Appointments/SOGoAppointmentObject.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreCalendarContext.h"
+#import "MAPIStoreCalendarMessage.h"
+#import "MAPIStoreCalendarMessageTable.h"
+#import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreCalendarFolder.h"
 
+#include <mapistore/mapistore_errors.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
 
 @implementation MAPIStoreCalendarFolder
 
diff --git a/OpenChange/MAPIStoreCalendarMessage.h b/OpenChange/MAPIStoreCalendarMessage.h
index 286e88c5b..8b2de759d 100644
--- a/OpenChange/MAPIStoreCalendarMessage.h
+++ b/OpenChange/MAPIStoreCalendarMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARMESSAGE_H
 #define MAPISTORECALENDARMESSAGE_H
 
+#import "MAPIStoreGCSMessage.h"
 
 @class iCalCalendar;
 @class iCalEvent;
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index c036f06dd..108471eae 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -24,21 +24,60 @@
    - merge common code with tasks
    - take the tz definitions from Outlook */
 
+#include <talloc.h>
+#include <util/attr.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOFetchSpecification.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <GDLContentStore/GCSFolder.h>
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalTrigger.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserManager.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Mailer/NSString+Mail.h>
 
 #import "iCalEvent+MAPIStore.h"
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreCalendarAttachment.h"
+#import "MAPIStoreCalendarFolder.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreRecurrenceUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSValue+MAPIStore.h"
 
+#import "MAPIStoreCalendarMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <gen_ndr/property.h>
+#include <libmapi/libmapi.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 // extern void ndr_print_AppointmentRecurrencePattern(struct ndr_print *ndr, const char *name, const struct AppointmentRecurrencePattern *r);
 
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.h b/OpenChange/MAPIStoreCalendarMessageTable.h
index a45aace4b..eeccbc455 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.h
+++ b/OpenChange/MAPIStoreCalendarMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARMESSAGETABLE_H
 #define MAPISTORECALENDARMESSAGETABLE_H
 
+#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreCalendarMessageTable : MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.m b/OpenChange/MAPIStoreCalendarMessageTable.m
index 5cb9bc0ff..bbf05274f 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.m
+++ b/OpenChange/MAPIStoreCalendarMessageTable.m
@@ -20,13 +20,22 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
 
+#import <EOControl/EOQualifier.h>
 
+#import <NGCards/iCalEvent.h>
 
+#import "MAPIStoreCalendarMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreCalendarMessageTable.h"
 
+#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreCalendarMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreContactsAttachment.h b/OpenChange/MAPIStoreContactsAttachment.h
index 2379f910d..c4a368849 100644
--- a/OpenChange/MAPIStoreContactsAttachment.h
+++ b/OpenChange/MAPIStoreContactsAttachment.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSATTACHMENT_H
 #define MAPISTORECONTACTSATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSData;
 @class NGVCardPhoto;
diff --git a/OpenChange/MAPIStoreContactsAttachment.m b/OpenChange/MAPIStoreContactsAttachment.m
index f6232a8aa..f578dbc61 100644
--- a/OpenChange/MAPIStoreContactsAttachment.m
+++ b/OpenChange/MAPIStoreContactsAttachment.m
@@ -20,13 +20,20 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSString.h>
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGCards/NGVCardPhoto.h>
 
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContactsAttachment.h"
 
+#include <mapistore/mapistore_errors.h>
 
 /* TODO: handle URL pictures via PidTagAttachMethod = ref ? */
 
diff --git a/OpenChange/MAPIStoreContactsContext.h b/OpenChange/MAPIStoreContactsContext.h
index b77e89972..68120215e 100644
--- a/OpenChange/MAPIStoreContactsContext.h
+++ b/OpenChange/MAPIStoreContactsContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSCONTEXT_H
 #define MAPISTORECONTACTSCONTEXT_H
 
+#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreContactsContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreContactsContext.m b/OpenChange/MAPIStoreContactsContext.m
index 12467c33e..bfef33e27 100644
--- a/OpenChange/MAPIStoreContactsContext.m
+++ b/OpenChange/MAPIStoreContactsContext.m
@@ -20,11 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import <Contacts/SOGoContactFolders.h>
 
+#import "MAPIStoreContactsFolder.h"
+#import "MAPIStoreUserContext.h"
 
+#import "MAPIStoreContactsContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreContactsFolderK;
 
diff --git a/OpenChange/MAPIStoreContactsFolder.h b/OpenChange/MAPIStoreContactsFolder.h
index 7b6736346..2bade99f7 100644
--- a/OpenChange/MAPIStoreContactsFolder.h
+++ b/OpenChange/MAPIStoreContactsFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSFOLDER_H
 #define MAPISTORECONTACTSFOLDER_H
 
+#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreContactsFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreContactsFolder.m b/OpenChange/MAPIStoreContactsFolder.m
index 1eb29ab64..a04110d0f 100644
--- a/OpenChange/MAPIStoreContactsFolder.m
+++ b/OpenChange/MAPIStoreContactsFolder.m
@@ -20,11 +20,25 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSURL.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoPermissions.h>
+#import <Contacts/SOGoContactGCSEntry.h>
+#import <Contacts/SOGoContactFolders.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreContactsContext.h"
+#import "MAPIStoreContactsMessage.h"
+#import "MAPIStoreContactsMessageTable.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContactsFolder.h"
 
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreContactsFolder
 
diff --git a/OpenChange/MAPIStoreContactsMessage.h b/OpenChange/MAPIStoreContactsMessage.h
index 2e761f252..48d5bafb0 100644
--- a/OpenChange/MAPIStoreContactsMessage.h
+++ b/OpenChange/MAPIStoreContactsMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSMESSAGE_H
 #define MAPISTORECONTACTSMESSAGE_H
 
+#import "MAPIStoreGCSMessage.h"
 
 @interface MAPIStoreContactsMessage : MAPIStoreGCSMessage
 {
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index d01a5b413..b183d445e 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -21,19 +21,42 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGCards/NGVCard.h>
+#import <NGCards/NGVCardPhoto.h>
 #import <NGCards/NSArray+NGCards.h>
 #import <NGCards/NSString+NGCards.h>
+#import <Contacts/SOGoContactGCSEntry.h>
 #import <Mailer/NSString+Mail.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUserManager.h>
 
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreContactsAttachment.h"
+#import "MAPIStoreContactsFolder.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStorePropertySelectors.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreTypes.h"
 #import "NSArray+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContactsMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 @implementation SOGoContactGCSEntry (MAPIStoreExtension)
 
diff --git a/OpenChange/MAPIStoreContactsMessageTable.h b/OpenChange/MAPIStoreContactsMessageTable.h
index 8e6a67b91..0563f9b2e 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.h
+++ b/OpenChange/MAPIStoreContactsMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSMESSAGETABLE_H
 #define MAPISTORECONTACTSMESSAGETABLE_H
 
+#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreContactsMessageTable : MAPIStoreGCSMessageTable
 @end
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index 6ca47c9ef..b88158a26 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -20,16 +20,29 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
 
+#import <EOControl/EOQualifier.h>
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
 #import <NGCards/NSArray+NGCards.h>
+#import <NGCards/NGVCard.h>
 
+#import <Contacts/SOGoContactGCSEntry.h>
 
+#import "MAPIStoreContactsMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSDate+MAPIStore.h"
 #import "NSArray+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContactsMessageTable.h"
 
+#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
 
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 07b4e72ea..533d7f278 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -23,7 +23,9 @@
 #ifndef MAPISTORECONTEXT_H
 #define MAPISTORECONTEXT_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSFileHandle;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 8e79a279a..9b8e0a37a 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -20,18 +20,45 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreFallbackContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreFolderTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreMessageTable.h"
+#import "MAPIStoreFAIMessage.h"
+#import "MAPIStoreFAIMessageTable.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSArray+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContext.h"
 
 #undef DEBUG
+#include <dlinklist.h>
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <util/attr.h>
+#include <libmapiproxy.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
+#include <talloc.h>
 
 /* TODO: homogenize method names and order of parameters */
 
diff --git a/OpenChange/MAPIStoreDBBaseContext.h b/OpenChange/MAPIStoreDBBaseContext.h
index 8990b1076..62f5bd489 100644
--- a/OpenChange/MAPIStoreDBBaseContext.h
+++ b/OpenChange/MAPIStoreDBBaseContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBBASECONTEXT_H
 #define MAPISTOREDBBASECONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @interface MAPIStoreDBBaseContext : MAPIStoreContext
 
diff --git a/OpenChange/MAPIStoreDBBaseContext.m b/OpenChange/MAPIStoreDBBaseContext.m
index 2f0d1eabe..22a15bc85 100644
--- a/OpenChange/MAPIStoreDBBaseContext.m
+++ b/OpenChange/MAPIStoreDBBaseContext.m
@@ -21,12 +21,21 @@
 /* A generic parent class for all context that will store their data on the
    disk in the form of a plist. */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import "MAPIStoreDBFolder.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreUserContext.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
+#import "MAPIStoreDBBaseContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreDBFolderK;
 
diff --git a/OpenChange/MAPIStoreDBFolder.h b/OpenChange/MAPIStoreDBFolder.h
index eec854a50..2415af934 100644
--- a/OpenChange/MAPIStoreDBFolder.h
+++ b/OpenChange/MAPIStoreDBFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBFOLDER_H
 #define MAPISTOREDBFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @interface MAPIStoreDBFolder : MAPIStoreFolder
 
diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index 10be380ba..a7c49b72d 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -20,12 +20,34 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <inttypes.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoUser.h>
 #import <SOGo/EOQualifier+SOGoCacheObject.h>
+#import "MAPIStoreContext.h"
+#import "MAPIStoreDBFolderTable.h"
+#import "MAPIStoreDBMessage.h"
+#import "MAPIStoreDBMessageTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
+#import "SOGoMAPIDBMessage.h"
 
+#import "MAPIStoreDBFolder.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 
diff --git a/OpenChange/MAPIStoreDBFolderTable.h b/OpenChange/MAPIStoreDBFolderTable.h
index 78bdea627..afc3018e2 100644
--- a/OpenChange/MAPIStoreDBFolderTable.h
+++ b/OpenChange/MAPIStoreDBFolderTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBFOLDERTABLE_H
 #define MAPISTOREDBFOLDERTABLE_H
 
+#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreDBFolderTable : MAPIStoreFolderTable
 @end
diff --git a/OpenChange/MAPIStoreDBFolderTable.m b/OpenChange/MAPIStoreDBFolderTable.m
index 6017cda3a..01a40b7f0 100644
--- a/OpenChange/MAPIStoreDBFolderTable.m
+++ b/OpenChange/MAPIStoreDBFolderTable.m
@@ -20,8 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreTypes.h"
 
+#import "MAPIStoreDBFolderTable.h"
 
 @implementation MAPIStoreDBFolderTable
 
diff --git a/OpenChange/MAPIStoreDBMessage.h b/OpenChange/MAPIStoreDBMessage.h
index ce0f7184e..532f53a8e 100644
--- a/OpenChange/MAPIStoreDBMessage.h
+++ b/OpenChange/MAPIStoreDBMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBMESSAGE_H
 #define MAPISTOREDBMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreDBMessage : MAPIStoreMessage
 @end
diff --git a/OpenChange/MAPIStoreDBMessage.m b/OpenChange/MAPIStoreDBMessage.m
index 4516677e1..98d357bf7 100644
--- a/OpenChange/MAPIStoreDBMessage.m
+++ b/OpenChange/MAPIStoreDBMessage.m
@@ -20,14 +20,28 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
 #import <NGExtensions/NSObject+Logs.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStorePropertySelectors.h"
+#import "SOGoMAPIDBMessage.h"
 
+#import "MAPIStoreDBFolder.h"
+#import "MAPIStoreDBMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreDBMessage
 
diff --git a/OpenChange/MAPIStoreDBMessageTable.h b/OpenChange/MAPIStoreDBMessageTable.h
index 8fedc57d0..4b9f66480 100644
--- a/OpenChange/MAPIStoreDBMessageTable.h
+++ b/OpenChange/MAPIStoreDBMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBMESSAGETABLE_H
 #define MAPISTOREDBMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreDBMessageTable : MAPIStoreMessageTable
 @end
diff --git a/OpenChange/MAPIStoreDBMessageTable.m b/OpenChange/MAPIStoreDBMessageTable.m
index 465c9064e..a8c68abd1 100644
--- a/OpenChange/MAPIStoreDBMessageTable.m
+++ b/OpenChange/MAPIStoreDBMessageTable.m
@@ -20,11 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
 
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreDBMessage.h"
 
+#import "MAPIStoreDBMessageTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreDBMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreEmbeddedMessage.h b/OpenChange/MAPIStoreEmbeddedMessage.h
index 09ce0fa82..4ef65f261 100644
--- a/OpenChange/MAPIStoreEmbeddedMessage.h
+++ b/OpenChange/MAPIStoreEmbeddedMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREEMBEDDEDMESSAGE_H
 #define MAPISTOREEMBEDDEDMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreEmbeddedMessage : MAPIStoreMessage
 
diff --git a/OpenChange/MAPIStoreEmbeddedMessage.m b/OpenChange/MAPIStoreEmbeddedMessage.m
index edab4e949..f609726db 100644
--- a/OpenChange/MAPIStoreEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreEmbeddedMessage.m
@@ -20,10 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreFolder.h"
 #import "NSObject+MAPIStore.h"
 
+#import "MAPIStoreEmbeddedMessage.h"
 
+#include <mapistore/mapistore_errors.h>
 
 static Class MAPIStoreAttachmentK;
 
diff --git a/OpenChange/MAPIStoreFAIMessage.h b/OpenChange/MAPIStoreFAIMessage.h
index cc5fca347..509bd37be 100644
--- a/OpenChange/MAPIStoreFAIMessage.h
+++ b/OpenChange/MAPIStoreFAIMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFAIMESSAGE_H
 #define MAPISTOREFAIMESSAGE_H
 
+#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreFAIMessage : MAPIStoreDBMessage
 @end
diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m
index 38eae3894..bfa093ff7 100644
--- a/OpenChange/MAPIStoreFAIMessage.m
+++ b/OpenChange/MAPIStoreFAIMessage.m
@@ -20,11 +20,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreActiveTables.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreUserContext.h"
 #import "NSObject+MAPIStore.h"
 
+#import "MAPIStoreFAIMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreFAIMessage
 
diff --git a/OpenChange/MAPIStoreFAIMessageTable.h b/OpenChange/MAPIStoreFAIMessageTable.h
index 0bd0275c6..c12f20f99 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.h
+++ b/OpenChange/MAPIStoreFAIMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFAIMESSAGETABLE_H
 #define MAPISTOREFAIMESSAGETABLE_H
 
+#import "MAPIStoreDBMessageTable.h"
 
 @interface MAPIStoreFAIMessageTable : MAPIStoreDBMessageTable
 @end
diff --git a/OpenChange/MAPIStoreFAIMessageTable.m b/OpenChange/MAPIStoreFAIMessageTable.m
index 575f0fdd8..531299868 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.m
+++ b/OpenChange/MAPIStoreFAIMessageTable.m
@@ -20,10 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
+#import "MAPIStoreFAIMessage.h"
+#import "MAPIStoreFolder.h"
 
+#import "MAPIStoreFAIMessageTable.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreFAIMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreFallbackContext.h b/OpenChange/MAPIStoreFallbackContext.h
index 2d71c3183..a6a2707ab 100644
--- a/OpenChange/MAPIStoreFallbackContext.h
+++ b/OpenChange/MAPIStoreFallbackContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFALLBACKCONTEXT_H
 #define MAPISTOREFALLBACKCONTEXT_H
 
+#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreFallbackContext : MAPIStoreDBBaseContext
 
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index ab08bd1b8..1555226d5 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -18,11 +18,20 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 
+#import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
+#import "MAPIStoreFallbackContext.h"
 
 #undef DEBUG
+#include <inttypes.h>
+#include <dlinklist.h>
+#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreFallbackContext
 
diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index a4739b99f..3f3bfb204 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -21,6 +21,7 @@
 #ifndef MAPISTOREFOLDER_H
 #define MAPISTOREFOLDER_H
 
+#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSMutableArray;
@@ -38,6 +39,7 @@
 @class SOGoCacheGCSFolder;
 @class SOGoMAPIDBMessage;
 
+#import "MAPIStoreSOGoObject.h"
 
 @interface MAPIStoreFolder : MAPIStoreSOGoObject
 {
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 398b35516..c111f2305 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -20,17 +20,48 @@
 
 /* TODO: main key arrays must be initialized */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <SOGo/SOGoContentObject.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoFolder.h>
 
+#import "MAPIStoreActiveTables.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFAIMessage.h"
+#import "MAPIStoreFAIMessageTable.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreFolderTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStorePermissionsTable.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
+#import "SOGoMAPIDBMessage.h"
 #import "SOGoCacheGCSObject+MAPIStore.h"
+#import <Mailer/SOGoMailObject.h>
 
+#include <gen_ndr/exchange.h>
 
 #undef DEBUG
+#include <util/attr.h>
+#include <libmapiproxy.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMessageTableK, MAPIStoreFolderTableK;
 
diff --git a/OpenChange/MAPIStoreFolderTable.h b/OpenChange/MAPIStoreFolderTable.h
index b5121f4a2..b584c6084 100644
--- a/OpenChange/MAPIStoreFolderTable.h
+++ b/OpenChange/MAPIStoreFolderTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFOLDERTABLE_H
 #define MAPISTOREFOLDERTABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreFolderTable : MAPIStoreTable
 @end
diff --git a/OpenChange/MAPIStoreFolderTable.m b/OpenChange/MAPIStoreFolderTable.m
index a5606de05..d76c9890e 100644
--- a/OpenChange/MAPIStoreFolderTable.m
+++ b/OpenChange/MAPIStoreFolderTable.m
@@ -20,12 +20,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreTypes.h"
 
+#import "MAPIStoreFolderTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_nameid.h>
+#include <libmapiproxy.h>
 
 @implementation MAPIStoreFolderTable
 
diff --git a/OpenChange/MAPIStoreGCSBaseContext.h b/OpenChange/MAPIStoreGCSBaseContext.h
index 40182433c..8d9e57f5d 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.h
+++ b/OpenChange/MAPIStoreGCSBaseContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSBASECONTEXT_H
 #define MAPISTOREGCSBASECONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @class EOQualifier;
 
diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m
index ba05df3ec..e0f06482d 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@@ -20,12 +20,22 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 
+#import <SOGo/SOGoGCSFolder.h>
+#import <SOGo/SOGoParentFolder.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreGCSBaseContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <dlinklist.h>
 
 @implementation MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreGCSFolder.h b/OpenChange/MAPIStoreGCSFolder.h
index 68d151fe8..de2b9692b 100644
--- a/OpenChange/MAPIStoreGCSFolder.h
+++ b/OpenChange/MAPIStoreGCSFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSFOLDER_H
 #define MAPISTOREGCSFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @class NSArray;
 @class NSCalendarDate;
diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m
index 72fd4205a..336474675 100644
--- a/OpenChange/MAPIStoreGCSFolder.m
+++ b/OpenChange/MAPIStoreGCSFolder.m
@@ -20,16 +20,34 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOSortOrdering.h>
+#import <GDLContentStore/GCSFolder.h>
 #import <SOGo/NSArray+Utilities.h>
+#import <SOGo/SOGoGCSFolder.h>
+#import <SOGo/SOGoParentFolder.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreGCSBaseContext.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
+#import "SOGoMAPIDBMessage.h"
 
+#import "MAPIStoreGCSFolder.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 static Class NSNumberK;
 
diff --git a/OpenChange/MAPIStoreGCSMessage.h b/OpenChange/MAPIStoreGCSMessage.h
index 5fc468fa3..cac182874 100644
--- a/OpenChange/MAPIStoreGCSMessage.h
+++ b/OpenChange/MAPIStoreGCSMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSMESSAGE_H
 #define MAPISTOREGCSMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreGCSMessage : MAPIStoreMessage
 {
diff --git a/OpenChange/MAPIStoreGCSMessage.m b/OpenChange/MAPIStoreGCSMessage.m
index dbf7aa0dd..58b4a9ca2 100644
--- a/OpenChange/MAPIStoreGCSMessage.m
+++ b/OpenChange/MAPIStoreGCSMessage.m
@@ -20,13 +20,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSValue.h>
+#import <NGObjWeb/SoSecurityManager.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
+#import <SOGo/SOGoContentObject.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreGCSFolder.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 
+#import "MAPIStoreGCSMessage.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreGCSMessage
 
diff --git a/OpenChange/MAPIStoreGCSMessageTable.h b/OpenChange/MAPIStoreGCSMessageTable.h
index 5f8ccfbcc..72190c221 100644
--- a/OpenChange/MAPIStoreGCSMessageTable.h
+++ b/OpenChange/MAPIStoreGCSMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSMESSAGETABLE_H
 #define MAPISTOREGCSMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @class EOQualifier;
 
diff --git a/OpenChange/MAPIStoreGCSMessageTable.m b/OpenChange/MAPIStoreGCSMessageTable.m
index 1f547d2e4..0dac1fff9 100644
--- a/OpenChange/MAPIStoreGCSMessageTable.m
+++ b/OpenChange/MAPIStoreGCSMessageTable.m
@@ -20,15 +20,29 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
+#import <GDLContentStore/GCSFolder.h>
 
 #import <SOGo/NSArray+Utilities.h>
+#import <SOGo/SOGoGCSFolder.h>
 
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreGCSFolder.h"
+#import "MAPIStoreGCSMessageTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreMIME.m b/OpenChange/MAPIStoreMIME.m
index ef4a68c98..712cc88bc 100644
--- a/OpenChange/MAPIStoreMIME.m
+++ b/OpenChange/MAPIStoreMIME.m
@@ -20,7 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSFileHandle.h>
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreMIME.h"
 
 /* Seems common to all distros ? */
 #define MAPIStoreMIMEFile @"/etc/mime.types"
diff --git a/OpenChange/MAPIStoreMailAttachment.h b/OpenChange/MAPIStoreMailAttachment.h
index 128caf989..b04b197ab 100644
--- a/OpenChange/MAPIStoreMailAttachment.h
+++ b/OpenChange/MAPIStoreMailAttachment.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILATTACHMENT_H
 #define MAPISTOREMAILATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSDictionary;
 
diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index fe3a83f13..575808f39 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -20,16 +20,31 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <SOGo/NSArray+Utilities.h>
+#import <Mailer/SOGoMailBodyPart.h>
+#import <Mailer/SOGoMailObject.h>
 #import <Mailer/NSDictionary+Mail.h>
 
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreMailMessage.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreMailAttachment.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreMailAttachment
 
diff --git a/OpenChange/MAPIStoreMailContext.h b/OpenChange/MAPIStoreMailContext.h
index 947f3277f..9e8371714 100644
--- a/OpenChange/MAPIStoreMailContext.h
+++ b/OpenChange/MAPIStoreMailContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILCONTEXT_H
 #define MAPISTOREMAILCONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @interface MAPIStoreMailContext : MAPIStoreContext
 
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 14afa53ed..c1f39565f 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -20,14 +20,26 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGImap4/NSString+Imap4.h>
 #import <NGExtensions/NSString+misc.h>
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailFolder.h>
 
+#import "MAPIStoreMailFolder.h"
+#import "MAPIStoreUserContext.h"
 #import "NSString+MAPIStore.h"
 
 #import <SOGo/NSString+Utilities.h>
+#import "MAPIApplication.h"
+#import "MAPIStoreMailContext.h"
 
+#include <dlinklist.h>
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
 
diff --git a/OpenChange/MAPIStoreMailFolder.h b/OpenChange/MAPIStoreMailFolder.h
index 760d92f83..717868efb 100644
--- a/OpenChange/MAPIStoreMailFolder.h
+++ b/OpenChange/MAPIStoreMailFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILFOLDER_H
 #define MAPISTOREMAILFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @class NSNumber;
 
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 148f1776d..6e87d4ecd 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -18,24 +18,65 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 #import <NGExtensions/NSString+misc.h>
+#import <NGImap4/NGImap4Connection.h>
+#import <NGImap4/NGImap4Client.h>
 #import <NGImap4/NSString+Imap4.h>
+#import <Mailer/SOGoDraftsFolder.h>
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailAccounts.h>
+#import <Mailer/SOGoMailFolder.h>
+#import <Mailer/SOGoMailObject.h>
+#import <Mailer/SOGoSentFolder.h>
+#import <Mailer/SOGoTrashFolder.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoPermissions.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFAIMessage.h"
+#import "MAPIStoreMailContext.h"
+#import "MAPIStoreMailMessage.h"
+#import "MAPIStoreMailFolderTable.h"
+#import "MAPIStoreMailMessageTable.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
+#import "SOGoMAPIDBMessage.h"
+#import <SOGo/SOGoCacheGCSFolder.h>
 
+#import "MAPIStoreMailVolatileMessage.h"
 
+#import "MAPIStoreMailFolder.h"
 
 static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
 
+#include <gen_ndr/exchange.h>
 
 #undef DEBUG
+#include <util/attr.h>
+#include <libmapi/libmapi.h>
+#include <libmapiproxy.h>
+#include <limits.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreMailFolder
 
diff --git a/OpenChange/MAPIStoreMailFolderTable.h b/OpenChange/MAPIStoreMailFolderTable.h
index 4590fdae2..5ec2c4a5b 100644
--- a/OpenChange/MAPIStoreMailFolderTable.h
+++ b/OpenChange/MAPIStoreMailFolderTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILFOLDERTABLE_H
 #define MAPISTOREMAILFOLDERTABLE_H
 
+#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
 @end
diff --git a/OpenChange/MAPIStoreMailFolderTable.m b/OpenChange/MAPIStoreMailFolderTable.m
index 2586f545b..542e1dc8f 100644
--- a/OpenChange/MAPIStoreMailFolderTable.m
+++ b/OpenChange/MAPIStoreMailFolderTable.m
@@ -18,7 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreMailFolderTable.h"
+#import "MAPIStoreTypes.h"
 
 @implementation MAPIStoreMailFolderTable
 
diff --git a/OpenChange/MAPIStoreMailMessage.h b/OpenChange/MAPIStoreMailMessage.h
index c1f7417c6..60922feaf 100644
--- a/OpenChange/MAPIStoreMailMessage.h
+++ b/OpenChange/MAPIStoreMailMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILMESSAGE_H
 #define MAPISTOREMAILMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @class NSData;
 @class NSString;
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 95b260bdd..f79511eb6 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -21,19 +21,49 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
+#import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NGImap4Connection.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
+#import <NGMail/NGMimeMessageGenerator.h>
+#import <NGCards/iCalCalendar.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoUserManager.h>
 #import <Mailer/NSData+Mail.h>
+#import <Mailer/SOGoMailBodyPart.h>
+#import <Mailer/SOGoMailObject.h>
 #import <Mailer/NSDictionary+Mail.h>
 
+#import "Codepages.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreMailAttachment.h"
+#import "MAPIStoreMailFolder.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreSharingMessage.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 
+#import "MAPIStoreMailMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @class iCalCalendar, iCalEvent;
 
diff --git a/OpenChange/MAPIStoreMailMessageTable.h b/OpenChange/MAPIStoreMailMessageTable.h
index 8c2e0f35c..8efa43c16 100644
--- a/OpenChange/MAPIStoreMailMessageTable.h
+++ b/OpenChange/MAPIStoreMailMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILMESSAGETABLE_H
 #define MAPISTOREMAILMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreMailMessageTable : MAPIStoreMessageTable
 {
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index bec4db472..d315f6527 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -20,16 +20,31 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSRange.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
 #import <SOGo/NSArray+Utilities.h>
 
 #import <Mailer/NSData+Mail.h>
+#import <Mailer/SOGoMailFolder.h>
+#import <Mailer/SOGoMailObject.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMailFolder.h"
+#import "MAPIStoreMailMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreMailMessageTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_nameid.h>
 
 @implementation MAPIStoreMailMessageTable
 
diff --git a/OpenChange/MAPIStoreMailVolatileMessage.h b/OpenChange/MAPIStoreMailVolatileMessage.h
index 3195e25b6..212226abf 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.h
+++ b/OpenChange/MAPIStoreMailVolatileMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILVOLATILEMESSAGE_H
 #define MAPISTOREMAILVOLATILEMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreMailVolatileMessage : MAPIStoreMessage
 
diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m
index b1e05ec33..1db930ef8 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.m
+++ b/OpenChange/MAPIStoreMailVolatileMessage.m
@@ -25,20 +25,54 @@
    - merge some code in a common module with SOGoDraftObject
 */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSScanner.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
 #import <NGExtensions/NSString+Encoding.h>
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMail/NGMimeMessage.h>
+#import <NGMail/NGMimeMessageGenerator.h>
+#import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NGImap4Connection.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoCacheObject.h>
+#import <SOGo/SOGoDomainDefaults.h>
+#import <SOGo/SOGoMailer.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserManager.h>
+#import <Mailer/SOGoMailFolder.h>
 #import <Mailer/NSString+Mail.h>
 
+#import "Codepages.h"
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreAttachmentTable.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMailFolder.h"
+#import "MAPIStoreMIME.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreMailVolatileMessage.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 static Class NSNumberK = Nil;
 
diff --git a/OpenChange/MAPIStoreMapping.h b/OpenChange/MAPIStoreMapping.h
index 0d2e8c086..55c2e944a 100644
--- a/OpenChange/MAPIStoreMapping.h
+++ b/OpenChange/MAPIStoreMapping.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAPPING_H
 #define MAPISTOREMAPPING_H
 
+#import <Foundation/NSObject.h>
 
 @class NSMutableDictionary;
 @class NSString;
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index afda79459..b7d303ed6 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -20,7 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <inttypes.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSObject+Values.h>
@@ -28,9 +34,14 @@
 #import <SOGo/NSString+Utilities.h>
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
+#import "MAPIStoreTypes.h"
 
+#import "MAPIStoreMapping.h"
 
+#include <talloc.h>
 
 static NSMutableDictionary *mappingRegistry = nil;
 
diff --git a/OpenChange/MAPIStoreMessage.h b/OpenChange/MAPIStoreMessage.h
index cc5f2ae1d..f914e543a 100644
--- a/OpenChange/MAPIStoreMessage.h
+++ b/OpenChange/MAPIStoreMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMESSAGE_H
 #define MAPISTOREMESSAGE_H
 
+#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSMutableArray;
@@ -34,6 +35,7 @@
 @class MAPIStoreAttachmentTable;
 @class MAPIStoreFolder;
 
+#import "MAPIStoreSOGoObject.h"
 
 @interface MAPIStoreMessage : MAPIStoreSOGoObject
 {
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 9ad2b2b75..e6bda4578 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -20,14 +20,40 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <SOGo/SOGoObject.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreActiveTables.h"
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreAttachmentTable.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreEmbeddedMessage.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreMessageTable.h"
+#import "MAPIStorePropertySelectors.h"
+#import "MAPIStoreSamDBUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
+#import "RTFHandler.h"
 
+#import "MAPIStoreMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 static Class MAPIStoreFolderK, MAPIStoreEmbeddedMessageK;
 
diff --git a/OpenChange/MAPIStoreMessageTable.h b/OpenChange/MAPIStoreMessageTable.h
index 2485d0593..9b1473325 100644
--- a/OpenChange/MAPIStoreMessageTable.h
+++ b/OpenChange/MAPIStoreMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMESSAGETABLE_H
 #define MAPISTOREMESSAGETABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreMessageTable : MAPIStoreTable
 
diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index 7bb625547..f978a5ea6 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -20,13 +20,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoObject.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreMessageTable.h"
 
 @implementation MAPIStoreMessageTable
 
diff --git a/OpenChange/MAPIStoreNotesContext.h b/OpenChange/MAPIStoreNotesContext.h
index c686c7c74..0c2f58261 100644
--- a/OpenChange/MAPIStoreNotesContext.h
+++ b/OpenChange/MAPIStoreNotesContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESCONTEXT_H
 #define MAPISTORENOTESCONTEXT_H
 
+#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreNotesContext : MAPIStoreDBBaseContext
 
diff --git a/OpenChange/MAPIStoreNotesContext.m b/OpenChange/MAPIStoreNotesContext.m
index a6662595b..725b0d158 100644
--- a/OpenChange/MAPIStoreNotesContext.m
+++ b/OpenChange/MAPIStoreNotesContext.m
@@ -20,10 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreNotesFolder.h"
+#import "MAPIStoreMapping.h"
 
+#import "MAPIStoreNotesContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreNotesContext
 
diff --git a/OpenChange/MAPIStoreNotesFolder.h b/OpenChange/MAPIStoreNotesFolder.h
index 9c3377fd0..4f049fb4f 100644
--- a/OpenChange/MAPIStoreNotesFolder.h
+++ b/OpenChange/MAPIStoreNotesFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESFOLDER_H
 #define MAPISTORENOTESFOLDER_H
 
+#import "MAPIStoreDBFolder.h"
 
 @interface MAPIStoreNotesFolder : MAPIStoreDBFolder
 @end
diff --git a/OpenChange/MAPIStoreNotesFolder.m b/OpenChange/MAPIStoreNotesFolder.m
index 9250f8a7d..ae2652d88 100644
--- a/OpenChange/MAPIStoreNotesFolder.m
+++ b/OpenChange/MAPIStoreNotesFolder.m
@@ -20,9 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import "MAPIStoreNotesFolder.h"
+#import "MAPIStoreNotesMessage.h"
 #import "NSString+MAPIStore.h"
 
+#include <mapistore/mapistore_errors.h>
 
+#import "MAPIStoreNotesFolder.h"
 
 @implementation MAPIStoreNotesFolder
 
diff --git a/OpenChange/MAPIStoreNotesMessage.h b/OpenChange/MAPIStoreNotesMessage.h
index cc2f55ae0..08c1223d0 100644
--- a/OpenChange/MAPIStoreNotesMessage.h
+++ b/OpenChange/MAPIStoreNotesMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESMESSAGE_H
 #define MAPISTORENOTESMESSAGE_H
 
+#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreNotesMessage : MAPIStoreDBMessage
 @end
diff --git a/OpenChange/MAPIStoreNotesMessage.m b/OpenChange/MAPIStoreNotesMessage.m
index 0fa3cb270..52712277b 100644
--- a/OpenChange/MAPIStoreNotesMessage.m
+++ b/OpenChange/MAPIStoreNotesMessage.m
@@ -20,11 +20,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
 
+#import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreNotesMessage.h"
 
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreNotesMessage
 
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 0c7165fb5..c5a466ac3 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -23,7 +23,9 @@
 #ifndef MAPISTOREOBJECT_H
 #define MAPISTOREOBJECT_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @class NSDate;
 @class NSData;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index 4365d4a2d..ecb00dba3 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -20,15 +20,32 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <SOGo/SOGoObject.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStorePropertySelectors.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreObject.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreObject
 
diff --git a/OpenChange/MAPIStoreObjectProxy.h b/OpenChange/MAPIStoreObjectProxy.h
index fc227aa8b..6e9aee13e 100644
--- a/OpenChange/MAPIStoreObjectProxy.h
+++ b/OpenChange/MAPIStoreObjectProxy.h
@@ -23,7 +23,9 @@
 #ifndef MAPISTOREOBJECTPROXY_H
 #define MAPISTOREOBJECTPROXY_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @interface MAPIStoreObjectProxy : NSObject
 {
diff --git a/OpenChange/MAPIStoreObjectProxy.m b/OpenChange/MAPIStoreObjectProxy.m
index e417730bc..945d16167 100644
--- a/OpenChange/MAPIStoreObjectProxy.m
+++ b/OpenChange/MAPIStoreObjectProxy.m
@@ -20,10 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import "MAPIStorePropertySelectors.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreObjectProxy.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreObjectProxy
 
diff --git a/OpenChange/MAPIStorePermissionsTable.h b/OpenChange/MAPIStorePermissionsTable.h
index 67e335018..3f951f50c 100644
--- a/OpenChange/MAPIStorePermissionsTable.h
+++ b/OpenChange/MAPIStorePermissionsTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREPERMISSIONSTABLE_H
 #define MAPISTOREPERMISSIONSTABLE_H
 
+#import "MAPIStoreTable.h"
 
 struct ldb_context;
 
diff --git a/OpenChange/MAPIStorePermissionsTable.m b/OpenChange/MAPIStorePermissionsTable.m
index 46785b464..76896836f 100644
--- a/OpenChange/MAPIStorePermissionsTable.m
+++ b/OpenChange/MAPIStorePermissionsTable.m
@@ -20,12 +20,25 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <SOGo/SOGoFolder.h>
+#import <SOGo/SOGoObject.h>
+#import <SOGo/SOGoUser.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreSamDBUtils.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStorePermissionsTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStorePermissionEntry
 
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.h b/OpenChange/MAPIStoreRecurrenceUtils.h
index 3be8bc34c..dbb2f0c19 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.h
+++ b/OpenChange/MAPIStoreRecurrenceUtils.h
@@ -23,7 +23,11 @@
 #ifndef MAPISTORERECURRENCEUTILS_H
 #define MAPISTORERECURRENCEUTILS_H
 
+#include <talloc.h>
 
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalRecurrenceRule.h>
+#import <NGCards/iCalTimeZone.h>
 
 @class iCalEvent;
 @class iCalRepeatableEntityObject;
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.m b/OpenChange/MAPIStoreRecurrenceUtils.m
index 1675192eb..90052474a 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -20,13 +20,30 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
+#import <NGCards/iCalByDayMask.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalRepeatableEntityObject.h>
+#import <NGCards/iCalRecurrenceRule.h>
+#import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalTimeZonePeriod.h>
 
 #import "NSDate+MAPIStore.h"
+#import "MAPIStoreRecurrenceUtils.h"
+#import "MAPIStoreTypes.h"
 
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/property.h>
 
 @implementation iCalCalendar (MAPIStoreRecurrence)
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 01b40baff..0ec1d59bd 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -22,11 +22,35 @@
 
 /* OpenChange SOGo storage backend */
 
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSFileHandle.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSThread.h>
+#import <NGObjWeb/SoProductRegistry.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <SOGo/SOGoCache.h>
+#import <SOGo/SOGoProductLoader.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreAttachment.h"
+#import "MAPIStoreAttachmentTable.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreEmbeddedMessage.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStoreMessage.h"
+#import "MAPIStoreMailVolatileMessage.h"
+#import "MAPIStoreObject.h"
+#import "MAPIStoreTable.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#include <libmapi/libmapi.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <execinfo.h>
 
 static Class MAPIStoreContextK = Nil;
 static BOOL leakDebugging = NO;
diff --git a/OpenChange/MAPIStoreSOGoObject.h b/OpenChange/MAPIStoreSOGoObject.h
index e8c5770db..411736718 100644
--- a/OpenChange/MAPIStoreSOGoObject.h
+++ b/OpenChange/MAPIStoreSOGoObject.h
@@ -23,7 +23,9 @@
 #ifndef MAPISTORESOGOOBJECT_H
 #define MAPISTORESOGOOBJECT_H
 
+#include <talloc.h>
 
+#import "MAPIStoreObject.h"
 
 @class NSDate;
 @class NSData;
diff --git a/OpenChange/MAPIStoreSOGoObject.m b/OpenChange/MAPIStoreSOGoObject.m
index 8a58a1876..7f1cc4b6a 100644
--- a/OpenChange/MAPIStoreSOGoObject.m
+++ b/OpenChange/MAPIStoreSOGoObject.m
@@ -20,15 +20,33 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <SOGo/SOGoObject.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreFolder.h"
+#import "MAPIStorePropertySelectors.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreSOGoObject.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreSOGoObject
 
diff --git a/OpenChange/MAPIStoreSamDBUtils.h b/OpenChange/MAPIStoreSamDBUtils.h
index 63b67504a..84825332b 100644
--- a/OpenChange/MAPIStoreSamDBUtils.h
+++ b/OpenChange/MAPIStoreSamDBUtils.h
@@ -25,6 +25,7 @@
 
 @class NSString;
 
+#include <mapistore/mapistore.h>
 
 NSString *MAPIStoreSamDBUserAttribute (struct mapistore_connection_info *connInfo,
                                        NSString *userKey,
diff --git a/OpenChange/MAPIStoreSamDBUtils.m b/OpenChange/MAPIStoreSamDBUtils.m
index 7beb19591..f26d173c2 100644
--- a/OpenChange/MAPIStoreSamDBUtils.m
+++ b/OpenChange/MAPIStoreSamDBUtils.m
@@ -20,9 +20,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSData.h>
+#import <Foundation/NSString.h>
+#include <talloc.h>
+#include <ldb.h>
+#include <libmapiproxy.h>
+#include <samba/version.h>
 
 #import "NSData+MAPIStore.h"
 
+#import "MAPIStoreSamDBUtils.h"
 
 
 
diff --git a/OpenChange/MAPIStoreSharingMessage.h b/OpenChange/MAPIStoreSharingMessage.h
index 451b9ae6e..7db7f552f 100644
--- a/OpenChange/MAPIStoreSharingMessage.h
+++ b/OpenChange/MAPIStoreSharingMessage.h
@@ -23,6 +23,8 @@
 #ifndef MAPISTORESHARINGMESSAGE_H
 #define MAPISTORESHARINGMESSAGE_H
 
+#import "MAPIStoreMailMessage.h"
+#import "MAPIStoreObjectProxy.h"
 
 #define SHARING_SPECIAL_FOLDER 0x40290
 
diff --git a/OpenChange/MAPIStoreSharingMessage.m b/OpenChange/MAPIStoreSharingMessage.m
index 15cd2d61f..e1e0e79da 100644
--- a/OpenChange/MAPIStoreSharingMessage.m
+++ b/OpenChange/MAPIStoreSharingMessage.m
@@ -20,15 +20,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
 
+#import <Mailer/SOGoMailObject.h>
+#import <NGExtensions/NGBase64Coding.h>
 
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSValue+MAPIStore.h"
 
+#import "MAPIStoreMailFolder.h"
+#import "MAPIStoreSharingMessage.h"
+#import "MAPIStoreTypes.h"
 
+#include <gen_ndr/property.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 @implementation MAPIStoreSharingMessage
 
diff --git a/OpenChange/MAPIStoreTable.h b/OpenChange/MAPIStoreTable.h
index c40635b57..8c4b4718a 100644
--- a/OpenChange/MAPIStoreTable.h
+++ b/OpenChange/MAPIStoreTable.h
@@ -23,10 +23,12 @@
 #ifndef MAPISTORETABLE_H
 #define MAPISTORETABLE_H
 
+#include <talloc.h>
 
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 #define SENSITIVITY_NONE 0
 #define SENSITIVITY_PERSONAL 1
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 49cbb9d5f..3b8270b6c 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -20,15 +20,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSException.h>
 
 #import <NGExtensions/NSObject+Logs.h>
+#import <EOControl/EOQualifier.h>
 
+#import <SOGo/EOBitmaskQualifier.h>
+#import "MAPIStoreActiveTables.h"
+#import "MAPIStoreObject.h"
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreObject.h"
 
+#import "MAPIStoreTable.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <libmapiproxy.h>
 
 @interface MAPIStoreTable (Private)
 
diff --git a/OpenChange/MAPIStoreTasksContext.h b/OpenChange/MAPIStoreTasksContext.h
index 306af4e02..70d416130 100644
--- a/OpenChange/MAPIStoreTasksContext.h
+++ b/OpenChange/MAPIStoreTasksContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORETASKSCONTEXT_H
 #define MAPISTORETASKSCONTEXT_H
 
+#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreTasksContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m
index 47889971d..096ca3711 100644
--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@@ -20,10 +20,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
+#import <Appointments/SOGoAppointmentFolders.h>
 
+#import "MAPIStoreTasksFolder.h"
+#import "MAPIStoreUserContext.h"
 
+#import "MAPIStoreTasksContext.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 static Class MAPIStoreTasksFolderK;
 
diff --git a/OpenChange/MAPIStoreTasksFolder.h b/OpenChange/MAPIStoreTasksFolder.h
index 162b1a11d..dc9b6791a 100644
--- a/OpenChange/MAPIStoreTasksFolder.h
+++ b/OpenChange/MAPIStoreTasksFolder.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORETASKSFOLDER_H
 #define MAPISTORETASKSFOLDER_H
 
+#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreTasksFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreTasksFolder.m b/OpenChange/MAPIStoreTasksFolder.m
index 85dc08d91..9bc76def1 100644
--- a/OpenChange/MAPIStoreTasksFolder.m
+++ b/OpenChange/MAPIStoreTasksFolder.m
@@ -20,11 +20,28 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSURL.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoPermissions.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+#import <Appointments/SOGoTaskObject.h>
 
+#import "MAPIApplication.h"
+#import "MAPIStoreUserContext.h"
+#import "MAPIStoreTasksContext.h"
+#import "MAPIStoreTasksMessage.h"
+#import "MAPIStoreTasksMessageTable.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreTasksFolder.h"
 
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreTasksFolder
 
diff --git a/OpenChange/MAPIStoreTasksMessage.h b/OpenChange/MAPIStoreTasksMessage.h
index 7a99ec578..3130b72a5 100644
--- a/OpenChange/MAPIStoreTasksMessage.h
+++ b/OpenChange/MAPIStoreTasksMessage.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORETASKSMESSAGE_H
 #define MAPISTORETASKSMESSAGE_H
 
+#import "MAPIStoreGCSMessage.h"
 
 @interface MAPIStoreTasksMessage : MAPIStoreGCSMessage
 
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index 3c8e0e7ae..12a348d4c 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -21,17 +21,41 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalToDo.h>
+#import <NGCards/iCalPerson.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
+#import <Appointments/SOGoTaskObject.h>
 #import <Mailer/NSString+Mail.h>
 
+#import "MAPIStoreContext.h"
+#import "MAPIStoreTasksFolder.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreTasksMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 @implementation SOGoTaskObject (MAPIStoreExtension)
 
diff --git a/OpenChange/MAPIStoreTasksMessageTable.h b/OpenChange/MAPIStoreTasksMessageTable.h
index e7b7cf617..4be570027 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.h
+++ b/OpenChange/MAPIStoreTasksMessageTable.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTORETASKSMESSAGETABLE_H
 #define MAPISTORETASKSMESSAGETABLE_H
 
+#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreTasksMessageTable : MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreTasksMessageTable.m b/OpenChange/MAPIStoreTasksMessageTable.m
index bbb607631..b0f39341c 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.m
+++ b/OpenChange/MAPIStoreTasksMessageTable.m
@@ -20,15 +20,23 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
 
+#import <EOControl/EOQualifier.h>
 
+#import <NGCards/iCalToDo.h>
 
+#import <Appointments/SOGoTaskObject.h>
 
+#import "MAPIStoreTasksMessage.h"
+#import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
+#import "MAPIStoreTasksMessageTable.h"
 
+#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreTasksMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index 7e5fa859d..b12cab6a1 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -23,7 +23,12 @@
 #ifndef MAPISTORETYPES_H
 #define MAPISTORETYPES_H
 
+#import <Foundation/NSValue.h>
 
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
 
 @class NSData;
 @class NSDictionary;
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 4c9a8a6cb..eb3b499b3 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -20,13 +20,22 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
 
 #import "NSArray+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 
+#import "MAPIStoreTypes.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 NSTimeZone *utcTZ;
 
diff --git a/OpenChange/MAPIStoreUserContext.h b/OpenChange/MAPIStoreUserContext.h
index 1da972794..b8defd0cd 100644
--- a/OpenChange/MAPIStoreUserContext.h
+++ b/OpenChange/MAPIStoreUserContext.h
@@ -23,6 +23,7 @@
 #ifndef MAPISTOREUSERCONTEXT_H
 #define MAPISTOREUSERCONTEXT_H
 
+#import <Foundation/NSObject.h>
 
 @class NSMutableDictionary;
 @class NSString;
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index 6acd0183e..de3dfadf1 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -20,15 +20,35 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSMapTable.h>
+#import <Foundation/NSPropertyList.h>
+#import <Foundation/NSThread.h>
+#import <Foundation/NSTimeZone.h>
+#import <Foundation/NSURL.h>
 
+#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 
+#import <NGImap4/NGImap4Connection.h>
 
+#import <GDLContentStore/GCSChannelManager.h>
+#import <SOGo/SOGoDomainDefaults.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/NSString+Utilities.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailAccounts.h>
 
 #import <SOGo/GCSSpecialQueries+SOGoCacheObject.h>
+#import "MAPIApplication.h"
+#import "MAPIStoreAuthenticator.h"
+#import "MAPIStoreMapping.h"
 
+#import "MAPIStoreUserContext.h"
 
 static NSMapTable *contextsTable = nil;
 
diff --git a/OpenChange/NSArray+MAPIStore.h b/OpenChange/NSArray+MAPIStore.h
index 9b25fefb4..a61bc4bc3 100644
--- a/OpenChange/NSArray+MAPIStore.h
+++ b/OpenChange/NSArray+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef NSARRAY_MAPISTORE_H
 #define NSARRAY_MAPISTORE_H
 
+#import <Foundation/NSArray.h>
 
 @interface NSArray (MAPIStoreFolders)
 
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index c637a9ace..be54e9259 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSValue.h>
 
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
@@ -28,6 +29,11 @@
 #import "NSArray+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
+#include <mapistore/mapistore.h>
 
 @implementation NSArray (MAPIStoreFolders)
 
diff --git a/OpenChange/NSData+MAPIStore.h b/OpenChange/NSData+MAPIStore.h
index 0c5f6dcec..13daa8aef 100644
--- a/OpenChange/NSData+MAPIStore.h
+++ b/OpenChange/NSData+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef NSDATA_MAPISTORE_H
 #define NSDATA_MAPISTORE_H
 
+#import <Foundation/NSData.h>
 
 @interface NSData (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m
index 9549b9030..5a2afeb1d 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -22,12 +22,18 @@
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
 #import "NSData+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <libmapi/libmapi.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <gen_ndr/exchange.h>
 
 @implementation NSData (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSDate+MAPIStore.h b/OpenChange/NSDate+MAPIStore.h
index 3470acf45..d61df7b11 100644
--- a/OpenChange/NSDate+MAPIStore.h
+++ b/OpenChange/NSDate+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef NSCALENDARDATE_MAPISTORE_H
 #define NSCALENDARDATE_MAPISTORE_H
 
+#import <Foundation/NSDate.h>
 
 @class NSCalendarDate;
 
diff --git a/OpenChange/NSDate+MAPIStore.m b/OpenChange/NSDate+MAPIStore.m
index 7023881e9..b8f09dcc6 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -20,10 +20,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 
+#import "MAPIStoreTypes.h"
 #import "NSDate+MAPIStore.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
 
 static NSCalendarDate *refDate = nil;
 
diff --git a/OpenChange/NSObject+MAPIStore.h b/OpenChange/NSObject+MAPIStore.h
index d5c0df01c..ff5bed57d 100644
--- a/OpenChange/NSObject+MAPIStore.h
+++ b/OpenChange/NSObject+MAPIStore.h
@@ -23,7 +23,10 @@
 #ifndef NSOBJECT_MAPISTORE_H
 #define NSOBJECT_MAPISTORE_H
 
+#import <Foundation/NSObject.h>
 
+#include <talloc.h>
+#include <mapistore/mapistore_errors.h>
 
 struct MAPIStoreTallocWrapper
 {
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index 9098c5057..9ed02b7ab 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -20,8 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSThread.h>
 #import <NGExtensions/NSObject+Logs.h>
 
+#import "MAPIStorePropertySelectors.h"
+#import "MAPIStoreTypes.h"
 #import "NSArray+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
@@ -31,6 +36,8 @@
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
 
 @implementation NSObject (MAPIStoreTallocHelpers)
 
diff --git a/OpenChange/NSObject+PropertyList.h b/OpenChange/NSObject+PropertyList.h
index 272b73180..34ea28ea8 100644
--- a/OpenChange/NSObject+PropertyList.h
+++ b/OpenChange/NSObject+PropertyList.h
@@ -30,6 +30,9 @@
 #ifndef NSOBJECT_PROPERTYLIST_H
 #define NSOBJECT_PROPERTYLIST_H
 
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
 
 
 @interface NSObject (plext)
diff --git a/OpenChange/NSObject+PropertyList.m b/OpenChange/NSObject+PropertyList.m
index 90b352afa..164ac5054 100644
--- a/OpenChange/NSObject+PropertyList.m
+++ b/OpenChange/NSObject+PropertyList.m
@@ -21,8 +21,17 @@
 /* A format-agnostic property list dumper.
    Usage: dbmsgdump [filename] */
 
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSPropertyList.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
 #import <NGExtensions/NSNull+misc.h>
 
+#import <SOGo/BSONCodec.h>
 #import "NSObject+PropertyList.h"
 
 const char *indentationStep = "  ";
diff --git a/OpenChange/NSString+MAPIStore.h b/OpenChange/NSString+MAPIStore.h
index 68325c1ec..e5006c2ae 100644
--- a/OpenChange/NSString+MAPIStore.h
+++ b/OpenChange/NSString+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef NSSTRING_MAPISTORE_H
 #define NSSTRING_MAPISTORE_H
 
+#import <Foundation/NSString.h>
 
 @interface NSString (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSString+MAPIStore.m b/OpenChange/NSString+MAPIStore.m
index ace832723..83ca8d6e6 100644
--- a/OpenChange/NSString+MAPIStore.m
+++ b/OpenChange/NSString+MAPIStore.m
@@ -20,11 +20,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
+#include <stdbool.h>
 
+#import <Foundation/NSData.h>
 
 #import "NSString+MAPIStore.h"
 
 #undef DEBUG
+#include <talloc.h>
+#include <util/time.h>
+#include <mapistore/mapistore.h>
 
 @implementation NSString (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSValue+MAPIStore.h b/OpenChange/NSValue+MAPIStore.h
index 28c770d6e..da0b2aa41 100644
--- a/OpenChange/NSValue+MAPIStore.h
+++ b/OpenChange/NSValue+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef NSVALUE_MAPISTORE_H
 #define NSVALUE_MAPISTORE_H
 
+#import <Foundation/NSValue.h>
 
 @interface NSNumber (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSValue+MAPIStore.m b/OpenChange/NSValue+MAPIStore.m
index 733e1337e..a3301ce00 100644
--- a/OpenChange/NSValue+MAPIStore.m
+++ b/OpenChange/NSValue+MAPIStore.m
@@ -20,6 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <talloc.h>
 
 #import "NSValue+MAPIStore.h"
 
diff --git a/OpenChange/RTFHandler.h b/OpenChange/RTFHandler.h
index 4198cf7b1..ec776a8d3 100644
--- a/OpenChange/RTFHandler.h
+++ b/OpenChange/RTFHandler.h
@@ -19,8 +19,11 @@
   02111-1307, USA.
 */
 
+#include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSMapTable.h>
+#include <Foundation/NSObject.h>
+#include <Foundation/NSString.h>
 
 //
 //
diff --git a/OpenChange/RTFHandler.m b/OpenChange/RTFHandler.m
index 16885e3eb..d4f775b5d 100644
--- a/OpenChange/RTFHandler.m
+++ b/OpenChange/RTFHandler.m
@@ -21,6 +21,7 @@
 
 #include "RTFHandler.h"
 #include <Foundation/NSValue.h>
+#include <Foundation/NSException.h>
 
 //
 // Useful macros
diff --git a/OpenChange/SOGoCacheGCSObject+MAPIStore.h b/OpenChange/SOGoCacheGCSObject+MAPIStore.h
index fcf1ac544..da8452e3d 100644
--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.h
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.h
@@ -21,6 +21,7 @@
 #ifndef SOGOCACHEGCSOBJECTMAPISTORE
 #define SOGOCACHEGCSOBJECTMAPISTORE
 
+#include <SOGo/SOGoCacheGCSObject.h>
 
 @interface SOGoCacheGCSObject (MAPIStore)
 
diff --git a/OpenChange/SOGoCacheGCSObject+MAPIStore.m b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
index a577b49fc..679bee089 100644
--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.m
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
@@ -18,7 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSString.h>
 
+#include "MAPIStoreTypes.h"
 
 #include "SOGoCacheGCSObject+MAPIStore.h"
 
diff --git a/OpenChange/SOGoMAPIDBMessage.h b/OpenChange/SOGoMAPIDBMessage.h
index a604a64c0..4211988f6 100644
--- a/OpenChange/SOGoMAPIDBMessage.h
+++ b/OpenChange/SOGoMAPIDBMessage.h
@@ -21,6 +21,7 @@
 #ifndef SOGOMAPIDBMESSAGE_H
 #define SOGOMAPIDBMESSAGE_H
 
+#import <SOGo/SOGoCacheGCSObject.h>
 
 @class NSDate;
 @class NSString;
diff --git a/OpenChange/SOGoMAPIDBMessage.m b/OpenChange/SOGoMAPIDBMessage.m
index 3b35735d0..343b90334 100644
--- a/OpenChange/SOGoMAPIDBMessage.m
+++ b/OpenChange/SOGoMAPIDBMessage.m
@@ -20,10 +20,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSPropertyList.h>
+#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import <SOGo/SOGoCacheGCSFolder.h>
 
+#import "SOGoMAPIDBMessage.h"
 
 @implementation SOGoMAPIDBMessage
 
diff --git a/OpenChange/code-MAPIStorePropertySelectors.m b/OpenChange/code-MAPIStorePropertySelectors.m
index 39b28de52..86ac76f20 100644
--- a/OpenChange/code-MAPIStorePropertySelectors.m
+++ b/OpenChange/code-MAPIStorePropertySelectors.m
@@ -20,8 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSMapTable.h>
+#import <NGExtensions/NGLogger.h>
 
 #undef DEBUG
+#include <mapistore/mapistore.h>
 
 const MAPIStorePropertyGetter *
 MAPIStorePropertyGettersForClass (Class klass)
diff --git a/OpenChange/dbmsgreader.m b/OpenChange/dbmsgreader.m
index 678794bdf..5ad74b82b 100644
--- a/OpenChange/dbmsgreader.m
+++ b/OpenChange/dbmsgreader.m
@@ -23,9 +23,22 @@
 /* A format-agnostic property list readerer.
    Usage: dbmsgreader [username] [filename] */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSUserDefaults.h>
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGObjWeb/SoProductRegistry.h>
+#import <SOGo/SOGoProductLoader.h>
+#import <SOGo/SOGoSystemDefaults.h>
 
+#import <libmapi/libmapi.h>
 
+#import "MAPIStoreUserContext.h"
+#import <SOGo/SOGoCacheGCSObject.h>
 
+#import <SOGo/BSONCodec.h>
 #import "NSObject+PropertyList.h"
 
 
diff --git a/OpenChange/iCalEvent+MAPIStore.h b/OpenChange/iCalEvent+MAPIStore.h
index e135bb2ed..198526687 100644
--- a/OpenChange/iCalEvent+MAPIStore.h
+++ b/OpenChange/iCalEvent+MAPIStore.h
@@ -23,7 +23,9 @@
 #ifndef ICALEVENT_MAPISTORE_H
 #define ICALEVENT_MAPISTORE_H
 
+#include <talloc.h>
 
+#import <NGCards/iCalEvent.h>
 
 @class MAPIStoreUserContext;
 @class NSDictionary;
diff --git a/OpenChange/iCalEvent+MAPIStore.m b/OpenChange/iCalEvent+MAPIStore.m
index 8cbf73e85..25877029b 100644
--- a/OpenChange/iCalEvent+MAPIStore.m
+++ b/OpenChange/iCalEvent+MAPIStore.m
@@ -20,20 +20,55 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <util/attr.h>
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalTimeZone.h>
+#import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalTrigger.h>
+#import <SOGo/SOGoPermissions.h>
+#import <SOGo/SOGoUser.h>
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Mailer/NSString+Mail.h>
 
+#import "MAPIStoreAppointmentWrapper.h"
+#import "MAPIStoreCalendarAttachment.h"
+#import "MAPIStoreCalendarFolder.h"
+#import "MAPIStoreContext.h"
+#import "MAPIStoreMapping.h"
+#import "MAPIStoreRecurrenceUtils.h"
+#import "MAPIStoreTypes.h"
+#import "MAPIStoreUserContext.h"
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 #import "NSValue+MAPIStore.h"
 
+#import "MAPIStoreCalendarMessage.h"
 
 #undef DEBUG
+#include <stdbool.h>
+#include <gen_ndr/exchange.h>
+#include <gen_ndr/property.h>
+#include <libmapi/libmapi.h>
+#include <mapistore/mapistore.h>
+#include <mapistore/mapistore_errors.h>
+#include <mapistore/mapistore_nameid.h>
 
 #import "iCalEvent+MAPIStore.h"
 #import "iCalTimeZone+MAPIStore.h"
diff --git a/OpenChange/iCalTimeZone+MAPIStore.h b/OpenChange/iCalTimeZone+MAPIStore.h
index f4adfd8f1..25817392a 100644
--- a/OpenChange/iCalTimeZone+MAPIStore.h
+++ b/OpenChange/iCalTimeZone+MAPIStore.h
@@ -23,6 +23,7 @@
 #ifndef ICALTIMEZONE_MAPISTORE_H
 #define ICALTIMEZONE_MAPISTORE_H
 
+#import <NGCards/iCalTimeZone.h>
 
 @interface iCalTimeZone (MAPIStoreProperties)
 
diff --git a/OpenChange/iCalTimeZone+MAPIStore.m b/OpenChange/iCalTimeZone+MAPIStore.m
index f3494e4ad..7cf380fdf 100644
--- a/OpenChange/iCalTimeZone+MAPIStore.m
+++ b/OpenChange/iCalTimeZone+MAPIStore.m
@@ -20,14 +20,27 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+#import <NGCards/iCalByDayMask.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalTimeZonePeriod.h>
+#import <NGCards/iCalRecurrenceRule.h>
 
 #import "NSString+MAPIStore.h"
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 
+#include <stdbool.h>
+#include <stdint.h>
+#include <talloc.h>
 #undef DEBUG
+#include <libmapi/libmapi.h>
 
 #import "iCalTimeZone+MAPIStore.h"
+#import "MAPIStoreTypes.h"
 
 @interface iCalTimeZonePeriod (MAPIStorePropertiesPrivate)
 
diff --git a/OpenChange/plreader.m b/OpenChange/plreader.m
index 63669b0e2..69d0cd099 100644
--- a/OpenChange/plreader.m
+++ b/OpenChange/plreader.m
@@ -23,6 +23,9 @@
 /* A format-agnostic property list dumper.
    Usage: plreader [filename] */
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSProcessInfo.h>
 
 #import "NSObject+PropertyList.m"