Partly revert recent changes removing #imports and #includes, under OpenChange, as they cause more problems than they solve.

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

OpenChange/Codepages.m

@@ -18,6 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import "Codepages.h"
+#import <Foundation/NSArray.h>
 
 @implementation Codepages
 

OpenChange/MAPIApplication.h

@@ -23,6 +23,7 @@
 #ifndef MAPIAPPLICATION_H
 #define MAPIAPPLICATION_H
 
+#import <NGObjWeb/SoApplication.h>
 
 @class MAPIStoreUserContext;
 

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;
 

OpenChange/MAPIStoreActiveTables.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREACTIVETABLES_H
 #define MAPISTOREACTIVETABLES_H
 
+#import <Foundation/NSObject.h>
 
 @class NSMutableArray;
 

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
 {

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;
 

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;
 

OpenChange/MAPIStoreAttachment.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREATTACHMENT_H
 #define MAPISTOREATTACHMENT_H
 
+#import "MAPIStoreObject.h"
 
 @class NSData;
 @class MAPIStoreEmbeddedMessage;

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
 

OpenChange/MAPIStoreAttachmentTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREATTACHMENTTABLE_H
 #define MAPISTOREATTACHMENTTABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreAttachmentTable : MAPIStoreTable
 @end

OpenChange/MAPIStoreAttachmentTable.m

@@ -20,8 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
+#import "MAPIStoreMessage.h"
 
+#import "MAPIStoreAttachmentTable.h"
 
 @implementation MAPIStoreAttachmentTable
 

OpenChange/MAPIStoreAuthenticator.h

@@ -24,6 +24,7 @@
 #ifndef MAPISTOREAUTHENTICATOR_H
 #define MAPISTOREAUTHENTICATOR_H
 
+#import <Foundation/NSObject.h>
 
 @class NSString;
 @class NSURL;

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
 

OpenChange/MAPIStoreCalendarAttachment.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARATTACHMENT_H
 #define MAPISTORECALENDARATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSTimeZone;
 

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
 

OpenChange/MAPIStoreCalendarContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARCONTEXT_H
 #define MAPISTORECALENDARCONTEXT_H
 
+#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreCalendarContext : MAPIStoreGCSBaseContext
 

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;
 

OpenChange/MAPIStoreCalendarEmbeddedMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDAREMBEDDEDMESSAGE_H
 #define MAPISTORECALENDAREMBEDDEDMESSAGE_H
 
+#import "MAPIStoreEmbeddedMessage.h"
 
 @class MAPIStoreAppointmentWrapper;
 

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
 

OpenChange/MAPIStoreCalendarFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARFOLDER_H
 #define MAPISTORECALENDARFOLDER_H
 
+#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder
 

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
 

OpenChange/MAPIStoreCalendarMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARMESSAGE_H
 #define MAPISTORECALENDARMESSAGE_H
 
+#import "MAPIStoreGCSMessage.h"
 
 @class iCalCalendar;
 @class iCalEvent;

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);
 

OpenChange/MAPIStoreCalendarMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECALENDARMESSAGETABLE_H
 #define MAPISTORECALENDARMESSAGETABLE_H
 
+#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreCalendarMessageTable : MAPIStoreGCSMessageTable
 

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;
 

OpenChange/MAPIStoreContactsAttachment.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSATTACHMENT_H
 #define MAPISTORECONTACTSATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSData;
 @class NGVCardPhoto;

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 ? */
 

OpenChange/MAPIStoreContactsContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSCONTEXT_H
 #define MAPISTORECONTACTSCONTEXT_H
 
+#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreContactsContext : MAPIStoreGCSBaseContext
 

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;
 

OpenChange/MAPIStoreContactsFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSFOLDER_H
 #define MAPISTORECONTACTSFOLDER_H
 
+#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreContactsFolder : MAPIStoreGCSFolder
 

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
 

