diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index d8af710ad..21c542f81 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -29,6 +29,7 @@
 #import <Foundation/NSURL.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOQualifier.h>
+#import <SOGo/SOGoFolder.h>
 #import <SOGo/SOGoUser.h>
 #import "EOQualifier+MAPI.h"
 #import "MAPIStoreContext.h"
diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index 3c08e2bab..f93ec13da 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -29,6 +29,7 @@
 
 #import "MAPIStoreContext.h"
 #import "MAPIStoreFolder.h"
+#import "MAPIStoreMessage.h"
 #import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
 #import "NSString+MAPIStore.h"
diff --git a/OpenChange/MAPIStorePermissionsTable.m b/OpenChange/MAPIStorePermissionsTable.m
index 2385ee8a5..b5704610b 100644
--- a/OpenChange/MAPIStorePermissionsTable.m
+++ b/OpenChange/MAPIStorePermissionsTable.m
@@ -23,7 +23,6 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
-
 #import <SOGo/SOGoFolder.h>
 #import <SOGo/SOGoObject.h>
 #import <SOGo/SOGoUser.h>
@@ -103,7 +102,7 @@
     entryId = [NSData data];
   else
     {
-      connInfo = [[container context] connectionInfo];
+      connInfo = [(MAPIStoreContext *) [container context] connectionInfo];
       entryId = MAPIStoreInternalEntryId (connInfo->sam_ctx, userId);
     }
   *data = [entryId asBinaryInMemCtx: memCtx];
diff --git a/OpenChange/MAPIStoreUserContext.m b/OpenChange/MAPIStoreUserContext.m
index 2d6097277..9489eba44 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -25,6 +25,7 @@
 #import <Foundation/NSMapTable.h>
 #import <Foundation/NSPropertyList.h>
 #import <Foundation/NSThread.h>
+#import <Foundation/NSTimeZone.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOContext.h>
diff --git a/OpenChange/SOGoMAPIObject.m b/OpenChange/SOGoMAPIObject.m
index ec8a9ae52..178202963 100644
--- a/OpenChange/SOGoMAPIObject.m
+++ b/OpenChange/SOGoMAPIObject.m
@@ -20,6 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSCalendarDate.h>
+
 #import "SOGoMAPIObject.h"
 
 @implementation SOGoMAPIObject