diff --git a/ActiveSync/ActiveSyncProduct.m b/ActiveSync/ActiveSyncProduct.m
index d8af90561..6dd3c4ca4 100644
--- a/ActiveSync/ActiveSyncProduct.m
+++ b/ActiveSync/ActiveSyncProduct.m
@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#import <Foundation/NSObject.h>
 
 @interface ActiveSyncProduct : NSObject
 {
diff --git a/ActiveSync/NGDOMElement+ActiveSync.h b/ActiveSync/NGDOMElement+ActiveSync.h
index f7357f757..1730c708d 100644
--- a/ActiveSync/NGDOMElement+ActiveSync.h
+++ b/ActiveSync/NGDOMElement+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NGDOMELEMENTACTIVESYNC_H__
 #define __NGDOMELEMENTACTIVESYNC_H__
 
+#import <DOM/DOMElement.h>
 
 @class NSDictionary;
 
diff --git a/ActiveSync/NGDOMElement+ActiveSync.m b/ActiveSync/NGDOMElement+ActiveSync.m
index 7c5f797f3..61a6015d0 100644
--- a/ActiveSync/NGDOMElement+ActiveSync.m
+++ b/ActiveSync/NGDOMElement+ActiveSync.m
@@ -29,6 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "NGDOMElement+ActiveSync.h"
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 
 static NSArray *asElementArray = nil;
 
diff --git a/ActiveSync/NGMimeMessage+ActiveSync.h b/ActiveSync/NGMimeMessage+ActiveSync.h
index c028baab4..4a319da0f 100644
--- a/ActiveSync/NGMimeMessage+ActiveSync.h
+++ b/ActiveSync/NGMimeMessage+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NGMIMEMESSAGEACTIVESYNC_H__
 #define __NGMIMEMESSAGEACTIVESYNC_H__
 
+#import <NGMail/NGMimeMessage.h>
 
 @class NSArray;
 
diff --git a/ActiveSync/NGMimeMessage+ActiveSync.m b/ActiveSync/NGMimeMessage+ActiveSync.m
index cdc642cf7..9286d3653 100644
--- a/ActiveSync/NGMimeMessage+ActiveSync.m
+++ b/ActiveSync/NGMimeMessage+ActiveSync.m
@@ -29,7 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NGMimeMessage+ActiveSync.h"
 
+#import <Foundation/NSArray.h>
 
+#import <NGMail/NGMailAddress.h>
+#import <NGMail/NGMailAddressParser.h>
 
 #import <SOGo/NSString+Utilities.h>
 
diff --git a/ActiveSync/NGVCard+ActiveSync.h b/ActiveSync/NGVCard+ActiveSync.h
index 34245d58e..8c3d5d08a 100644
--- a/ActiveSync/NGVCard+ActiveSync.h
+++ b/ActiveSync/NGVCard+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NGVCARDACTIVESYNC_H__
 #define __NGVCARDACTIVESYNC_H__
 
+#import <NGCards/NGVCard.h>
 
 @class NSDictionary;
 @class NSString;
diff --git a/ActiveSync/NGVCard+ActiveSync.m b/ActiveSync/NGVCard+ActiveSync.m
index 7e418b6b3..2734f4ac5 100644
--- a/ActiveSync/NGVCard+ActiveSync.m
+++ b/ActiveSync/NGVCard+ActiveSync.m
@@ -29,10 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NGVCard+ActiveSync.h"
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
 
-
 #import <Contacts/NGVCard+SOGo.h>
 
 #import <SOGo/NSString+Utilities.h>
diff --git a/ActiveSync/NSArray+SyncCache.h b/ActiveSync/NSArray+SyncCache.h
index 7f7679b3a..8eebd2475 100644
--- a/ActiveSync/NSArray+SyncCache.h
+++ b/ActiveSync/NSArray+SyncCache.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSARRAYSYNCCACHE_H__
 #define __NSARRAYSYNCCACHE_H__
 
+#import <Foundation/NSArray.h>
 
 @class NSDictionary;
 
diff --git a/ActiveSync/NSArray+SyncCache.m b/ActiveSync/NSArray+SyncCache.m
index 764e85441..c499f2e23 100644
--- a/ActiveSync/NSArray+SyncCache.m
+++ b/ActiveSync/NSArray+SyncCache.m
@@ -29,7 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSArray+SyncCache.h"
 
+#import <Foundation/NSDictionary.h>
 
+#include "SOGoSyncCacheObject.h"
 
 @implementation NSMutableArray (SyncCache)
 
diff --git a/ActiveSync/NSCalendarDate+ActiveSync.h b/ActiveSync/NSCalendarDate+ActiveSync.h
index ae35e685f..b8deed527 100644
--- a/ActiveSync/NSCalendarDate+ActiveSync.h
+++ b/ActiveSync/NSCalendarDate+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSCALENDARDATEACTIVESYNC_H__
 #define __NSCALENDARDATEACTIVESYNC_H__
 
+#import <Foundation/NSCalendarDate.h>
 
 @class NSString;
 
diff --git a/ActiveSync/NSCalendarDate+ActiveSync.m b/ActiveSync/NSCalendarDate+ActiveSync.m
index 6321687ed..015cc8a69 100644
--- a/ActiveSync/NSCalendarDate+ActiveSync.m
+++ b/ActiveSync/NSCalendarDate+ActiveSync.m
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSCalendarDate+ActiveSync.h"
 
+#import <Foundation/NSString.h>
 
 #define ONE_DAY 86400
 
diff --git a/ActiveSync/NSData+ActiveSync.h b/ActiveSync/NSData+ActiveSync.h
index 08fceeab5..b0a994886 100644
--- a/ActiveSync/NSData+ActiveSync.h
+++ b/ActiveSync/NSData+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSDATAACTIVESYNC_H__
 #define __NSDATAACTIVESYNC_H__
 
+#import <Foundation/NSData.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/NSData+ActiveSync.m b/ActiveSync/NSData+ActiveSync.m
index 58a0ba16d..cf6609e9b 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -29,10 +29,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSData+ActiveSync.h"
 
+#import <Foundation/NSProcessInfo.h>
 
+#import <SOGo/SOGoSystemDefaults.h>
 
+#import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSObject+Logs.h>
 
+#include <wbxml/wbxml.h>
 
 #define WBXMLDEBUG 0
 
diff --git a/ActiveSync/NSDate+ActiveSync.h b/ActiveSync/NSDate+ActiveSync.h
index ffa2d6140..49b6a94fe 100644
--- a/ActiveSync/NSDate+ActiveSync.h
+++ b/ActiveSync/NSDate+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSDATEACTIVESYNC_H__
 #define __NSDATEACTIVESYNC_H__
 
+#import <Foundation/NSDate.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/NSDate+ActiveSync.m b/ActiveSync/NSDate+ActiveSync.m
index 6734e08a6..bd7035a26 100644
--- a/ActiveSync/NSDate+ActiveSync.m
+++ b/ActiveSync/NSDate+ActiveSync.m
@@ -29,6 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSDate+ActiveSync.h"
 
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
 
 @implementation NSDate (ActiveSync)
 
diff --git a/ActiveSync/NSString+ActiveSync.h b/ActiveSync/NSString+ActiveSync.h
index d35058f9a..70678ceaf 100644
--- a/ActiveSync/NSString+ActiveSync.h
+++ b/ActiveSync/NSString+ActiveSync.h
@@ -30,7 +30,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSSTRINGACTIVESYNC_H__
 #define __NSSTRINGACTIVESYNC_H__
 
-
+#import <Foundation/NSString.h>
+#include "SOGoActiveSyncConstants.h"
 
 @class NSCalendarDate;
 @class NSData;
diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m
index 04a00c58a..6b7d03a99 100644
--- a/ActiveSync/NSString+ActiveSync.m
+++ b/ActiveSync/NSString+ActiveSync.m
@@ -29,10 +29,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "NSString+ActiveSync.h"
 
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
 
 #include <SOGo/NSString+Utilities.h>
 #include <SOGo/NSData+Crypto.h>
 
+#include <NGExtensions/NGBase64Coding.h>
 #include <NGExtensions/NSString+misc.h>
 
 static NSArray *easCommandCodes = nil;
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.h b/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
index 37fbabc14..42744eec4 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
@@ -30,7 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __SOGOACTIVESYNCDISPATCHERSYNC_H__
 #define __SOGOACTIVESYNCDISPATCHERSYNC_H__
 
+#import "SOGoActiveSyncDispatcher.h"
 
+#import <DOM/DOMElement.h>
 
 @class WOResponse;
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
index 88a6c8ec3..4ece45011 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -29,10 +29,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "SOGoActiveSyncDispatcher+Sync.h"
 
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSSortDescriptor.h>
+#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-
+#import <NGObjWeb/WORequest.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -40,15 +45,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import <NGImap4/NSString+Imap4.h>
 
-
-
 #import <SOGo/NSArray+DAV.h>
+#import <SOGo/SOGoCache.h>
 #import <SOGo/NSDictionary+DAV.h>
+#import <SOGo/SOGoSystemDefaults.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoCacheGCSObject.h>
 
 #import <Appointments/iCalEntityObject+SOGo.h>
+#import <Appointments/SOGoAppointmentObject.h>
+#import <Appointments/SOGoTaskObject.h>
 
+#import <Contacts/SOGoContactGCSEntry.h>
 
-
+#import <Mailer/SOGoMailFolder.h>
 
 #include "iCalEvent+ActiveSync.h"
 #include "iCalToDo+ActiveSync.h"
@@ -59,7 +69,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSData+ActiveSync.h"
 #include "NSString+ActiveSync.h"
 #include "SOGoMailObject+ActiveSync.h"
+#include "SOGoSyncCacheObject.h"
 
+#include <unistd.h>
 
 @implementation SOGoActiveSyncDispatcher (Sync)
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.h b/ActiveSync/SOGoActiveSyncDispatcher.h
index 78f3fda9d..d4de4f985 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.h
+++ b/ActiveSync/SOGoActiveSyncDispatcher.h
@@ -28,6 +28,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#import <Foundation/NSObject.h>
+
 #include "SOGoActiveSyncConstants.h"
 
 @class NSCalendarDate;
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 858532f46..72b26dfef 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -28,21 +28,78 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#include "SOGoActiveSyncDispatcher.h"
+
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSTimeZone.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSValue.h>
+
 #import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoPermissions.h>
+#import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+
+#import <NGCards/iCalCalendar.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+
 #import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSString+Encoding.h>
+
+#import <NGImap4/NGImap4Client.h>
+#import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NSString+Imap4.h>
+
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeFileData.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMime/NGMimeType.h>
+#import <NGMail/NGMimeMessageParser.h>
+#import <NGMail/NGMimeMessageGenerator.h>
+
+#import <DOM/DOMElement.h>
+#import <DOM/DOMSaxBuilder.h>
+
 #import <SOGo/NSArray+DAV.h>
 #import <SOGo/NSDictionary+DAV.h>
+#import <SOGo/SOGoCache.h>
+#import <SOGo/SOGoCacheGCSObject.h>
+#import <SOGo/SOGoDAVAuthenticator.h>
+#import <SOGo/SOGoMailer.h>
+#import <SOGo/SOGoSystemDefaults.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserFolder.h>
+#import <SOGo/SOGoUserManager.h>
 #import <SOGo/GCSSpecialQueries+SOGoCacheObject.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/WORequest+SOGo.h>
 #import <SOGo/NSArray+Utilities.h>
+
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+#import <Appointments/SOGoAppointmentObject.h>
+
+#import <Contacts/SOGoContactGCSFolder.h>
+#import <Contacts/SOGoContactFolders.h>
+#import <Contacts/SOGoContactObject.h>
+#import <Contacts/SOGoContactSourceFolder.h>
+
+#import <Mailer/SOGoMailAccount.h>
+#import <Mailer/SOGoMailAccounts.h>
+#import <Mailer/SOGoMailBodyPart.h>
+#import <Mailer/SOGoMailFolder.h>
 #import <Mailer/SOGoMailObject+Draft.h>
+#import <Mailer/SOGoSentFolder.h>
 #import <Mailer/NSString+Mail.h>
+
+#import <Foundation/NSString.h>
+
 #include "iCalEvent+ActiveSync.h"
 #include "iCalToDo+ActiveSync.h"
 #include "NGMimeMessage+ActiveSync.h"
@@ -53,6 +110,16 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSString+ActiveSync.h"
 #include "SOGoMailObject+ActiveSync.h"
 
+#import <GDLContentStore/GCSChannelManager.h>
+
+#include <unistd.h>
+
+#ifdef HAVE_OPENSSL
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#endif
+
 @interface SOGoActiveSyncDispatcher (Sync)
 
 - (NSMutableDictionary *) _folderMetadataForKey: (NSString *) theFolderKey;
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.h b/ActiveSync/SOGoMailObject+ActiveSync.h
index 1e7438dd7..44ceec168 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.h
+++ b/ActiveSync/SOGoMailObject+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __SOGOMAILOBJECTACTIVESYNC_H__
 #define __SOGOMAILOBJECTACTIVESYNC_H__
 
+#import <Mailer/SOGoMailObject.h>
 
 @class iCalCalendar;
 @class NSDictionary;
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index 02ddbcccf..60c1d0997 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -29,15 +29,35 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "SOGoMailObject+ActiveSync.h"
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSException.h>
 
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalEvent.h>
+
+#import <NGExtensions/NGBase64Coding.h>
+#import <NGExtensions/NGQuotedPrintableCoding.h>
 
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSString+Encoding.h>
+#import <NGImap4/NGImap4Envelope.h>
+#import <NGImap4/NGImap4EnvelopeAddress.h>
 #import <NGImap4/NSString+Imap4.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WORequest.h>
 
+#import <NGMime/NGMimeBodyPart.h>
+#import <NGMime/NGMimeFileData.h>
+#import <NGMime/NGMimeMultipartBody.h>
+#import <NGMime/NGMimeType.h>
+#import <NGMail/NGMimeMessageParser.h>
+#import <NGMail/NGMimeMessage.h>
+#import <NGMail/NGMimeMessageGenerator.h>
 
-
+#import <SOGo/SOGoUserDefaults.h>
 
 #include "iCalTimeZone+ActiveSync.h"
 #include "NSData+ActiveSync.h"
@@ -46,9 +66,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <Appointments/iCalEntityObject+SOGo.h>
 #include <Appointments/iCalPerson+SOGo.h>
+#include <Mailer/SOGoMailBodyPart.h>
 #include <Mailer/NSString+Mail.h>
+
+#include <SOGo/SOGoUser.h>
 #include <SOGo/NSString+Utilities.h>
 
+#import <Appointments/SOGoAptMailNotification.h>
+
+
 
 unsigned char strToChar(char a, char b) {
     char encoder[3] = {'\0','\0','\0'};
diff --git a/ActiveSync/SOGoSyncCacheObject.h b/ActiveSync/SOGoSyncCacheObject.h
index 2cbff0dfd..a86d1067b 100644
--- a/ActiveSync/SOGoSyncCacheObject.h
+++ b/ActiveSync/SOGoSyncCacheObject.h
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __SOGOSYNCCACHEOBJECT_H__
 #define __SOGOSYNCCACHEOBJECT_H__
 
+#import <Foundation/NSObject.h>
 
 @class NSNull;
 
diff --git a/ActiveSync/SOGoSyncCacheObject.m b/ActiveSync/SOGoSyncCacheObject.m
index 93b2d471b..79761a343 100644
--- a/ActiveSync/SOGoSyncCacheObject.m
+++ b/ActiveSync/SOGoSyncCacheObject.m
@@ -28,7 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#include "SOGoSyncCacheObject.h"
 
+#import <Foundation/NSNull.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
 
 static Class NSNullK;
 
diff --git a/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m b/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
index e57f6688b..574786c20 100644
--- a/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
+++ b/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
@@ -28,8 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
+#import <NGObjWeb/SoObjectWebDAVDispatcher.h>
+
 #include <NGObjWeb/SoObject+SoDAV.h>
 
+#include <NGObjWeb/WEClientCapabilities.h>
+#include <NGObjWeb/WOContext.h>
+#include <NGObjWeb/WORequest.h>
+#include <NGObjWeb/WOResponse.h>
+
+#import <Foundation/NSArray.h>
+
 
 @interface SoObjectWebDAVDispatcher (ActiveSync)
 
diff --git a/ActiveSync/iCalAlarm+ActiveSync.h b/ActiveSync/iCalAlarm+ActiveSync.h
index db7309b86..838c5042c 100644
--- a/ActiveSync/iCalAlarm+ActiveSync.h
+++ b/ActiveSync/iCalAlarm+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __ICALALARMACTIVESYNC_H__
 #define __ICALALARMACTIVESYNC_H__
 
+#import <NGCards/iCalAlarm.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/iCalAlarm+ActiveSync.m b/ActiveSync/iCalAlarm+ActiveSync.m
index b16a4047d..aac4be116 100644
--- a/ActiveSync/iCalAlarm+ActiveSync.m
+++ b/ActiveSync/iCalAlarm+ActiveSync.m
@@ -29,10 +29,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalAlarm+ActiveSync.h"
 
-
+#import <Foundation/NSDictionary.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-
+#import <NGCards/iCalAlarm.h>
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalTrigger.h>
 
 @implementation iCalAlarm (ActiveSync)
 
diff --git a/ActiveSync/iCalEvent+ActiveSync.h b/ActiveSync/iCalEvent+ActiveSync.h
index 018f3887f..582501aa7 100644
--- a/ActiveSync/iCalEvent+ActiveSync.h
+++ b/ActiveSync/iCalEvent+ActiveSync.h
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __ICALEVENTACTIVESYNC_H__
 #define __ICALEVENTACTIVESYNC_H__
 
+#import <NGCards/iCalEvent.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
index c71bb547d..100963b8b 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -30,19 +30,27 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "iCalEvent+ActiveSync.h"
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
 #import <NGCards/NSCalendarDate+NGCards.h>
 #import <NGCards/NSString+NGCards.h>
 
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/WORequest+SOGo.h>
 
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Appointments/iCalRepeatableEntityObject+SOGo.h>
+#import <Appointments/SOGoAppointmentObject.h>
 
 #include "iCalAlarm+ActiveSync.h"
 #include "iCalRecurrenceRule+ActiveSync.h"
diff --git a/ActiveSync/iCalRecurrenceRule+ActiveSync.h b/ActiveSync/iCalRecurrenceRule+ActiveSync.h
index 68d1063c8..1de1a5316 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.h
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.h
@@ -31,6 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __ICALRECURRENCERULEACTIVESYNC_H__
 #define __ICALRECURRENCERULEACTIVESYNC_H__
 
+#import <NGCards/iCalRecurrenceRule.h>
 
 @class NSDictionary;
 @class NSString;
diff --git a/ActiveSync/iCalRecurrenceRule+ActiveSync.m b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
index ec7623c4d..225bbd90a 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.m
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
@@ -30,7 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "iCalRecurrenceRule+ActiveSync.h"
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
 
+#import <NGCards/iCalEvent.h>
+#import <NGCards/iCalByDayMask.h>
 
 #import "NSCalendarDate+ActiveSync.h"
 #import "NSDate+ActiveSync.h"
diff --git a/ActiveSync/iCalTimeZone+ActiveSync.h b/ActiveSync/iCalTimeZone+ActiveSync.h
index 2078a70a9..6e3de3856 100644
--- a/ActiveSync/iCalTimeZone+ActiveSync.h
+++ b/ActiveSync/iCalTimeZone+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __ICALTIMEZONEACTIVESYNC_H__
 #define __ICALTIMEZONEACTIVESYNC_H__
 
+#import <NGCards/iCalTimeZone.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/iCalTimeZone+ActiveSync.m b/ActiveSync/iCalTimeZone+ActiveSync.m
index 1ed0aba3e..694471063 100644
--- a/ActiveSync/iCalTimeZone+ActiveSync.m
+++ b/ActiveSync/iCalTimeZone+ActiveSync.m
@@ -29,8 +29,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalTimeZone+ActiveSync.h"
 
+#include <Foundation/NSArray.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSString.h>
 
-
+#import <NGCards/iCalByDayMask.h>
+#import <NGCards/iCalTimeZonePeriod.h>
 
 #include "NSData+ActiveSync.h"
 
diff --git a/ActiveSync/iCalToDo+ActiveSync.h b/ActiveSync/iCalToDo+ActiveSync.h
index ba232f28d..933f26eb7 100644
--- a/ActiveSync/iCalToDo+ActiveSync.h
+++ b/ActiveSync/iCalToDo+ActiveSync.h
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __ICALTODOACTIVESYNC_H__
 #define __ICALTODOACTIVESYNC_H__
 
+#import <NGCards/iCalToDo.h>
 
 @class NSString;
 @class WOContext;
diff --git a/ActiveSync/iCalToDo+ActiveSync.m b/ActiveSync/iCalToDo+ActiveSync.m
index 43fbd924f..e92728c88 100644
--- a/ActiveSync/iCalToDo+ActiveSync.m
+++ b/ActiveSync/iCalToDo+ActiveSync.m
@@ -29,11 +29,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalToDo+ActiveSync.h"
 
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WORequest.h>
 
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserDefaults.h>
 
+#import <NGCards/iCalCalendar.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalTimeZone.h>
 
 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"