OpenChange/MAPIStoreContactsMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSMESSAGE_H
 #define MAPISTORECONTACTSMESSAGE_H
 
+#import "MAPIStoreGCSMessage.h"
 
 @interface MAPIStoreContactsMessage : MAPIStoreGCSMessage
 {

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)
 

OpenChange/MAPIStoreContactsMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORECONTACTSMESSAGETABLE_H
 #define MAPISTORECONTACTSMESSAGETABLE_H
 
+#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreContactsMessageTable : MAPIStoreGCSMessageTable
 @end

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;
 

OpenChange/MAPIStoreContext.h

@@ -23,7 +23,9 @@
 #ifndef MAPISTORECONTEXT_H
 #define MAPISTORECONTEXT_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSFileHandle;

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 */
 

OpenChange/MAPIStoreDBBaseContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBBASECONTEXT_H
 #define MAPISTOREDBBASECONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @interface MAPIStoreDBBaseContext : MAPIStoreContext
 

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;
 

OpenChange/MAPIStoreDBFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBFOLDER_H
 #define MAPISTOREDBFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @interface MAPIStoreDBFolder : MAPIStoreFolder
 

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;
 

OpenChange/MAPIStoreDBFolderTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBFOLDERTABLE_H
 #define MAPISTOREDBFOLDERTABLE_H
 
+#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreDBFolderTable : MAPIStoreFolderTable
 @end

OpenChange/MAPIStoreDBFolderTable.m

@@ -20,8 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreTypes.h"
 
+#import "MAPIStoreDBFolderTable.h"
 
 @implementation MAPIStoreDBFolderTable
 

OpenChange/MAPIStoreDBMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBMESSAGE_H
 #define MAPISTOREDBMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreDBMessage : MAPIStoreMessage
 @end

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
 

OpenChange/MAPIStoreDBMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREDBMESSAGETABLE_H
 #define MAPISTOREDBMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreDBMessageTable : MAPIStoreMessageTable
 @end

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;
 

OpenChange/MAPIStoreEmbeddedMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREEMBEDDEDMESSAGE_H
 #define MAPISTOREEMBEDDEDMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreEmbeddedMessage : MAPIStoreMessage
 

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;
 

OpenChange/MAPIStoreFAIMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFAIMESSAGE_H
 #define MAPISTOREFAIMESSAGE_H
 
+#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreFAIMessage : MAPIStoreDBMessage
 @end

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
 

OpenChange/MAPIStoreFAIMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFAIMESSAGETABLE_H
 #define MAPISTOREFAIMESSAGETABLE_H
 
+#import "MAPIStoreDBMessageTable.h"
 
 @interface MAPIStoreFAIMessageTable : MAPIStoreDBMessageTable
 @end

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;
 

OpenChange/MAPIStoreFallbackContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFALLBACKCONTEXT_H
 #define MAPISTOREFALLBACKCONTEXT_H
 
+#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreFallbackContext : MAPIStoreDBBaseContext
 

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
 

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
 {

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;
 

OpenChange/MAPIStoreFolderTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREFOLDERTABLE_H
 #define MAPISTOREFOLDERTABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreFolderTable : MAPIStoreTable
 @end

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
 

OpenChange/MAPIStoreGCSBaseContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSBASECONTEXT_H
 #define MAPISTOREGCSBASECONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @class EOQualifier;
 

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
 

OpenChange/MAPIStoreGCSFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSFOLDER_H
 #define MAPISTOREGCSFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @class NSArray;
 @class NSCalendarDate;

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;
 

OpenChange/MAPIStoreGCSMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSMESSAGE_H
 #define MAPISTOREGCSMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreGCSMessage : MAPIStoreMessage
 {

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
 

OpenChange/MAPIStoreGCSMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREGCSMESSAGETABLE_H
 #define MAPISTOREGCSMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @class EOQualifier;
 

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
 

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"

OpenChange/MAPIStoreMailAttachment.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILATTACHMENT_H
 #define MAPISTOREMAILATTACHMENT_H
 
+#import "MAPIStoreAttachment.h"
 
 @class NSDictionary;
 

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
 

OpenChange/MAPIStoreMailContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILCONTEXT_H
 #define MAPISTOREMAILCONTEXT_H
 
+#import "MAPIStoreContext.h"
 
 @interface MAPIStoreMailContext : MAPIStoreContext
 

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;
 

OpenChange/MAPIStoreMailFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILFOLDER_H
 #define MAPISTOREMAILFOLDER_H
 
+#import "MAPIStoreFolder.h"
 
 @class NSNumber;
 

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
 

OpenChange/MAPIStoreMailFolderTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILFOLDERTABLE_H
 #define MAPISTOREMAILFOLDERTABLE_H
 
+#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
 @end

OpenChange/MAPIStoreMailFolderTable.m

@@ -18,7 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSString.h>
 
+#import "MAPIStoreMailFolderTable.h"
+#import "MAPIStoreTypes.h"
 
 @implementation MAPIStoreMailFolderTable
 

OpenChange/MAPIStoreMailMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILMESSAGE_H
 #define MAPISTOREMAILMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @class NSData;
 @class NSString;

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;
 

OpenChange/MAPIStoreMailMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILMESSAGETABLE_H
 #define MAPISTOREMAILMESSAGETABLE_H
 
+#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreMailMessageTable : MAPIStoreMessageTable
 {

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
 

OpenChange/MAPIStoreMailVolatileMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAILVOLATILEMESSAGE_H
 #define MAPISTOREMAILVOLATILEMESSAGE_H
 
+#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreMailVolatileMessage : MAPIStoreMessage
 

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;
 

OpenChange/MAPIStoreMapping.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMAPPING_H
 #define MAPISTOREMAPPING_H
 
+#import <Foundation/NSObject.h>
 
 @class NSMutableDictionary;
 @class NSString;

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;
 

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
 {

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;
 

OpenChange/MAPIStoreMessageTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREMESSAGETABLE_H
 #define MAPISTOREMESSAGETABLE_H
 
+#import "MAPIStoreTable.h"
 
 @interface MAPIStoreMessageTable : MAPIStoreTable
 

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
 

OpenChange/MAPIStoreNotesContext.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESCONTEXT_H
 #define MAPISTORENOTESCONTEXT_H
 
+#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreNotesContext : MAPIStoreDBBaseContext
 

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
 

OpenChange/MAPIStoreNotesFolder.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESFOLDER_H
 #define MAPISTORENOTESFOLDER_H
 
+#import "MAPIStoreDBFolder.h"
 
 @interface MAPIStoreNotesFolder : MAPIStoreDBFolder
 @end

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
 

OpenChange/MAPIStoreNotesMessage.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTORENOTESMESSAGE_H
 #define MAPISTORENOTESMESSAGE_H
 
+#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreNotesMessage : MAPIStoreDBMessage
 @end

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
 

OpenChange/MAPIStoreObject.h

@@ -23,7 +23,9 @@
 #ifndef MAPISTOREOBJECT_H
 #define MAPISTOREOBJECT_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @class NSDate;
 @class NSData;

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
 

OpenChange/MAPIStoreObjectProxy.h

@@ -23,7 +23,9 @@
 #ifndef MAPISTOREOBJECTPROXY_H
 #define MAPISTOREOBJECTPROXY_H
 
+#include <talloc.h>
 
+#import <Foundation/NSObject.h>
 
 @interface MAPIStoreObjectProxy : NSObject
 {

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
 

OpenChange/MAPIStorePermissionsTable.h

@@ -23,6 +23,7 @@
 #ifndef MAPISTOREPERMISSIONSTABLE_H
 #define MAPISTOREPERMISSIONSTABLE_H
 
+#import "MAPIStoreTable.h"
 
 struct ldb_context;