diff --git a/ActiveSync/ActiveSyncProduct.m b/ActiveSync/ActiveSyncProduct.m
index 6dd3c4ca4..d8af90561 100644
--- a/ActiveSync/ActiveSyncProduct.m
+++ b/ActiveSync/ActiveSyncProduct.m
@@ -28,7 +28,6 @@ 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 037b0bcc6..f7357f757 100644
--- a/ActiveSync/NGDOMElement+ActiveSync.h
+++ b/ActiveSync/NGDOMElement+ActiveSync.h
@@ -30,8 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NGDOMELEMENTACTIVESYNC_H__
 #define __NGDOMELEMENTACTIVESYNC_H__
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
 @class NSDictionary;
 
diff --git a/ActiveSync/NGDOMElement+ActiveSync.m b/ActiveSync/NGDOMElement+ActiveSync.m
index 61a6015d0..7c5f797f3 100644
--- a/ActiveSync/NGDOMElement+ActiveSync.m
+++ b/ActiveSync/NGDOMElement+ActiveSync.m
@@ -29,9 +29,6 @@ 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 4a319da0f..c028baab4 100644
--- a/ActiveSync/NGMimeMessage+ActiveSync.h
+++ b/ActiveSync/NGMimeMessage+ActiveSync.h
@@ -30,7 +30,6 @@ 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 f3c11cd96..cdc642cf7 100644
--- a/ActiveSync/NGMimeMessage+ActiveSync.m
+++ b/ActiveSync/NGMimeMessage+ActiveSync.m
@@ -29,12 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NGMimeMessage+ActiveSync.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.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 8c3d5d08a..34245d58e 100644
--- a/ActiveSync/NGVCard+ActiveSync.h
+++ b/ActiveSync/NGVCard+ActiveSync.h
@@ -30,7 +30,6 @@ 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 45fb93142..0cf624e2c 100644
--- a/ActiveSync/NGVCard+ActiveSync.m
+++ b/ActiveSync/NGVCard+ActiveSync.m
@@ -29,15 +29,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NGVCard+ActiveSync.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
 
-#import <NGCards/CardElement.h>
 
 #import <Contacts/NGVCard+SOGo.h>
 
diff --git a/ActiveSync/NSArray+SyncCache.h b/ActiveSync/NSArray+SyncCache.h
index 8eebd2475..7f7679b3a 100644
--- a/ActiveSync/NSArray+SyncCache.h
+++ b/ActiveSync/NSArray+SyncCache.h
@@ -30,7 +30,6 @@ 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 c499f2e23..3a8fed1ad 100644
--- a/ActiveSync/NSArray+SyncCache.m
+++ b/ActiveSync/NSArray+SyncCache.m
@@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSArray+SyncCache.h"
 
-#import <Foundation/NSDictionary.h>
 
 #include "SOGoSyncCacheObject.h"
 
diff --git a/ActiveSync/NSCalendarDate+ActiveSync.h b/ActiveSync/NSCalendarDate+ActiveSync.h
index b8deed527..ae35e685f 100644
--- a/ActiveSync/NSCalendarDate+ActiveSync.h
+++ b/ActiveSync/NSCalendarDate+ActiveSync.h
@@ -30,7 +30,6 @@ 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 e28a95c57..6321687ed 100644
--- a/ActiveSync/NSCalendarDate+ActiveSync.m
+++ b/ActiveSync/NSCalendarDate+ActiveSync.m
@@ -29,8 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSCalendarDate+ActiveSync.h"
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 
 #define ONE_DAY 86400
 
diff --git a/ActiveSync/NSData+ActiveSync.h b/ActiveSync/NSData+ActiveSync.h
index b0a994886..08fceeab5 100644
--- a/ActiveSync/NSData+ActiveSync.h
+++ b/ActiveSync/NSData+ActiveSync.h
@@ -30,7 +30,6 @@ 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 cf059e66f..ab6ece9e6 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -29,12 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "NSData+ActiveSync.h"
 
-#import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSString.h>
 
-#import <SOGo/SOGoSystemDefaults.h>
 
-#import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #include <wbxml/wbxml.h>
diff --git a/ActiveSync/NSDate+ActiveSync.h b/ActiveSync/NSDate+ActiveSync.h
index 49b6a94fe..ffa2d6140 100644
--- a/ActiveSync/NSDate+ActiveSync.h
+++ b/ActiveSync/NSDate+ActiveSync.h
@@ -30,7 +30,6 @@ 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 bd7035a26..6734e08a6 100644
--- a/ActiveSync/NSDate+ActiveSync.m
+++ b/ActiveSync/NSDate+ActiveSync.m
@@ -29,8 +29,6 @@ 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 963b3d00a..e48cffd89 100644
--- a/ActiveSync/NSString+ActiveSync.h
+++ b/ActiveSync/NSString+ActiveSync.h
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __NSSTRINGACTIVESYNC_H__
 #define __NSSTRINGACTIVESYNC_H__
 
-#import <Foundation/NSString.h>
 
 #include "SOGoActiveSyncConstants.h"
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.h b/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
index 5508b4d89..37fbabc14 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.h
@@ -30,10 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef __SOGOACTIVESYNCDISPATCHERSYNC_H__
 #define __SOGOACTIVESYNCDISPATCHERSYNC_H__
 
-#import "SOGoActiveSyncDispatcher.h"
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
 @class WOResponse;
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
index 0faa6a20c..c98790ebf 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -29,32 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "SOGoActiveSyncDispatcher+Sync.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSNull.h>
-#import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSSortDescriptor.h>
-#import <Foundation/NSTimeZone.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoApplication.h>
-#import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOCookie.h>
-#import <NGObjWeb/WODirectAction.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEntityObject.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalToDo.h>
-#import <NGCards/NGVCard.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -62,40 +40,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import <NGImap4/NSString+Imap4.h>
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
-#import <EOControl/EOQualifier.h>
 
 #import <SOGo/NSArray+DAV.h>
-#import <SOGo/SOGoCache.h>
 #import <SOGo/NSDictionary+DAV.h>
-#import <SOGo/SOGoDAVAuthenticator.h>
-#import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoMailer.h>
-#import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
-#import <SOGo/SOGoCacheGCSObject.h>
 
 #import <Appointments/iCalEntityObject+SOGo.h>
-#import <Appointments/SOGoAppointmentObject.h>
-#import <Appointments/SOGoAppointmentFolder.h>
-#import <Appointments/SOGoAppointmentFolders.h>
-#import <Appointments/SOGoTaskObject.h>
 
-#import <Contacts/SOGoContactGCSEntry.h>
-#import <Contacts/SOGoContactGCSFolder.h>
-#import <Contacts/SOGoContactFolders.h>
-#import <Contacts/SOGoContactSourceFolder.h>
 
-#import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailAccounts.h>
-#import <Mailer/SOGoMailFolder.h>
-#import <Mailer/SOGoMailObject.h>
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
 
 #include "iCalEvent+ActiveSync.h"
 #include "iCalToDo+ActiveSync.h"
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.h b/ActiveSync/SOGoActiveSyncDispatcher.h
index 76b4acbe7..78f3fda9d 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.h
+++ b/ActiveSync/SOGoActiveSyncDispatcher.h
@@ -27,7 +27,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#import <Foundation/NSObject.h>
 
 #include "SOGoActiveSyncConstants.h"
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 215fccf36..9a6529b43 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.m
@@ -29,99 +29,36 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "SOGoActiveSyncDispatcher.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSCalendarDate.h>
 #if GNUSTEP_BASE_MINOR_VERSION >= 21
-#import <Foundation/NSLocale.h>
 #endif
-#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/SoApplication.h>
-#import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOCookie.h>
-#import <NGObjWeb/WODirectAction.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEntityObject.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalToDo.h>
-#import <NGCards/NGVCard.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/NGMimeMessage.h>
-#import <NGMail/NGMimeMessageGenerator.h>
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
-#import <DOM/DOMSaxBuilder.h>
 
-#import <EOControl/EOQualifier.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/SOGoDomainDefaults.h>
-#import <SOGo/SOGoMailer.h>
-#import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserManager.h>
-#import <SOGo/SOGoUserSettings.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.h>
 #import <Mailer/SOGoMailObject+Draft.h>
 #import <Mailer/NSString+Mail.h>
 
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
 
 #include "iCalEvent+ActiveSync.h"
 #include "iCalToDo+ActiveSync.h"
@@ -134,7 +71,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SOGoActiveSyncConstants.h"
 #include "SOGoMailObject+ActiveSync.h"
 
-#import <GDLContentStore/GCSChannelManager.h>
 
 #include <unistd.h>
 
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.h b/ActiveSync/SOGoMailObject+ActiveSync.h
index 44ceec168..1e7438dd7 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.h
+++ b/ActiveSync/SOGoMailObject+ActiveSync.h
@@ -30,7 +30,6 @@ 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 78391f2b5..f46db9119 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -29,39 +29,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "SOGoMailObject+ActiveSync.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalTimeZone.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 <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 <Mailer/SOGoMailLabel.h>
 
-#import <SOGo/SOGoUserDefaults.h>
 
 #include "iCalTimeZone+ActiveSync.h"
 #include "NSData+ActiveSync.h"
@@ -75,7 +51,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #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 a86d1067b..2cbff0dfd 100644
--- a/ActiveSync/SOGoSyncCacheObject.h
+++ b/ActiveSync/SOGoSyncCacheObject.h
@@ -31,7 +31,6 @@ 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 79761a343..ba8a18636 100644
--- a/ActiveSync/SOGoSyncCacheObject.m
+++ b/ActiveSync/SOGoSyncCacheObject.m
@@ -30,9 +30,6 @@ 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 7196ff002..5cef1766a 100644
--- a/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
+++ b/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
@@ -27,7 +27,6 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
-#import <NGObjWeb/SoObjectWebDAVDispatcher.h>
 
 #include <NGObjWeb/SoObject+SoDAV.h>
 #include <NGObjWeb/WEClientCapabilities.h>
@@ -35,7 +34,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #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 838c5042c..db7309b86 100644
--- a/ActiveSync/iCalAlarm+ActiveSync.h
+++ b/ActiveSync/iCalAlarm+ActiveSync.h
@@ -30,7 +30,6 @@ 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 62a3ad146..b16a4047d 100644
--- a/ActiveSync/iCalAlarm+ActiveSync.m
+++ b/ActiveSync/iCalAlarm+ActiveSync.m
@@ -29,16 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalAlarm+ActiveSync.h"
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSString+misc.h>
-#import <NGObjWeb/WOContext.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 582501aa7..018f3887f 100644
--- a/ActiveSync/iCalEvent+ActiveSync.h
+++ b/ActiveSync/iCalEvent+ActiveSync.h
@@ -31,7 +31,6 @@ 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 cab57ff48..c71bb547d 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -30,34 +30,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import "iCalEvent+ActiveSync.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>
 
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalPerson.h>
 #import <NGCards/NSCalendarDate+NGCards.h>
 #import <NGCards/NSString+NGCards.h>
-#import <NGCards/iCalCalendar.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 1de1a5316..68d1063c8 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.h
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.h
@@ -31,7 +31,6 @@ 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 225bbd90a..ec7623c4d 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.m
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
@@ -30,12 +30,7 @@ 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 6e3de3856..2078a70a9 100644
--- a/ActiveSync/iCalTimeZone+ActiveSync.h
+++ b/ActiveSync/iCalTimeZone+ActiveSync.h
@@ -30,7 +30,6 @@ 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 c4c0071fd..0c66424f8 100644
--- a/ActiveSync/iCalTimeZone+ActiveSync.m
+++ b/ActiveSync/iCalTimeZone+ActiveSync.m
@@ -35,11 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <Foundation/NSDate.h>
 #include <Foundation/NSString.h>
 
-#import <NGCards/iCalByDayMask.h>
-#import <NGCards/iCalTimeZonePeriod.h>
-#import <NGCards/iCalRecurrenceRule.h>
 
-#import <NGExtensions/NGBase64Coding.h>
 
 #include "NSData+ActiveSync.h"
 
diff --git a/ActiveSync/iCalToDo+ActiveSync.h b/ActiveSync/iCalToDo+ActiveSync.h
index 933f26eb7..ba232f28d 100644
--- a/ActiveSync/iCalToDo+ActiveSync.h
+++ b/ActiveSync/iCalToDo+ActiveSync.h
@@ -30,7 +30,6 @@ 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 94e0f9756..43fbd924f 100644
--- a/ActiveSync/iCalToDo+ActiveSync.m
+++ b/ActiveSync/iCalToDo+ActiveSync.m
@@ -29,23 +29,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalToDo+ActiveSync.h"
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSString+misc.h>
-#import <NGObjWeb/WOContext.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"
diff --git a/Main/MainUIProduct.m b/Main/MainUIProduct.m
index 1018ad738..047903a50 100644
--- a/Main/MainUIProduct.m
+++ b/Main/MainUIProduct.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
 
 @interface MainUIProduct : NSObject
 {
@@ -27,7 +26,6 @@
 
 @end
 
-#import <Foundation/Foundation.h>
 
 @implementation MainUIProduct
 
diff --git a/Main/NSException+Stacktrace.h b/Main/NSException+Stacktrace.h
index 776970b7c..8d855d84e 100644
--- a/Main/NSException+Stacktrace.h
+++ b/Main/NSException+Stacktrace.h
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSException.h>
 
 @interface NSException (SOGoExtensions)
 
diff --git a/Main/SOGo+DAV.m b/Main/SOGo+DAV.m
index 994e742e6..a3adc000e 100644
--- a/Main/SOGo+DAV.m
+++ b/Main/SOGo+DAV.m
@@ -18,18 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <DOM/DOMDocument.h>
-#import <DOM/DOMNode.h>
-#import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>
 
 #import <SOGo/NSArray+Utilities.h>
diff --git a/Main/SOGo.m b/Main/SOGo.m
index 8e8959b2c..c91c23c71 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -20,14 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDebug.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSDate.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSRunLoop.h>
-#import <Foundation/NSURL.h>
 
 #import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLContentStore/GCSChannelManager.h>
@@ -58,7 +50,6 @@
 #import <SOGo/SOGoPublicBaseFolder.h>
 #import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoProxyAuthenticator.h>
-#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoWebAuthenticator.h>
diff --git a/Main/sogod.m b/Main/sogod.m
index 4d6a488ae..022c43c02 100644
--- a/Main/sogod.m
+++ b/Main/sogod.m
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGObjWeb/SoApplication.h>
diff --git a/OpenChange/Codepages.h b/OpenChange/Codepages.h
index 60d8223d8..783077b2a 100644
--- a/OpenChange/Codepages.h
+++ b/OpenChange/Codepages.h
@@ -18,9 +18,6 @@
  * 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 8776ffe22..db9693dcf 100644
--- a/OpenChange/Codepages.m
+++ b/OpenChange/Codepages.m
@@ -18,8 +18,6 @@
  * 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 44fdaa15a..b66a0848b 100644
--- a/OpenChange/MAPIApplication.h
+++ b/OpenChange/MAPIApplication.h
@@ -23,7 +23,6 @@
 #ifndef MAPIAPPLICATION_H
 #define MAPIAPPLICATION_H
 
-#import <NGObjWeb/SoApplication.h>
 
 @class MAPIStoreUserContext;
 
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index 818ec1199..12cbee067 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -20,19 +20,11 @@
  * 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 8459bd9c1..af314a059 100644
--- a/OpenChange/MAPIStoreActiveTables.h
+++ b/OpenChange/MAPIStoreActiveTables.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREACTIVETABLES_H
 #define MAPISTOREACTIVETABLES_H
 
-#import <Foundation/NSObject.h>
 
 @class NSMutableArray;
 
diff --git a/OpenChange/MAPIStoreActiveTables.m b/OpenChange/MAPIStoreActiveTables.m
index a9cb0c254..bdaa4e954 100644
--- a/OpenChange/MAPIStoreActiveTables.m
+++ b/OpenChange/MAPIStoreActiveTables.m
@@ -24,13 +24,8 @@
    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 d114076fe..ac11177ef 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.h
+++ b/OpenChange/MAPIStoreAppointmentWrapper.h
@@ -23,11 +23,8 @@
 #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 11a189500..da140a78d 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -22,38 +22,17 @@
 
 #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>
diff --git a/OpenChange/MAPIStoreAttachment.h b/OpenChange/MAPIStoreAttachment.h
index bfa779b85..1d6ccbd7f 100644
--- a/OpenChange/MAPIStoreAttachment.h
+++ b/OpenChange/MAPIStoreAttachment.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREATTACHMENT_H
 #define MAPISTOREATTACHMENT_H
 
-#import "MAPIStoreObject.h"
 
 @class NSData;
 @class MAPIStoreEmbeddedMessage;
diff --git a/OpenChange/MAPIStoreAttachment.m b/OpenChange/MAPIStoreAttachment.m
index cb85911e3..d8b1c6a57 100644
--- a/OpenChange/MAPIStoreAttachment.m
+++ b/OpenChange/MAPIStoreAttachment.m
@@ -20,14 +20,7 @@
  * 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
diff --git a/OpenChange/MAPIStoreAttachmentTable.h b/OpenChange/MAPIStoreAttachmentTable.h
index d066a7b8c..df961ae2f 100644
--- a/OpenChange/MAPIStoreAttachmentTable.h
+++ b/OpenChange/MAPIStoreAttachmentTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREATTACHMENTTABLE_H
 #define MAPISTOREATTACHMENTTABLE_H
 
-#import "MAPIStoreTable.h"
 
 @interface MAPIStoreAttachmentTable : MAPIStoreTable
 @end
diff --git a/OpenChange/MAPIStoreAttachmentTable.m b/OpenChange/MAPIStoreAttachmentTable.m
index 61c82dd1b..2b6e936de 100644
--- a/OpenChange/MAPIStoreAttachmentTable.m
+++ b/OpenChange/MAPIStoreAttachmentTable.m
@@ -20,11 +20,8 @@
  * 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 ce88a60be..fc3c09a70 100644
--- a/OpenChange/MAPIStoreAuthenticator.h
+++ b/OpenChange/MAPIStoreAuthenticator.h
@@ -24,7 +24,6 @@
 #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 41e4ed081..e28c6c84f 100644
--- a/OpenChange/MAPIStoreAuthenticator.m
+++ b/OpenChange/MAPIStoreAuthenticator.m
@@ -20,13 +20,8 @@
  * 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 b0a35d6b2..a64253e2d 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.h
+++ b/OpenChange/MAPIStoreCalendarAttachment.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDARATTACHMENT_H
 #define MAPISTORECALENDARATTACHMENT_H
 
-#import "MAPIStoreAttachment.h"
 
 @class NSTimeZone;
 
diff --git a/OpenChange/MAPIStoreCalendarAttachment.m b/OpenChange/MAPIStoreCalendarAttachment.m
index e101e735b..0e94f0732 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.m
+++ b/OpenChange/MAPIStoreCalendarAttachment.m
@@ -20,24 +20,16 @@
  * 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>
diff --git a/OpenChange/MAPIStoreCalendarContext.h b/OpenChange/MAPIStoreCalendarContext.h
index e6f804805..b6ed0dcd7 100644
--- a/OpenChange/MAPIStoreCalendarContext.h
+++ b/OpenChange/MAPIStoreCalendarContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDARCONTEXT_H
 #define MAPISTORECALENDARCONTEXT_H
 
-#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreCalendarContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m
index 035741afb..5514a90cb 100644
--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@@ -20,14 +20,8 @@
  * 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>
diff --git a/OpenChange/MAPIStoreCalendarEmbeddedMessage.h b/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
index 3e27c575c..82d98dc14 100644
--- a/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
+++ b/OpenChange/MAPIStoreCalendarEmbeddedMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDAREMBEDDEDMESSAGE_H
 #define MAPISTORECALENDAREMBEDDEDMESSAGE_H
 
-#import "MAPIStoreEmbeddedMessage.h"
 
 @class MAPIStoreAppointmentWrapper;
 
diff --git a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
index 986b106d3..8fd1df1d2 100644
--- a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
@@ -22,22 +22,13 @@
 
 #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>
 
diff --git a/OpenChange/MAPIStoreCalendarFolder.h b/OpenChange/MAPIStoreCalendarFolder.h
index fd6c5d20f..66d59a218 100644
--- a/OpenChange/MAPIStoreCalendarFolder.h
+++ b/OpenChange/MAPIStoreCalendarFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDARFOLDER_H
 #define MAPISTORECALENDARFOLDER_H
 
-#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreCalendarFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreCalendarFolder.m b/OpenChange/MAPIStoreCalendarFolder.m
index 5079c65cc..462fd64e1 100644
--- a/OpenChange/MAPIStoreCalendarFolder.m
+++ b/OpenChange/MAPIStoreCalendarFolder.m
@@ -20,25 +20,11 @@
  * 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>
diff --git a/OpenChange/MAPIStoreCalendarMessage.h b/OpenChange/MAPIStoreCalendarMessage.h
index 8b2de759d..286e88c5b 100644
--- a/OpenChange/MAPIStoreCalendarMessage.h
+++ b/OpenChange/MAPIStoreCalendarMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDARMESSAGE_H
 #define MAPISTORECALENDARMESSAGE_H
 
-#import "MAPIStoreGCSMessage.h"
 
 @class iCalCalendar;
 @class iCalEvent;
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 108471eae..bd1a6ad11 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -27,48 +27,18 @@
 #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>
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.h b/OpenChange/MAPIStoreCalendarMessageTable.h
index eeccbc455..a45aace4b 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.h
+++ b/OpenChange/MAPIStoreCalendarMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECALENDARMESSAGETABLE_H
 #define MAPISTORECALENDARMESSAGETABLE_H
 
-#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreCalendarMessageTable : MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.m b/OpenChange/MAPIStoreCalendarMessageTable.m
index bbf05274f..82dab1a2d 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.m
+++ b/OpenChange/MAPIStoreCalendarMessageTable.m
@@ -20,20 +20,12 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreContactsAttachment.h b/OpenChange/MAPIStoreContactsAttachment.h
index c4a368849..2379f910d 100644
--- a/OpenChange/MAPIStoreContactsAttachment.h
+++ b/OpenChange/MAPIStoreContactsAttachment.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTACTSATTACHMENT_H
 #define MAPISTORECONTACTSATTACHMENT_H
 
-#import "MAPIStoreAttachment.h"
 
 @class NSData;
 @class NGVCardPhoto;
diff --git a/OpenChange/MAPIStoreContactsAttachment.m b/OpenChange/MAPIStoreContactsAttachment.m
index f578dbc61..d8a8d7488 100644
--- a/OpenChange/MAPIStoreContactsAttachment.m
+++ b/OpenChange/MAPIStoreContactsAttachment.m
@@ -20,18 +20,12 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreContactsContext.h b/OpenChange/MAPIStoreContactsContext.h
index 68120215e..b77e89972 100644
--- a/OpenChange/MAPIStoreContactsContext.h
+++ b/OpenChange/MAPIStoreContactsContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTACTSCONTEXT_H
 #define MAPISTORECONTACTSCONTEXT_H
 
-#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreContactsContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreContactsContext.m b/OpenChange/MAPIStoreContactsContext.m
index bfef33e27..3252804d6 100644
--- a/OpenChange/MAPIStoreContactsContext.m
+++ b/OpenChange/MAPIStoreContactsContext.m
@@ -20,14 +20,9 @@
  * 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>
diff --git a/OpenChange/MAPIStoreContactsFolder.h b/OpenChange/MAPIStoreContactsFolder.h
index 2bade99f7..7b6736346 100644
--- a/OpenChange/MAPIStoreContactsFolder.h
+++ b/OpenChange/MAPIStoreContactsFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTACTSFOLDER_H
 #define MAPISTORECONTACTSFOLDER_H
 
-#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreContactsFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreContactsFolder.m b/OpenChange/MAPIStoreContactsFolder.m
index a04110d0f..f8cccf035 100644
--- a/OpenChange/MAPIStoreContactsFolder.m
+++ b/OpenChange/MAPIStoreContactsFolder.m
@@ -20,21 +20,10 @@
  * 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>
diff --git a/OpenChange/MAPIStoreContactsMessage.h b/OpenChange/MAPIStoreContactsMessage.h
index 48d5bafb0..2e761f252 100644
--- a/OpenChange/MAPIStoreContactsMessage.h
+++ b/OpenChange/MAPIStoreContactsMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTACTSMESSAGE_H
 #define MAPISTORECONTACTSMESSAGE_H
 
-#import "MAPIStoreGCSMessage.h"
 
 @interface MAPIStoreContactsMessage : MAPIStoreGCSMessage
 {
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index b183d445e..a580feda9 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -21,35 +21,17 @@
  * 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>
diff --git a/OpenChange/MAPIStoreContactsMessageTable.h b/OpenChange/MAPIStoreContactsMessageTable.h
index 0563f9b2e..8e6a67b91 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.h
+++ b/OpenChange/MAPIStoreContactsMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTACTSMESSAGETABLE_H
 #define MAPISTORECONTACTSMESSAGETABLE_H
 
-#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreContactsMessageTable : MAPIStoreGCSMessageTable
 @end
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index b88158a26..6726a4907 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -20,27 +20,15 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 533d7f278..58fd771e9 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -25,7 +25,6 @@
 
 #include <talloc.h>
 
-#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSFileHandle;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 9b8e0a37a..3cb80b520 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -20,34 +20,16 @@
  * 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>
diff --git a/OpenChange/MAPIStoreDBBaseContext.h b/OpenChange/MAPIStoreDBBaseContext.h
index 62f5bd489..8990b1076 100644
--- a/OpenChange/MAPIStoreDBBaseContext.h
+++ b/OpenChange/MAPIStoreDBBaseContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREDBBASECONTEXT_H
 #define MAPISTOREDBBASECONTEXT_H
 
-#import "MAPIStoreContext.h"
 
 @interface MAPIStoreDBBaseContext : MAPIStoreContext
 
diff --git a/OpenChange/MAPIStoreDBBaseContext.m b/OpenChange/MAPIStoreDBBaseContext.m
index 22a15bc85..23f7d4362 100644
--- a/OpenChange/MAPIStoreDBBaseContext.m
+++ b/OpenChange/MAPIStoreDBBaseContext.m
@@ -21,18 +21,10 @@
 /* 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>
diff --git a/OpenChange/MAPIStoreDBFolder.h b/OpenChange/MAPIStoreDBFolder.h
index 2415af934..eec854a50 100644
--- a/OpenChange/MAPIStoreDBFolder.h
+++ b/OpenChange/MAPIStoreDBFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREDBFOLDER_H
 #define MAPISTOREDBFOLDER_H
 
-#import "MAPIStoreFolder.h"
 
 @interface MAPIStoreDBFolder : MAPIStoreFolder
 
diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index a7c49b72d..8910e6312 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -22,28 +22,9 @@
 
 #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>
diff --git a/OpenChange/MAPIStoreDBFolderTable.h b/OpenChange/MAPIStoreDBFolderTable.h
index afc3018e2..78bdea627 100644
--- a/OpenChange/MAPIStoreDBFolderTable.h
+++ b/OpenChange/MAPIStoreDBFolderTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREDBFOLDERTABLE_H
 #define MAPISTOREDBFOLDERTABLE_H
 
-#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreDBFolderTable : MAPIStoreFolderTable
 @end
diff --git a/OpenChange/MAPIStoreDBFolderTable.m b/OpenChange/MAPIStoreDBFolderTable.m
index 01a40b7f0..6017cda3a 100644
--- a/OpenChange/MAPIStoreDBFolderTable.m
+++ b/OpenChange/MAPIStoreDBFolderTable.m
@@ -20,11 +20,8 @@
  * 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 532f53a8e..ce0f7184e 100644
--- a/OpenChange/MAPIStoreDBMessage.h
+++ b/OpenChange/MAPIStoreDBMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREDBMESSAGE_H
 #define MAPISTOREDBMESSAGE_H
 
-#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreDBMessage : MAPIStoreMessage
 @end
diff --git a/OpenChange/MAPIStoreDBMessage.m b/OpenChange/MAPIStoreDBMessage.m
index 98d357bf7..44806d35a 100644
--- a/OpenChange/MAPIStoreDBMessage.m
+++ b/OpenChange/MAPIStoreDBMessage.m
@@ -20,21 +20,9 @@
  * 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"
diff --git a/OpenChange/MAPIStoreDBMessageTable.h b/OpenChange/MAPIStoreDBMessageTable.h
index 4b9f66480..8fedc57d0 100644
--- a/OpenChange/MAPIStoreDBMessageTable.h
+++ b/OpenChange/MAPIStoreDBMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREDBMESSAGETABLE_H
 #define MAPISTOREDBMESSAGETABLE_H
 
-#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreDBMessageTable : MAPIStoreMessageTable
 @end
diff --git a/OpenChange/MAPIStoreDBMessageTable.m b/OpenChange/MAPIStoreDBMessageTable.m
index a8c68abd1..295a2f335 100644
--- a/OpenChange/MAPIStoreDBMessageTable.m
+++ b/OpenChange/MAPIStoreDBMessageTable.m
@@ -20,14 +20,9 @@
  * 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>
diff --git a/OpenChange/MAPIStoreEmbeddedMessage.h b/OpenChange/MAPIStoreEmbeddedMessage.h
index 4ef65f261..09ce0fa82 100644
--- a/OpenChange/MAPIStoreEmbeddedMessage.h
+++ b/OpenChange/MAPIStoreEmbeddedMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREEMBEDDEDMESSAGE_H
 #define MAPISTOREEMBEDDEDMESSAGE_H
 
-#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreEmbeddedMessage : MAPIStoreMessage
 
diff --git a/OpenChange/MAPIStoreEmbeddedMessage.m b/OpenChange/MAPIStoreEmbeddedMessage.m
index f609726db..1ba6f0d0d 100644
--- a/OpenChange/MAPIStoreEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreEmbeddedMessage.m
@@ -20,13 +20,9 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreFAIMessage.h b/OpenChange/MAPIStoreFAIMessage.h
index 509bd37be..cc5fca347 100644
--- a/OpenChange/MAPIStoreFAIMessage.h
+++ b/OpenChange/MAPIStoreFAIMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREFAIMESSAGE_H
 #define MAPISTOREFAIMESSAGE_H
 
-#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreFAIMessage : MAPIStoreDBMessage
 @end
diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m
index bfa093ff7..60c103772 100644
--- a/OpenChange/MAPIStoreFAIMessage.m
+++ b/OpenChange/MAPIStoreFAIMessage.m
@@ -20,14 +20,9 @@
  * 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>
diff --git a/OpenChange/MAPIStoreFAIMessageTable.h b/OpenChange/MAPIStoreFAIMessageTable.h
index c12f20f99..0bd0275c6 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.h
+++ b/OpenChange/MAPIStoreFAIMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREFAIMESSAGETABLE_H
 #define MAPISTOREFAIMESSAGETABLE_H
 
-#import "MAPIStoreDBMessageTable.h"
 
 @interface MAPIStoreFAIMessageTable : MAPIStoreDBMessageTable
 @end
diff --git a/OpenChange/MAPIStoreFAIMessageTable.m b/OpenChange/MAPIStoreFAIMessageTable.m
index 531299868..25ef4b8de 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.m
+++ b/OpenChange/MAPIStoreFAIMessageTable.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 
-#import "MAPIStoreFAIMessage.h"
-#import "MAPIStoreFolder.h"
 
-#import "MAPIStoreFAIMessageTable.h"
 
 #undef DEBUG
 #include <talloc.h>
diff --git a/OpenChange/MAPIStoreFallbackContext.h b/OpenChange/MAPIStoreFallbackContext.h
index a6a2707ab..2d71c3183 100644
--- a/OpenChange/MAPIStoreFallbackContext.h
+++ b/OpenChange/MAPIStoreFallbackContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREFALLBACKCONTEXT_H
 #define MAPISTOREFALLBACKCONTEXT_H
 
-#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreFallbackContext : MAPIStoreDBBaseContext
 
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index 1555226d5..6c756b84f 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -18,15 +18,9 @@
  * 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>
diff --git a/OpenChange/MAPIStoreFolder.h b/OpenChange/MAPIStoreFolder.h
index 3f3bfb204..a4739b99f 100644
--- a/OpenChange/MAPIStoreFolder.h
+++ b/OpenChange/MAPIStoreFolder.h
@@ -21,7 +21,6 @@
 #ifndef MAPISTOREFOLDER_H
 #define MAPISTOREFOLDER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSMutableArray;
@@ -39,7 +38,6 @@
 @class SOGoCacheGCSFolder;
 @class SOGoMAPIDBMessage;
 
-#import "MAPIStoreSOGoObject.h"
 
 @interface MAPIStoreFolder : MAPIStoreSOGoObject
 {
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index c111f2305..07e3ae13b 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -20,40 +20,14 @@
 
 /* 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>
 
diff --git a/OpenChange/MAPIStoreFolderTable.h b/OpenChange/MAPIStoreFolderTable.h
index b584c6084..b5121f4a2 100644
--- a/OpenChange/MAPIStoreFolderTable.h
+++ b/OpenChange/MAPIStoreFolderTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREFOLDERTABLE_H
 #define MAPISTOREFOLDERTABLE_H
 
-#import "MAPIStoreTable.h"
 
 @interface MAPIStoreFolderTable : MAPIStoreTable
 @end
diff --git a/OpenChange/MAPIStoreFolderTable.m b/OpenChange/MAPIStoreFolderTable.m
index d76c9890e..23b24988b 100644
--- a/OpenChange/MAPIStoreFolderTable.m
+++ b/OpenChange/MAPIStoreFolderTable.m
@@ -20,14 +20,10 @@
  * 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>
diff --git a/OpenChange/MAPIStoreGCSBaseContext.h b/OpenChange/MAPIStoreGCSBaseContext.h
index 8d9e57f5d..40182433c 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.h
+++ b/OpenChange/MAPIStoreGCSBaseContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREGCSBASECONTEXT_H
 #define MAPISTOREGCSBASECONTEXT_H
 
-#import "MAPIStoreContext.h"
 
 @class EOQualifier;
 
diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m
index e0f06482d..f18eecda0 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@@ -20,18 +20,10 @@
  * 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>
diff --git a/OpenChange/MAPIStoreGCSFolder.h b/OpenChange/MAPIStoreGCSFolder.h
index de2b9692b..68d151fe8 100644
--- a/OpenChange/MAPIStoreGCSFolder.h
+++ b/OpenChange/MAPIStoreGCSFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREGCSFOLDER_H
 #define MAPISTOREGCSFOLDER_H
 
-#import "MAPIStoreFolder.h"
 
 @class NSArray;
 @class NSCalendarDate;
diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m
index 336474675..e6b443f0e 100644
--- a/OpenChange/MAPIStoreGCSFolder.m
+++ b/OpenChange/MAPIStoreGCSFolder.m
@@ -20,30 +20,14 @@
  * 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>
diff --git a/OpenChange/MAPIStoreGCSMessage.h b/OpenChange/MAPIStoreGCSMessage.h
index cac182874..5fc468fa3 100644
--- a/OpenChange/MAPIStoreGCSMessage.h
+++ b/OpenChange/MAPIStoreGCSMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREGCSMESSAGE_H
 #define MAPISTOREGCSMESSAGE_H
 
-#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreGCSMessage : MAPIStoreMessage
 {
diff --git a/OpenChange/MAPIStoreGCSMessage.m b/OpenChange/MAPIStoreGCSMessage.m
index 58b4a9ca2..42b8eabc1 100644
--- a/OpenChange/MAPIStoreGCSMessage.m
+++ b/OpenChange/MAPIStoreGCSMessage.m
@@ -20,23 +20,11 @@
  * 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>
diff --git a/OpenChange/MAPIStoreGCSMessageTable.h b/OpenChange/MAPIStoreGCSMessageTable.h
index 72190c221..5f8ccfbcc 100644
--- a/OpenChange/MAPIStoreGCSMessageTable.h
+++ b/OpenChange/MAPIStoreGCSMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREGCSMESSAGETABLE_H
 #define MAPISTOREGCSMESSAGETABLE_H
 
-#import "MAPIStoreMessageTable.h"
 
 @class EOQualifier;
 
diff --git a/OpenChange/MAPIStoreGCSMessageTable.m b/OpenChange/MAPIStoreGCSMessageTable.m
index 0dac1fff9..26c3c71c1 100644
--- a/OpenChange/MAPIStoreGCSMessageTable.m
+++ b/OpenChange/MAPIStoreGCSMessageTable.m
@@ -20,26 +20,13 @@
  * 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>
diff --git a/OpenChange/MAPIStoreMIME.m b/OpenChange/MAPIStoreMIME.m
index 712cc88bc..ef4a68c98 100644
--- a/OpenChange/MAPIStoreMIME.m
+++ b/OpenChange/MAPIStoreMIME.m
@@ -20,12 +20,7 @@
  * 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 b04b197ab..128caf989 100644
--- a/OpenChange/MAPIStoreMailAttachment.h
+++ b/OpenChange/MAPIStoreMailAttachment.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILATTACHMENT_H
 #define MAPISTOREMAILATTACHMENT_H
 
-#import "MAPIStoreAttachment.h"
 
 @class NSDictionary;
 
diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index 575808f39..4d19298ee 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -20,25 +20,14 @@
  * 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>
diff --git a/OpenChange/MAPIStoreMailContext.h b/OpenChange/MAPIStoreMailContext.h
index 9e8371714..947f3277f 100644
--- a/OpenChange/MAPIStoreMailContext.h
+++ b/OpenChange/MAPIStoreMailContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILCONTEXT_H
 #define MAPISTOREMAILCONTEXT_H
 
-#import "MAPIStoreContext.h"
 
 @interface MAPIStoreMailContext : MAPIStoreContext
 
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index c1f39565f..2248f6d11 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -20,22 +20,12 @@
  * 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
diff --git a/OpenChange/MAPIStoreMailFolder.h b/OpenChange/MAPIStoreMailFolder.h
index 717868efb..760d92f83 100644
--- a/OpenChange/MAPIStoreMailFolder.h
+++ b/OpenChange/MAPIStoreMailFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILFOLDER_H
 #define MAPISTOREMAILFOLDER_H
 
-#import "MAPIStoreFolder.h"
 
 @class NSNumber;
 
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 6e87d4ecd..2b0dbcfe4 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -20,51 +20,18 @@
 
 #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;
 
diff --git a/OpenChange/MAPIStoreMailFolderTable.h b/OpenChange/MAPIStoreMailFolderTable.h
index 5ec2c4a5b..4590fdae2 100644
--- a/OpenChange/MAPIStoreMailFolderTable.h
+++ b/OpenChange/MAPIStoreMailFolderTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILFOLDERTABLE_H
 #define MAPISTOREMAILFOLDERTABLE_H
 
-#import "MAPIStoreFolderTable.h"
 
 @interface MAPIStoreMailFolderTable : MAPIStoreFolderTable
 @end
diff --git a/OpenChange/MAPIStoreMailFolderTable.m b/OpenChange/MAPIStoreMailFolderTable.m
index 542e1dc8f..2586f545b 100644
--- a/OpenChange/MAPIStoreMailFolderTable.m
+++ b/OpenChange/MAPIStoreMailFolderTable.m
@@ -18,10 +18,7 @@
  * 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 60922feaf..c1f7417c6 100644
--- a/OpenChange/MAPIStoreMailMessage.h
+++ b/OpenChange/MAPIStoreMailMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILMESSAGE_H
 #define MAPISTOREMAILMESSAGE_H
 
-#import "MAPIStoreMessage.h"
 
 @class NSData;
 @class NSString;
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index f79511eb6..111bd6bfa 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -21,43 +21,17 @@
  * 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>
diff --git a/OpenChange/MAPIStoreMailMessageTable.h b/OpenChange/MAPIStoreMailMessageTable.h
index 8efa43c16..8c2e0f35c 100644
--- a/OpenChange/MAPIStoreMailMessageTable.h
+++ b/OpenChange/MAPIStoreMailMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILMESSAGETABLE_H
 #define MAPISTOREMAILMESSAGETABLE_H
 
-#import "MAPIStoreMessageTable.h"
 
 @interface MAPIStoreMailMessageTable : MAPIStoreMessageTable
 {
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index d315f6527..4e2bb976f 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -20,27 +20,14 @@
  * 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>
diff --git a/OpenChange/MAPIStoreMailVolatileMessage.h b/OpenChange/MAPIStoreMailVolatileMessage.h
index 212226abf..3195e25b6 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.h
+++ b/OpenChange/MAPIStoreMailVolatileMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMAILVOLATILEMESSAGE_H
 #define MAPISTOREMAILVOLATILEMESSAGE_H
 
-#import "MAPIStoreMessage.h"
 
 @interface MAPIStoreMailVolatileMessage : MAPIStoreMessage
 
diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m
index 1db930ef8..490c4de0e 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.m
+++ b/OpenChange/MAPIStoreMailVolatileMessage.m
@@ -25,49 +25,18 @@
    - 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>
diff --git a/OpenChange/MAPIStoreMapping.h b/OpenChange/MAPIStoreMapping.h
index 55c2e944a..0d2e8c086 100644
--- a/OpenChange/MAPIStoreMapping.h
+++ b/OpenChange/MAPIStoreMapping.h
@@ -23,7 +23,6 @@
 #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 b7d303ed6..5db5e8e94 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -22,11 +22,6 @@
 
 #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>
@@ -37,9 +32,7 @@
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
 
-#import "MAPIStoreTypes.h"
 
-#import "MAPIStoreMapping.h"
 
 #include <talloc.h>
 
diff --git a/OpenChange/MAPIStoreMessage.h b/OpenChange/MAPIStoreMessage.h
index f914e543a..cc5f2ae1d 100644
--- a/OpenChange/MAPIStoreMessage.h
+++ b/OpenChange/MAPIStoreMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMESSAGE_H
 #define MAPISTOREMESSAGE_H
 
-#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSMutableArray;
@@ -35,7 +34,6 @@
 @class MAPIStoreAttachmentTable;
 @class MAPIStoreFolder;
 
-#import "MAPIStoreSOGoObject.h"
 
 @interface MAPIStoreMessage : MAPIStoreSOGoObject
 {
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index e6bda4578..0bf819c92 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -20,34 +20,12 @@
  * 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>
diff --git a/OpenChange/MAPIStoreMessageTable.h b/OpenChange/MAPIStoreMessageTable.h
index 9b1473325..2485d0593 100644
--- a/OpenChange/MAPIStoreMessageTable.h
+++ b/OpenChange/MAPIStoreMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREMESSAGETABLE_H
 #define MAPISTOREMESSAGETABLE_H
 
-#import "MAPIStoreTable.h"
 
 @interface MAPIStoreMessageTable : MAPIStoreTable
 
diff --git a/OpenChange/MAPIStoreMessageTable.m b/OpenChange/MAPIStoreMessageTable.m
index f978a5ea6..7bb625547 100644
--- a/OpenChange/MAPIStoreMessageTable.m
+++ b/OpenChange/MAPIStoreMessageTable.m
@@ -20,21 +20,13 @@
  * 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 0c2f58261..c686c7c74 100644
--- a/OpenChange/MAPIStoreNotesContext.h
+++ b/OpenChange/MAPIStoreNotesContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORENOTESCONTEXT_H
 #define MAPISTORENOTESCONTEXT_H
 
-#import "MAPIStoreDBBaseContext.h"
 
 @interface MAPIStoreNotesContext : MAPIStoreDBBaseContext
 
diff --git a/OpenChange/MAPIStoreNotesContext.m b/OpenChange/MAPIStoreNotesContext.m
index 725b0d158..febb79bb5 100644
--- a/OpenChange/MAPIStoreNotesContext.m
+++ b/OpenChange/MAPIStoreNotesContext.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
-#import "MAPIStoreNotesFolder.h"
-#import "MAPIStoreMapping.h"
 
-#import "MAPIStoreNotesContext.h"
 
 #undef DEBUG
 #include <mapistore/mapistore.h>
diff --git a/OpenChange/MAPIStoreNotesFolder.h b/OpenChange/MAPIStoreNotesFolder.h
index 4f049fb4f..9c3377fd0 100644
--- a/OpenChange/MAPIStoreNotesFolder.h
+++ b/OpenChange/MAPIStoreNotesFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORENOTESFOLDER_H
 #define MAPISTORENOTESFOLDER_H
 
-#import "MAPIStoreDBFolder.h"
 
 @interface MAPIStoreNotesFolder : MAPIStoreDBFolder
 @end
diff --git a/OpenChange/MAPIStoreNotesFolder.m b/OpenChange/MAPIStoreNotesFolder.m
index ae2652d88..edc4a7258 100644
--- a/OpenChange/MAPIStoreNotesFolder.m
+++ b/OpenChange/MAPIStoreNotesFolder.m
@@ -20,13 +20,10 @@
  * 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 08c1223d0..cc2f55ae0 100644
--- a/OpenChange/MAPIStoreNotesMessage.h
+++ b/OpenChange/MAPIStoreNotesMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORENOTESMESSAGE_H
 #define MAPISTORENOTESMESSAGE_H
 
-#import "MAPIStoreDBMessage.h"
 
 @interface MAPIStoreNotesMessage : MAPIStoreDBMessage
 @end
diff --git a/OpenChange/MAPIStoreNotesMessage.m b/OpenChange/MAPIStoreNotesMessage.m
index 52712277b..5b67b2dea 100644
--- a/OpenChange/MAPIStoreNotesMessage.m
+++ b/OpenChange/MAPIStoreNotesMessage.m
@@ -20,13 +20,10 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index c5a466ac3..74125a88d 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -25,7 +25,6 @@
 
 #include <talloc.h>
 
-#import <Foundation/NSObject.h>
 
 @class NSDate;
 @class NSData;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index ecb00dba3..59982389d 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -20,25 +20,13 @@
  * 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>
diff --git a/OpenChange/MAPIStoreObjectProxy.h b/OpenChange/MAPIStoreObjectProxy.h
index 6e9aee13e..3626ee9d3 100644
--- a/OpenChange/MAPIStoreObjectProxy.h
+++ b/OpenChange/MAPIStoreObjectProxy.h
@@ -25,7 +25,6 @@
 
 #include <talloc.h>
 
-#import <Foundation/NSObject.h>
 
 @interface MAPIStoreObjectProxy : NSObject
 {
diff --git a/OpenChange/MAPIStoreObjectProxy.m b/OpenChange/MAPIStoreObjectProxy.m
index 945d16167..9fabe7f44 100644
--- a/OpenChange/MAPIStoreObjectProxy.m
+++ b/OpenChange/MAPIStoreObjectProxy.m
@@ -20,10 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import "MAPIStorePropertySelectors.h"
 #import "NSString+MAPIStore.h"
 
-#import "MAPIStoreObjectProxy.h"
 
 #undef DEBUG
 #include <stdbool.h>
diff --git a/OpenChange/MAPIStorePermissionsTable.h b/OpenChange/MAPIStorePermissionsTable.h
index 3f951f50c..67e335018 100644
--- a/OpenChange/MAPIStorePermissionsTable.h
+++ b/OpenChange/MAPIStorePermissionsTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREPERMISSIONSTABLE_H
 #define MAPISTOREPERMISSIONSTABLE_H
 
-#import "MAPIStoreTable.h"
 
 struct ldb_context;
 
diff --git a/OpenChange/MAPIStorePermissionsTable.m b/OpenChange/MAPIStorePermissionsTable.m
index 76896836f..738881a60 100644
--- a/OpenChange/MAPIStorePermissionsTable.m
+++ b/OpenChange/MAPIStorePermissionsTable.m
@@ -20,21 +20,10 @@
  * 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>
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.h b/OpenChange/MAPIStoreRecurrenceUtils.h
index dbb2f0c19..082b05a79 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.h
+++ b/OpenChange/MAPIStoreRecurrenceUtils.h
@@ -25,9 +25,6 @@
 
 #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 90052474a..9fed0062f 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -20,25 +20,12 @@
  * 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>
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 0ec1d59bd..72427a407 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -22,28 +22,8 @@
 
 /* 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"
 
diff --git a/OpenChange/MAPIStoreSOGoObject.h b/OpenChange/MAPIStoreSOGoObject.h
index 411736718..54301ce12 100644
--- a/OpenChange/MAPIStoreSOGoObject.h
+++ b/OpenChange/MAPIStoreSOGoObject.h
@@ -25,7 +25,6 @@
 
 #include <talloc.h>
 
-#import "MAPIStoreObject.h"
 
 @class NSDate;
 @class NSData;
diff --git a/OpenChange/MAPIStoreSOGoObject.m b/OpenChange/MAPIStoreSOGoObject.m
index 7f1cc4b6a..c66233be1 100644
--- a/OpenChange/MAPIStoreSOGoObject.m
+++ b/OpenChange/MAPIStoreSOGoObject.m
@@ -20,26 +20,13 @@
  * 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>
diff --git a/OpenChange/MAPIStoreSamDBUtils.m b/OpenChange/MAPIStoreSamDBUtils.m
index f26d173c2..67b8010c4 100644
--- a/OpenChange/MAPIStoreSamDBUtils.m
+++ b/OpenChange/MAPIStoreSamDBUtils.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSData.h>
-#import <Foundation/NSString.h>
 #include <talloc.h>
 #include <ldb.h>
 #include <libmapiproxy.h>
@@ -29,7 +27,6 @@
 
 #import "NSData+MAPIStore.h"
 
-#import "MAPIStoreSamDBUtils.h"
 
 
 
diff --git a/OpenChange/MAPIStoreSharingMessage.h b/OpenChange/MAPIStoreSharingMessage.h
index 7db7f552f..451b9ae6e 100644
--- a/OpenChange/MAPIStoreSharingMessage.h
+++ b/OpenChange/MAPIStoreSharingMessage.h
@@ -23,8 +23,6 @@
 #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 e1e0e79da..668fcc8f2 100644
--- a/OpenChange/MAPIStoreSharingMessage.m
+++ b/OpenChange/MAPIStoreSharingMessage.m
@@ -22,21 +22,13 @@
 
 #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>
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 3b8270b6c..ae2771e63 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -20,22 +20,13 @@
  * 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>
diff --git a/OpenChange/MAPIStoreTasksContext.h b/OpenChange/MAPIStoreTasksContext.h
index 70d416130..306af4e02 100644
--- a/OpenChange/MAPIStoreTasksContext.h
+++ b/OpenChange/MAPIStoreTasksContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORETASKSCONTEXT_H
 #define MAPISTORETASKSCONTEXT_H
 
-#import "MAPIStoreGCSBaseContext.h"
 
 @interface MAPIStoreTasksContext : MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m
index 096ca3711..aff84eba6 100644
--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@@ -20,13 +20,8 @@
  * 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>
diff --git a/OpenChange/MAPIStoreTasksFolder.h b/OpenChange/MAPIStoreTasksFolder.h
index dc9b6791a..162b1a11d 100644
--- a/OpenChange/MAPIStoreTasksFolder.h
+++ b/OpenChange/MAPIStoreTasksFolder.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORETASKSFOLDER_H
 #define MAPISTORETASKSFOLDER_H
 
-#import "MAPIStoreGCSFolder.h"
 
 @interface MAPIStoreTasksFolder : MAPIStoreGCSFolder
 
diff --git a/OpenChange/MAPIStoreTasksFolder.m b/OpenChange/MAPIStoreTasksFolder.m
index 9bc76def1..92900e62d 100644
--- a/OpenChange/MAPIStoreTasksFolder.m
+++ b/OpenChange/MAPIStoreTasksFolder.m
@@ -20,24 +20,10 @@
  * 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>
diff --git a/OpenChange/MAPIStoreTasksMessage.h b/OpenChange/MAPIStoreTasksMessage.h
index 3130b72a5..7a99ec578 100644
--- a/OpenChange/MAPIStoreTasksMessage.h
+++ b/OpenChange/MAPIStoreTasksMessage.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORETASKSMESSAGE_H
 #define MAPISTORETASKSMESSAGE_H
 
-#import "MAPIStoreGCSMessage.h"
 
 @interface MAPIStoreTasksMessage : MAPIStoreGCSMessage
 
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index 12a348d4c..f9ce63b21 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -21,34 +21,15 @@
  * 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>
diff --git a/OpenChange/MAPIStoreTasksMessageTable.h b/OpenChange/MAPIStoreTasksMessageTable.h
index 4be570027..e7b7cf617 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.h
+++ b/OpenChange/MAPIStoreTasksMessageTable.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORETASKSMESSAGETABLE_H
 #define MAPISTORETASKSMESSAGETABLE_H
 
-#import "MAPIStoreGCSMessageTable.h"
 
 @interface MAPIStoreTasksMessageTable : MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreTasksMessageTable.m b/OpenChange/MAPIStoreTasksMessageTable.m
index b0f39341c..24be037af 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.m
+++ b/OpenChange/MAPIStoreTasksMessageTable.m
@@ -20,21 +20,14 @@
  * 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>
 
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index b12cab6a1..511d92e88 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORETYPES_H
 #define MAPISTORETYPES_H
 
-#import <Foundation/NSValue.h>
 
 #include <stdbool.h>
 #include <talloc.h>
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index eb3b499b3..6815dc89e 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -20,18 +20,11 @@
  * 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>
diff --git a/OpenChange/MAPIStoreUserContext.h b/OpenChange/MAPIStoreUserContext.h
index b8defd0cd..1da972794 100644
--- a/OpenChange/MAPIStoreUserContext.h
+++ b/OpenChange/MAPIStoreUserContext.h
@@ -23,7 +23,6 @@
 #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 de3dfadf1..6acd0183e 100644
--- a/OpenChange/MAPIStoreUserContext.m
+++ b/OpenChange/MAPIStoreUserContext.m
@@ -20,35 +20,15 @@
  * 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 a61bc4bc3..9b25fefb4 100644
--- a/OpenChange/NSArray+MAPIStore.h
+++ b/OpenChange/NSArray+MAPIStore.h
@@ -23,7 +23,6 @@
 #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 be54e9259..a43f7fc7d 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSValue.h>
 
 #import "NSDate+MAPIStore.h"
 #import "NSData+MAPIStore.h"
diff --git a/OpenChange/NSData+MAPIStore.h b/OpenChange/NSData+MAPIStore.h
index 13daa8aef..0c5f6dcec 100644
--- a/OpenChange/NSData+MAPIStore.h
+++ b/OpenChange/NSData+MAPIStore.h
@@ -23,7 +23,6 @@
 #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 5a2afeb1d..5d8760888 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -22,7 +22,6 @@
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import "MAPIStoreTypes.h"
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
diff --git a/OpenChange/NSDate+MAPIStore.h b/OpenChange/NSDate+MAPIStore.h
index d61df7b11..3470acf45 100644
--- a/OpenChange/NSDate+MAPIStore.h
+++ b/OpenChange/NSDate+MAPIStore.h
@@ -23,7 +23,6 @@
 #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 b8f09dcc6..7b05234cc 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -20,11 +20,7 @@
  * 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
diff --git a/OpenChange/NSObject+MAPIStore.h b/OpenChange/NSObject+MAPIStore.h
index ff5bed57d..9d4fa0cd4 100644
--- a/OpenChange/NSObject+MAPIStore.h
+++ b/OpenChange/NSObject+MAPIStore.h
@@ -23,7 +23,6 @@
 #ifndef NSOBJECT_MAPISTORE_H
 #define NSOBJECT_MAPISTORE_H
 
-#import <Foundation/NSObject.h>
 
 #include <talloc.h>
 #include <mapistore/mapistore_errors.h>
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index 9ed02b7ab..496455fc0 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -20,13 +20,8 @@
  * 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"
diff --git a/OpenChange/NSObject+PropertyList.h b/OpenChange/NSObject+PropertyList.h
index 34ea28ea8..272b73180 100644
--- a/OpenChange/NSObject+PropertyList.h
+++ b/OpenChange/NSObject+PropertyList.h
@@ -30,9 +30,6 @@
 #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 164ac5054..90b352afa 100644
--- a/OpenChange/NSObject+PropertyList.m
+++ b/OpenChange/NSObject+PropertyList.m
@@ -21,17 +21,8 @@
 /* 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 e5006c2ae..68325c1ec 100644
--- a/OpenChange/NSString+MAPIStore.h
+++ b/OpenChange/NSString+MAPIStore.h
@@ -23,7 +23,6 @@
 #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 83ca8d6e6..0b815b2f6 100644
--- a/OpenChange/NSString+MAPIStore.m
+++ b/OpenChange/NSString+MAPIStore.m
@@ -23,7 +23,6 @@
 #include <talloc.h>
 #include <stdbool.h>
 
-#import <Foundation/NSData.h>
 
 #import "NSString+MAPIStore.h"
 
diff --git a/OpenChange/NSValue+MAPIStore.h b/OpenChange/NSValue+MAPIStore.h
index da0b2aa41..28c770d6e 100644
--- a/OpenChange/NSValue+MAPIStore.h
+++ b/OpenChange/NSValue+MAPIStore.h
@@ -23,7 +23,6 @@
 #ifndef NSVALUE_MAPISTORE_H
 #define NSVALUE_MAPISTORE_H
 
-#import <Foundation/NSValue.h>
 
 @interface NSNumber (MAPIStoreDataTypes)
 
diff --git a/OpenChange/SOGoCacheGCSObject+MAPIStore.m b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
index 679bee089..935abfc14 100644
--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.m
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
@@ -18,9 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #include "MAPIStoreTypes.h"
 
diff --git a/OpenChange/SOGoMAPIDBMessage.h b/OpenChange/SOGoMAPIDBMessage.h
index 4211988f6..a604a64c0 100644
--- a/OpenChange/SOGoMAPIDBMessage.h
+++ b/OpenChange/SOGoMAPIDBMessage.h
@@ -21,7 +21,6 @@
 #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 343b90334..3b35735d0 100644
--- a/OpenChange/SOGoMAPIDBMessage.m
+++ b/OpenChange/SOGoMAPIDBMessage.m
@@ -20,19 +20,10 @@
  * 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 86ac76f20..11c85fa7f 100644
--- a/OpenChange/code-MAPIStorePropertySelectors.m
+++ b/OpenChange/code-MAPIStorePropertySelectors.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSMapTable.h>
-#import <NGExtensions/NGLogger.h>
 
 #undef DEBUG
 #include <mapistore/mapistore.h>
diff --git a/OpenChange/dbmsgreader.m b/OpenChange/dbmsgreader.m
index 5ad74b82b..678794bdf 100644
--- a/OpenChange/dbmsgreader.m
+++ b/OpenChange/dbmsgreader.m
@@ -23,22 +23,9 @@
 /* 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 198526687..252badbac 100644
--- a/OpenChange/iCalEvent+MAPIStore.h
+++ b/OpenChange/iCalEvent+MAPIStore.h
@@ -25,7 +25,6 @@
 
 #include <talloc.h>
 
-#import <NGCards/iCalEvent.h>
 
 @class MAPIStoreUserContext;
 @class NSDictionary;
diff --git a/OpenChange/iCalEvent+MAPIStore.m b/OpenChange/iCalEvent+MAPIStore.m
index 25877029b..f8cca8f33 100644
--- a/OpenChange/iCalEvent+MAPIStore.m
+++ b/OpenChange/iCalEvent+MAPIStore.m
@@ -22,44 +22,17 @@
 
 #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>
diff --git a/OpenChange/iCalTimeZone+MAPIStore.h b/OpenChange/iCalTimeZone+MAPIStore.h
index 25817392a..f4adfd8f1 100644
--- a/OpenChange/iCalTimeZone+MAPIStore.h
+++ b/OpenChange/iCalTimeZone+MAPIStore.h
@@ -23,7 +23,6 @@
 #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 7cf380fdf..c13b017dc 100644
--- a/OpenChange/iCalTimeZone+MAPIStore.m
+++ b/OpenChange/iCalTimeZone+MAPIStore.m
@@ -20,14 +20,6 @@
  * 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"
@@ -40,7 +32,6 @@
 #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 69d0cd099..63669b0e2 100644
--- a/OpenChange/plreader.m
+++ b/OpenChange/plreader.m
@@ -23,9 +23,6 @@
 /* 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"
 
diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m
index 9c1940058..069ad5d86 100644
--- a/SOPE/GDLContentStore/EOQualifier+GCS.m
+++ b/SOPE/GDLContentStore/EOQualifier+GCS.m
@@ -20,7 +20,6 @@
 */
 
 #import <Foundation/NSValue.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SOPE/GDLContentStore/GCSAlarmsFolder.h b/SOPE/GDLContentStore/GCSAlarmsFolder.h
index 5c88a835f..bd2c15cee 100644
--- a/SOPE/GDLContentStore/GCSAlarmsFolder.h
+++ b/SOPE/GDLContentStore/GCSAlarmsFolder.h
@@ -23,7 +23,6 @@
 #ifndef GCSALARMSFOLDER_H
 #define GCSALARMSFOLDER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSCalendarDate;
 @class NSException;
diff --git a/SOPE/GDLContentStore/GCSAlarmsFolder.m b/SOPE/GDLContentStore/GCSAlarmsFolder.m
index 2140ba7da..911158bbd 100644
--- a/SOPE/GDLContentStore/GCSAlarmsFolder.m
+++ b/SOPE/GDLContentStore/GCSAlarmsFolder.m
@@ -18,16 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 
-#import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLAccess/EOAttribute.h>
 #import <GDLAccess/EOEntity.h>
@@ -37,7 +31,6 @@
 #import "GCSChannelManager.h"
 #import "GCSFolderManager.h"
 #import "GCSSpecialQueries.h"
-#import "GCSStringFormatter.h"
 #import "NSURL+GCS.h"
 
 #import "GCSAlarmsFolder.h"
diff --git a/SOPE/GDLContentStore/GCSChannelManager.h b/SOPE/GDLContentStore/GCSChannelManager.h
index 930c89e31..4e9c64d6b 100644
--- a/SOPE/GDLContentStore/GCSChannelManager.h
+++ b/SOPE/GDLContentStore/GCSChannelManager.h
@@ -22,7 +22,6 @@
 #ifndef __GDLContentStore_GCSChannelManager_H__
 #define __GDLContentStore_GCSChannelManager_H__
 
-#import <Foundation/NSObject.h>
 
 /*
   GCSChannelManager
diff --git a/SOPE/GDLContentStore/GCSChannelManager.m b/SOPE/GDLContentStore/GCSChannelManager.m
index 360901e97..fe8620b17 100644
--- a/SOPE/GDLContentStore/GCSChannelManager.m
+++ b/SOPE/GDLContentStore/GCSChannelManager.m
@@ -22,8 +22,6 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSLock.h>
 #import <Foundation/NSTimer.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
@@ -33,7 +31,6 @@
 
 #import <GDLAccess/EOAdaptor.h>
 #import <GDLAccess/EOAdaptorContext.h>
-#import <GDLAccess/EOAdaptorChannel.h>
 
 #import "GCSChannelManager.h"
 #import "NSURL+GCS.h"
diff --git a/SOPE/GDLContentStore/GCSFieldInfo.h b/SOPE/GDLContentStore/GCSFieldInfo.h
index 4f87f0902..3f7119064 100644
--- a/SOPE/GDLContentStore/GCSFieldInfo.h
+++ b/SOPE/GDLContentStore/GCSFieldInfo.h
@@ -22,7 +22,6 @@
 #ifndef __GDLContentStore_GCSFieldInfo_H__
 #define __GDLContentStore_GCSFieldInfo_H__
 
-#import <Foundation/NSObject.h>
 
 /*
   GCSFieldInfo
diff --git a/SOPE/GDLContentStore/GCSFieldInfo.m b/SOPE/GDLContentStore/GCSFieldInfo.m
index 41d476c20..59a607661 100644
--- a/SOPE/GDLContentStore/GCSFieldInfo.m
+++ b/SOPE/GDLContentStore/GCSFieldInfo.m
@@ -21,7 +21,6 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SOPE/GDLContentStore/GCSFolder.h b/SOPE/GDLContentStore/GCSFolder.h
index 296933b2c..1d9627b47 100644
--- a/SOPE/GDLContentStore/GCSFolder.h
+++ b/SOPE/GDLContentStore/GCSFolder.h
@@ -23,7 +23,6 @@
 #ifndef __GDLContentStore_GCSFolder_H__
 #define __GDLContentStore_GCSFolder_H__
 
-#import <Foundation/NSObject.h>
 
 /*
   GCSFolder
diff --git a/SOPE/GDLContentStore/GCSFolderManager.h b/SOPE/GDLContentStore/GCSFolderManager.h
index 3f4ca95c3..bbe17c2c1 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.h
+++ b/SOPE/GDLContentStore/GCSFolderManager.h
@@ -22,7 +22,6 @@
 #ifndef __GDLContentStore_GCSFolderManager_H__
 #define __GDLContentStore_GCSFolderManager_H__
 
-#import <Foundation/NSObject.h>
 
 /*
   GCSFolderManager
diff --git a/SOPE/GDLContentStore/GCSFolderManager.m b/SOPE/GDLContentStore/GCSFolderManager.m
index 91c59c268..0fb2946ff 100644
--- a/SOPE/GDLContentStore/GCSFolderManager.m
+++ b/SOPE/GDLContentStore/GCSFolderManager.m
@@ -24,19 +24,14 @@
 #import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSLock.h>
 #import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 #import <NGExtensions/NGResourceLocator.h>
-#import <unistd.h>
 
 #import "GCSChannelManager.h"
 #import "EOAdaptorChannel+GCS.h"
diff --git a/SOPE/GDLContentStore/GCSFolderType.h b/SOPE/GDLContentStore/GCSFolderType.h
index 5784780bd..dbfa4bc6e 100644
--- a/SOPE/GDLContentStore/GCSFolderType.h
+++ b/SOPE/GDLContentStore/GCSFolderType.h
@@ -36,7 +36,6 @@
         route later, we can still do it :-)
 */
 
-#import <Foundation/NSObject.h>
 
 @class NSString, NSArray, NSDictionary;
 @class EOQualifier;
diff --git a/SOPE/GDLContentStore/GCSFolderType.m b/SOPE/GDLContentStore/GCSFolderType.m
index e26c988dd..a4de5832b 100644
--- a/SOPE/GDLContentStore/GCSFolderType.m
+++ b/SOPE/GDLContentStore/GCSFolderType.m
@@ -22,7 +22,6 @@
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSKeyValueCoding.h>
 #import <Foundation/NSSet.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -30,7 +29,6 @@
 
 #import <EOControl/EOQualifier.h>
 
-#import <EOControl/EOKeyValueCoding.h>
 #import <NGExtensions/NGResourceLocator.h>
 
 #import "GCSFolderType.h"
diff --git a/SOPE/GDLContentStore/GCSSessionsFolder.h b/SOPE/GDLContentStore/GCSSessionsFolder.h
index 5d0b86c55..a861e1d9e 100644
--- a/SOPE/GDLContentStore/GCSSessionsFolder.h
+++ b/SOPE/GDLContentStore/GCSSessionsFolder.h
@@ -23,7 +23,6 @@
 #ifndef GCSSESSIONSFOLDER_H
 #define GCSSESSIONSFOLDER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSCalendarDate;
 @class NSException;
diff --git a/SOPE/GDLContentStore/GCSSessionsFolder.m b/SOPE/GDLContentStore/GCSSessionsFolder.m
index 3d99776a6..734a7b692 100644
--- a/SOPE/GDLContentStore/GCSSessionsFolder.m
+++ b/SOPE/GDLContentStore/GCSSessionsFolder.m
@@ -20,16 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 
-#import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLAccess/EOAttribute.h>
 #import <GDLAccess/EOEntity.h>
@@ -39,7 +33,6 @@
 #import "GCSChannelManager.h"
 #import "GCSFolderManager.h"
 #import "GCSSpecialQueries.h"
-#import "GCSStringFormatter.h"
 #import "NSURL+GCS.h"
 
 #import "GCSSessionsFolder.h"
diff --git a/SOPE/GDLContentStore/GCSSpecialQueries.h b/SOPE/GDLContentStore/GCSSpecialQueries.h
index 62fa30b2f..9950a5669 100644
--- a/SOPE/GDLContentStore/GCSSpecialQueries.h
+++ b/SOPE/GDLContentStore/GCSSpecialQueries.h
@@ -23,7 +23,6 @@
 #ifndef GCSSPECIALQUERIES_H
 #define GCSSPECIALQUERIES_H
 
-#import <Foundation/NSObject.h>
 
 #import <GDLAccess/EOAdaptorChannel.h>
 
diff --git a/SOPE/GDLContentStore/GCSSpecialQueries.m b/SOPE/GDLContentStore/GCSSpecialQueries.m
index 95ab3f814..2fa04ac37 100644
--- a/SOPE/GDLContentStore/GCSSpecialQueries.m
+++ b/SOPE/GDLContentStore/GCSSpecialQueries.m
@@ -21,7 +21,6 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index ce410e1bc..96d158b44 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -18,11 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSRange.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -32,7 +27,6 @@
 #import "NSDictionary+NGCards.h"
 #import "CardVersitRenderer.h"
 
-#import "CardElement.h"
 #import "CardGroup.h"
 
 @implementation CardElement
diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m
index 301cfb2b8..7a659a1db 100644
--- a/SOPE/NGCards/CardGroup.m
+++ b/SOPE/NGCards/CardGroup.m
@@ -20,11 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
-#import <SaxObjC/SaxXMLReader.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 
 #import "NGCardsSaxHandler.h"
diff --git a/SOPE/NGCards/CardVersitRenderer.m b/SOPE/NGCards/CardVersitRenderer.m
index db46bbd35..997935e28 100644
--- a/SOPE/NGCards/CardVersitRenderer.m
+++ b/SOPE/NGCards/CardVersitRenderer.m
@@ -21,13 +21,9 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import "CardElement.h"
 #import "CardGroup.h"
 
 #import "NSString+NGCards.h"
diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m
index 1ff018f3a..467f9377e 100644
--- a/SOPE/NGCards/IcalElements.m
+++ b/SOPE/NGCards/IcalElements.m
@@ -19,14 +19,7 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
-#import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WODynamicElement.h>
-#import <NGObjWeb/WOResponse.h>
 
 @interface IcalComponent : WODynamicElement
 {
diff --git a/SOPE/NGCards/IcalResponse.h b/SOPE/NGCards/IcalResponse.h
index 1b2e2580c..f63b36904 100644
--- a/SOPE/NGCards/IcalResponse.h
+++ b/SOPE/NGCards/IcalResponse.h
@@ -22,7 +22,6 @@
 #ifndef __SkyDaemon_skyaptd_IcalResponse_H__
 #define __SkyDaemon_skyaptd_IcalResponse_H__
 
-#import <Foundation/NSObject.h>
 
 @class NSMutableString, NSData;
 
diff --git a/SOPE/NGCards/IcalResponse.m b/SOPE/NGCards/IcalResponse.m
index 0caddae52..64c546620 100644
--- a/SOPE/NGCards/IcalResponse.m
+++ b/SOPE/NGCards/IcalResponse.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import "IcalResponse.h"
 
 @implementation IcalResponse
 
diff --git a/SOPE/NGCards/NGCards.h b/SOPE/NGCards/NGCards.h
index f58f9a886..a020c3196 100644
--- a/SOPE/NGCards/NGCards.h
+++ b/SOPE/NGCards/NGCards.h
@@ -22,23 +22,9 @@
 #ifndef __NGCards_H__
 #define __NGCards_H__
 
-#import <NGCards/iCalAttachment.h>
-#import <NGCards/iCalObject.h>
-#import <NGCards/iCalEntityObject.h>
-#import <NGCards/iCalRepeatableEntityObject.h>
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalToDo.h>
-#import <NGCards/iCalJournal.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalFreeBusy.h>
 #import <NGCards/iCalPerson.h>
-#import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalTrigger.h>
 
-#import <NGCards/iCalEventChanges.h>
 
-#import <NGCards/iCalRecurrenceRule.h>
-#import <NGCards/iCalRecurrenceCalculator.h>
 
 #import <NGCards/NSCalendarDate+ICal.h>
 
diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index a70255863..6c68170f3 100644
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@@ -19,11 +19,8 @@
   02111-1307, USA.
 */
 
-#import <string.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import "NSString+NGCards.h"
 #import "NGCardsSaxHandler.h"
diff --git a/SOPE/NGCards/NGVCard.m b/SOPE/NGCards/NGVCard.m
index 5f8028aa5..36eaa4135 100644
--- a/SOPE/NGCards/NGVCard.m
+++ b/SOPE/NGCards/NGVCard.m
@@ -19,10 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import "NSArray+NGCards.h"
 #import "NSString+NGCards.h"
diff --git a/SOPE/NGCards/NGVCardPhoto.m b/SOPE/NGCards/NGVCardPhoto.m
index 427d50389..fcd15aabe 100644
--- a/SOPE/NGCards/NGVCardPhoto.m
+++ b/SOPE/NGCards/NGVCardPhoto.m
@@ -22,7 +22,6 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SOPE/NGCards/NGVList.h b/SOPE/NGCards/NGVList.h
index 9c11b7d57..9bd10c5e9 100644
--- a/SOPE/NGCards/NGVList.h
+++ b/SOPE/NGCards/NGVList.h
@@ -23,7 +23,6 @@
 #ifndef NGVLIST_H
 #define NGVLIST_H
 
-#import "CardGroup.h"
 
 #import "NGVCard.h"
 
diff --git a/SOPE/NGCards/NGVList.m b/SOPE/NGCards/NGVList.m
index fc9d927b1..d69bb9464 100644
--- a/SOPE/NGCards/NGVList.m
+++ b/SOPE/NGCards/NGVList.m
@@ -21,9 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
-#import <Foundation/NSDictionary.h>
 
 #import "NGVCardReference.h"
 
diff --git a/SOPE/NGCards/NSArray+NGCards.m b/SOPE/NGCards/NSArray+NGCards.m
index 84ff07e38..25dd5cab5 100644
--- a/SOPE/NGCards/NSArray+NGCards.m
+++ b/SOPE/NGCards/NSArray+NGCards.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import "CardElement.h"
 #import "NSString+NGCards.h"
diff --git a/SOPE/NGCards/NSCalendarDate+ICal.m b/SOPE/NGCards/NSCalendarDate+ICal.m
index 4e6d529b6..4c491d109 100644
--- a/SOPE/NGCards/NSCalendarDate+ICal.m
+++ b/SOPE/NGCards/NSCalendarDate+ICal.m
@@ -22,7 +22,6 @@
 #warning this module should be cleaned up and \
   merged with NSCalendarDate+NGCards
 
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
diff --git a/SOPE/NGCards/NSCalendarDate+NGCards.h b/SOPE/NGCards/NSCalendarDate+NGCards.h
index 514339206..24eb04a5c 100644
--- a/SOPE/NGCards/NSCalendarDate+NGCards.h
+++ b/SOPE/NGCards/NSCalendarDate+NGCards.h
@@ -23,10 +23,8 @@
 #ifndef NSDATE_NGCARDS_H
 #define NSDATE_NGCARDS_H
 
-#import <Foundation/NSDate.h>
 #import <Foundation/NSCalendarDate.h>
 
-#import "CardElement.h"
 
 @interface NSDate (NGCardsExtensions)
 
diff --git a/SOPE/NGCards/NSCalendarDate+NGCards.m b/SOPE/NGCards/NSCalendarDate+NGCards.m
index f70a12f42..e64438363 100644
--- a/SOPE/NGCards/NSCalendarDate+NGCards.m
+++ b/SOPE/NGCards/NSCalendarDate+NGCards.m
@@ -20,9 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
-#import "CardElement.h"
 
 #import "NSCalendarDate+NGCards.h"
 #import "NSString+NGCards.h"
diff --git a/SOPE/NGCards/NSDictionary+NGCards.m b/SOPE/NGCards/NSDictionary+NGCards.m
index 109db067c..c0e57ace7 100644
--- a/SOPE/NGCards/NSDictionary+NGCards.m
+++ b/SOPE/NGCards/NSDictionary+NGCards.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import "NSArray+NGCards.h"
 #import "NSString+NGCards.h"
diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m
index 02c1c3d0b..0006411c1 100644
--- a/SOPE/NGCards/NSString+NGCards.m
+++ b/SOPE/NGCards/NSString+NGCards.m
@@ -23,13 +23,10 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSRange.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <ctype.h>
 
 #import "NSString+NGCards.h"
 
diff --git a/SOPE/NGCards/iCalAlarm.m b/SOPE/NGCards/iCalAlarm.m
index af8529df7..c6646ff49 100644
--- a/SOPE/NGCards/iCalAlarm.m
+++ b/SOPE/NGCards/iCalAlarm.m
@@ -20,7 +20,6 @@
 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
diff --git a/SOPE/NGCards/iCalByDayMask.h b/SOPE/NGCards/iCalByDayMask.h
index f5a1e11bb..e0d3fec48 100644
--- a/SOPE/NGCards/iCalByDayMask.h
+++ b/SOPE/NGCards/iCalByDayMask.h
@@ -21,7 +21,6 @@
 #ifndef ICALBYDAYMASK_H
 #define ICALBYDAYMASK_H
 
-#import <Foundation/NSObject.h>
 
 #import "iCalRecurrenceRule.h"
 
diff --git a/SOPE/NGCards/iCalByDayMask.m b/SOPE/NGCards/iCalByDayMask.m
index fd3fbf022..427846fa4 100644
--- a/SOPE/NGCards/iCalByDayMask.m
+++ b/SOPE/NGCards/iCalByDayMask.m
@@ -20,13 +20,10 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import "iCalByDayMask.h"
 
-#import <ctype.h>
-#import <math.h>
 
 @interface iCalByDayMask (PrivateAPI)
 
diff --git a/SOPE/NGCards/iCalCalendar.m b/SOPE/NGCards/iCalCalendar.m
index 09f629cf1..1eab53ecd 100644
--- a/SOPE/NGCards/iCalCalendar.m
+++ b/SOPE/NGCards/iCalCalendar.m
@@ -26,7 +26,6 @@
 #import "iCalToDo.h"
 #import "iCalJournal.h"
 #import "iCalFreeBusy.h"
-#import "iCalEntityObject.h"
 #import "iCalTimeZone.h"
 
 #import "iCalCalendar.h"
diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
index 04106dab4..79b73ca16 100644
--- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
@@ -20,8 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSDate.h>
-#import <Foundation/NSArray.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NGCalendarDateRange.h>
@@ -29,7 +27,6 @@
 #import "NSCalendarDate+ICal.h"
 
 #import "iCalRecurrenceCalculator.h"
-#import "iCalRecurrenceRule.h"
 #import "iCalByDayMask.h"
 
 @interface iCalDailyRecurrenceCalculator : iCalRecurrenceCalculator
diff --git a/SOPE/NGCards/iCalDataSource.h b/SOPE/NGCards/iCalDataSource.h
index 770987bbb..b6ee99611 100644
--- a/SOPE/NGCards/iCalDataSource.h
+++ b/SOPE/NGCards/iCalDataSource.h
@@ -22,7 +22,6 @@
 #ifndef __NGiCal_iCalDataSource_H__
 #define __NGiCal_iCalDataSource_H__
 
-#import <EOControl/EODataSource.h>
 
 @class NSString, NSURL;
 @class EOFetchSpecification;
diff --git a/SOPE/NGCards/iCalDataSource.m b/SOPE/NGCards/iCalDataSource.m
index 2bf9891c2..e73782214 100644
--- a/SOPE/NGCards/iCalDataSource.m
+++ b/SOPE/NGCards/iCalDataSource.m
@@ -19,11 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSObject.h>
-#import <Foundation/NSURL.h>
 
 #import <EOControl/EOClassDescription.h>
 #import <EOControl/EOFetchSpecification.h>
diff --git a/SOPE/NGCards/iCalDateTime.m b/SOPE/NGCards/iCalDateTime.m
index 1cfa782d5..8525d033d 100644
--- a/SOPE/NGCards/iCalDateTime.m
+++ b/SOPE/NGCards/iCalDateTime.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SOPE/NGCards/iCalEntityObject.m b/SOPE/NGCards/iCalEntityObject.m
index 3e3034e6a..02456866e 100644
--- a/SOPE/NGCards/iCalEntityObject.m
+++ b/SOPE/NGCards/iCalEntityObject.m
@@ -20,7 +20,6 @@
 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
@@ -29,7 +28,6 @@
 #import "iCalAlarm.h"
 #import "iCalCalendar.h"
 #import "iCalDateTime.h"
-#import "iCalEntityObject.h"
 #import "iCalEvent.h"
 #import "iCalPerson.h"
 
diff --git a/SOPE/NGCards/iCalEvent.m b/SOPE/NGCards/iCalEvent.m
index 6af644a3a..7d39064dc 100644
--- a/SOPE/NGCards/iCalEvent.m
+++ b/SOPE/NGCards/iCalEvent.m
@@ -29,8 +29,6 @@
 
 #import "iCalEventChanges.h"
 #import "iCalDateTime.h"
-#import "iCalRecurrenceRule.h"
-#import "iCalRecurrenceCalculator.h"
 
 #import "iCalEvent.h"
 
diff --git a/SOPE/NGCards/iCalEventChanges.h b/SOPE/NGCards/iCalEventChanges.h
index eb421fba9..7bb50893f 100644
--- a/SOPE/NGCards/iCalEventChanges.h
+++ b/SOPE/NGCards/iCalEventChanges.h
@@ -23,7 +23,6 @@
 #ifndef	__NGiCal_iCalEventChanges_H_
 #define	__NGiCal_iCalEventChanges_H_
 
-#import <Foundation/NSObject.h>
 
 @class iCalEvent, NSArray, NSMutableArray;
 
diff --git a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
index 0694cc6c2..f21478b10 100644
--- a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
@@ -21,7 +21,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSString.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 
 #import "iCalRecurrenceCalculator.h"
@@ -30,11 +29,9 @@
 @end
 
 #import <NGExtensions/NGCalendarDateRange.h>
-#import "iCalRecurrenceRule.h"
 #import "iCalByDayMask.h"
 #import "NSCalendarDate+ICal.h"
 
-#import <string.h>
 
 @interface iCalRecurrenceCalculator (PrivateAPI)
 
diff --git a/SOPE/NGCards/iCalObject.h b/SOPE/NGCards/iCalObject.h
index 5369d0e1d..bdc2c4c74 100644
--- a/SOPE/NGCards/iCalObject.h
+++ b/SOPE/NGCards/iCalObject.h
@@ -24,8 +24,6 @@
 #ifndef __NGiCal_iCalObject_H__
 #define __NGiCal_iCalObject_H__
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSDate.h>
 
 /*
   iCalObject
diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.h b/SOPE/NGCards/iCalRecurrenceCalculator.h
index 6dc92a83a..18a937212 100644
--- a/SOPE/NGCards/iCalRecurrenceCalculator.h
+++ b/SOPE/NGCards/iCalRecurrenceCalculator.h
@@ -22,7 +22,6 @@
 #ifndef	__NGiCal_iCalRecurrenceCalculator_H_
 #define	__NGiCal_iCalRecurrenceCalculator_H_
 
-#import <Foundation/NSObject.h>
 
 /*
   iCalRecurrenceCalculator
diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.m b/SOPE/NGCards/iCalRecurrenceCalculator.m
index eebaa6dfb..a8fbd8592 100644
--- a/SOPE/NGCards/iCalRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalRecurrenceCalculator.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSEnumerator.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NGCalendarDateRange.h>
diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m
index 158c2fff2..da20348d8 100644
--- a/SOPE/NGCards/iCalRecurrenceRule.m
+++ b/SOPE/NGCards/iCalRecurrenceRule.m
@@ -184,12 +184,9 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
 #import <NGExtensions/NSString+Ext.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <ctype.h>
 
 #import "NSCalendarDate+ICal.h"
 #import "NSCalendarDate+NGCards.h"
@@ -197,7 +194,6 @@
 
 #import "CardGroup.h"
 #import "iCalByDayMask.h"
-#import "iCalRecurrenceRule.h"
 
 NSString *iCalWeekDayString[] = { @"SU", @"MO", @"TU", @"WE", @"TH", @"FR",
 				  @"SA" };
diff --git a/SOPE/NGCards/iCalRepeatableEntityObject.m b/SOPE/NGCards/iCalRepeatableEntityObject.m
index 4f201307f..e85b7093d 100644
--- a/SOPE/NGCards/iCalRepeatableEntityObject.m
+++ b/SOPE/NGCards/iCalRepeatableEntityObject.m
@@ -20,10 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGExtensions/NGCalendarDateRange.h>
@@ -33,10 +29,8 @@
 #import "iCalDateTime.h"
 #import "iCalEvent.h"
 #import "iCalTimeZone.h"
-#import "iCalTimeZonePeriod.h"
 #import "iCalRecurrenceRule.h"
 #import "iCalRecurrenceCalculator.h"
-#import "iCalRepeatableEntityObject.h"
 
 @implementation iCalRepeatableEntityObject
 
diff --git a/SOPE/NGCards/iCalTimeZone.m b/SOPE/NGCards/iCalTimeZone.m
index 327733ed3..25239f016 100644
--- a/SOPE/NGCards/iCalTimeZone.m
+++ b/SOPE/NGCards/iCalTimeZone.m
@@ -19,13 +19,9 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSPathUtilities.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import "NSCalendarDate+NGCards.h"
diff --git a/SOPE/NGCards/iCalTimeZonePeriod.m b/SOPE/NGCards/iCalTimeZonePeriod.m
index be0d53da3..23d56ba8e 100644
--- a/SOPE/NGCards/iCalTimeZonePeriod.m
+++ b/SOPE/NGCards/iCalTimeZonePeriod.m
@@ -24,7 +24,6 @@
 #import <Foundation/NSTimeZone.h>
 
 #import "iCalDateTime.h"
-#import "iCalRecurrenceRule.h"
 #import "iCalByDayMask.h"
 #import "iCalUTCOffset.h"
 
diff --git a/SOPE/NGCards/iCalTrigger.m b/SOPE/NGCards/iCalTrigger.m
index d40c518b5..6bce26a86 100644
--- a/SOPE/NGCards/iCalTrigger.m
+++ b/SOPE/NGCards/iCalTrigger.m
@@ -21,7 +21,6 @@
 
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import "iCalEvent.h"
diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
index ad2812e15..e646bfbcf 100644
--- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
@@ -28,7 +28,6 @@
 @end
 
 #import <NGExtensions/NGCalendarDateRange.h>
-#import "iCalRecurrenceRule.h"
 #import "iCalByDayMask.h"
 #import "NSCalendarDate+ICal.h"
 
diff --git a/SOPE/NGCards/iCalXMLRenderer.h b/SOPE/NGCards/iCalXMLRenderer.h
index c19ac4f29..baf8f11d5 100644
--- a/SOPE/NGCards/iCalXMLRenderer.h
+++ b/SOPE/NGCards/iCalXMLRenderer.h
@@ -23,7 +23,6 @@
 #ifndef ICALXMLRENDERER_H
 #define ICALXMLRENDERER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSMutableString;
 @class NSString;
diff --git a/SOPE/NGCards/iCalXMLRenderer.m b/SOPE/NGCards/iCalXMLRenderer.m
index 193b3468c..775351839 100644
--- a/SOPE/NGCards/iCalXMLRenderer.m
+++ b/SOPE/NGCards/iCalXMLRenderer.m
@@ -24,19 +24,14 @@
    http://tools.ietf.org/html/rfc6321 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 
-#import "CardElement.h"
-#import "CardGroup.h"
 #import "iCalCalendar.h"
 #import "iCalDateTime.h"
 #import "iCalPerson.h"
-#import "iCalRecurrenceRule.h"
 #import "iCalUTCOffset.h"
 
 #import "iCalXMLRenderer.h"
diff --git a/SOPE/NGCards/samples/common.h b/SOPE/NGCards/samples/common.h
index 98f27bd55..f6c9fdd05 100644
--- a/SOPE/NGCards/samples/common.h
+++ b/SOPE/NGCards/samples/common.h
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
 #  include <Foundation/exceptions/GeneralExceptions.h>
diff --git a/SOPE/NGCards/samples/icalds.m b/SOPE/NGCards/samples/icalds.m
index 1ae3106b3..05fc9b48c 100644
--- a/SOPE/NGCards/samples/icalds.m
+++ b/SOPE/NGCards/samples/icalds.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/Foundation.h>
 
 @class EOQualifier, NSString, EOSortOrdering;
 
diff --git a/SOPE/NGCards/samples/icalparsetest.m b/SOPE/NGCards/samples/icalparsetest.m
index c00f6601b..984f14dbc 100644
--- a/SOPE/NGCards/samples/icalparsetest.m
+++ b/SOPE/NGCards/samples/icalparsetest.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/Foundation.h>
 #include <SaxObjC/SaxObjC.h>
 
 @interface iCal2Tool : NSObject
diff --git a/SOPE/NGCards/samples/unittest.h b/SOPE/NGCards/samples/unittest.h
index a34db76e1..3a0493694 100644
--- a/SOPE/NGCards/samples/unittest.h
+++ b/SOPE/NGCards/samples/unittest.h
@@ -23,7 +23,6 @@
 #ifndef UNITTEST_H
 #define UNITTEST_H
 
-#import <Foundation/NSObject.h>
 
 @interface unittest : NSObject
 
diff --git a/SOPE/NGCards/samples/unittest.m b/SOPE/NGCards/samples/unittest.m
index f9725a055..6757d71d2 100644
--- a/SOPE/NGCards/samples/unittest.m
+++ b/SOPE/NGCards/samples/unittest.m
@@ -20,10 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
-#import "unittest.h"
 
 @implementation unittest
 
diff --git a/SOPE/NGCards/samples/vcardtest.m b/SOPE/NGCards/samples/vcardtest.m
index 5306658ba..61ad33a81 100644
--- a/SOPE/NGCards/samples/vcardtest.m
+++ b/SOPE/NGCards/samples/vcardtest.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/Foundation.h>
 
-#import "CardElement.h"
-#import "CardGroup.h"
 
-#import "unittest.h"
 
 @interface subtest: unittest
 {
diff --git a/SOPE/NGCards/samples/vcf2xml.m b/SOPE/NGCards/samples/vcf2xml.m
index 31d61f026..9c341c44e 100644
--- a/SOPE/NGCards/samples/vcf2xml.m
+++ b/SOPE/NGCards/samples/vcf2xml.m
@@ -21,7 +21,6 @@
 
 // Note: this does not yet produce valid XML output
 
-#import <Foundation/NSObject.h>
 #include <SaxObjC/SaxObjC.h>
 
 @interface vcf2xml : NSObject
diff --git a/SOPE/NGCards/samples/vcfparsetest.m b/SOPE/NGCards/samples/vcfparsetest.m
index 8b8460572..40523f204 100644
--- a/SOPE/NGCards/samples/vcfparsetest.m
+++ b/SOPE/NGCards/samples/vcfparsetest.m
@@ -19,8 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/Foundation.h>
-#import <NGCards/NGVCard.h>
 
 @interface vcsparsetest : NSObject
 {
diff --git a/SOPE/NGCards/samples/versittest.m b/SOPE/NGCards/samples/versittest.m
index 3d9f81b6b..e6b47555e 100644
--- a/SOPE/NGCards/samples/versittest.m
+++ b/SOPE/NGCards/samples/versittest.m
@@ -20,14 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/Foundation.h>
 
-#import "CardElement.h"
-#import "CardGroup.h"
-#import "CardVersitRenderer.h"
 #import "NSString+NGCards.h"
 
-#import "unittest.h"
 
 @interface versittest : unittest
 
diff --git a/SOPE/NGCards/tests/common.h b/SOPE/NGCards/tests/common.h
index ae2f086cb..c76064b51 100644
--- a/SOPE/NGCards/tests/common.h
+++ b/SOPE/NGCards/tests/common.h
@@ -22,8 +22,6 @@
 #ifndef __NGiCalTests_common_H__
 #define __NGiCalTests_common_H__
 
-#import <Foundation/Foundation.h>
-#import <SenTestingKit/SenTestingKit.h>
 #include <NGExtensions/NGExtensions.h>
 #include <NGExtensions/NGCalendarDateRange.h>
 
diff --git a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.h b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.h
index c6eb74f83..c9f7d36d0 100644
--- a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.h
+++ b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.h
@@ -24,7 +24,6 @@
 #ifndef __versitCardsSaxDriver_VSSaxDriver_H__
 #define __versitCardsSaxDriver_VSSaxDriver_H__
 
-#import <Foundation/NSObject.h>
 #include <SaxObjC/SaxXMLReader.h>
 
 @class NSString, NSSet, NSDictionary, NSMutableArray, NSMutableDictionary;
diff --git a/SoObjects/Appointments/MSExchangeFreeBusy.m b/SoObjects/Appointments/MSExchangeFreeBusy.m
index de55e534f..2028db24b 100644
--- a/SoObjects/Appointments/MSExchangeFreeBusy.m
+++ b/SoObjects/Appointments/MSExchangeFreeBusy.m
@@ -18,9 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -28,8 +25,6 @@
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <SaxObjC/SaxObjC.h>
-#import <SaxObjC/SaxMethodCallHandler.h>
 #import <SaxObjC/SaxObjectDecoder.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 
diff --git a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m
index 425178b36..8c2e7f7d8 100644
--- a/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m
+++ b/SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m
@@ -19,23 +19,15 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSTimeZone.h>
 
-#import <NGObjWeb/WOActionResults.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoDateFormatter.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 
 #import "MSExchangeFreeBusySOAPRequest.h"
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 7743843a1..f18e7eb72 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -20,35 +20,19 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSTimeZone.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOMessage.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSString+misc.h>
 #import <GDLContentStore/GCSFolder.h>
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 #import <EOControl/EOQualifier.h>
-#import <EOControl/EOSortOrdering.h>
 #import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEvent.h>
 #import <NGCards/iCalFreeBusy.h>
 #import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalPerson.h>
 #import <NGCards/iCalRecurrenceCalculator.h>
-#import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalTimeZone.h>
 #import <NGCards/iCalTimeZonePeriod.h>
 #import <NGCards/iCalToDo.h>
@@ -68,7 +52,6 @@
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUserManager.h>
@@ -87,7 +70,6 @@
 #import "SOGoTaskObject.h"
 #import "SOGoWebAppointmentFolder.h"
 
-#import "SOGoAppointmentFolder.h"
 
 #define defaultColor @"#AAAAAA"
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolderICS.m b/SoObjects/Appointments/SOGoAppointmentFolderICS.m
index 2f9fd46f8..36cae8de9 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolderICS.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolderICS.m
@@ -20,7 +20,6 @@
 
 #import <Foundation/NSString.h>
 
-#import <NGCards/CardElement.h>
 #import <NGCards/iCalCalendar.h>
 
 #import "SOGoAppointmentFolderICS.h"
diff --git a/SoObjects/Appointments/SOGoAppointmentFolderObject.m b/SoObjects/Appointments/SOGoAppointmentFolderObject.m
index 8cde6867e..9a917504a 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolderObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolderObject.m
@@ -20,14 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/iCalCalendar.h>
diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m
index 2b8ee88c7..856a3659e 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolders.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolders.m
@@ -19,10 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -31,19 +27,14 @@
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <GDLAccess/EOAdaptorChannel.h>
 
 #import <DOM/DOMElement.h>
-#import <DOM/DOMNode.h>
-#import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>
 
 #import <SOGo/WORequest+SOGo.h>
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/NSObject+Utilities.h>
-#import <SOGo/SOGoParentFolder.h>
 #import <SOGo/SOGoPermissions.h>
-#import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoWebDAVValue.h>
diff --git a/SoObjects/Appointments/SOGoAppointmentInboxFolder.m b/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
index c57d7090d..4347bb923 100644
--- a/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentInboxFolder.m
@@ -18,17 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 #import <SaxObjC/XMLNamespaces.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoWebDAVValue.h>
 
 #import "SOGoAppointmentFolders.h"
 
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.h b/SoObjects/Appointments/SOGoAppointmentObject.h
index 8ab78d0a0..8aa840d99 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.h
+++ b/SoObjects/Appointments/SOGoAppointmentObject.h
@@ -22,7 +22,6 @@
 #ifndef __Appointments_SOGoAppointmentObject_H__
 #define __Appointments_SOGoAppointmentObject_H__
 
-#import <SOGo/SOGoContentObject.h>
 
 @class NSArray;
 @class NSException;
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 41b8eb108..0e77633e8 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -21,11 +21,8 @@
 */
 
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSPredicate.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -33,12 +30,8 @@
 #import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalEventChanges.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalRecurrenceCalculator.h>
 #import <NGCards/iCalToDo.h>
 #import <NGCards/NSCalendarDate+NGCards.h>
 #import <SaxObjC/XMLNamespaces.h>
@@ -49,19 +42,14 @@
 #import <NGCards/iCalToDo.h>
 #import <NGCards/NSString+NGCards.h>
 
-#import <SOGo/SOGoConstants.h>
-#import <SOGo/SOGoUserManager.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoObject.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoGroup.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoWebDAVValue.h>
 #import <SOGo/WORequest+SOGo.h>
 
 #import "iCalCalendar+SOGo.h"
@@ -71,7 +59,6 @@
 #import "NSArray+Appointments.h"
 #import "SOGoAppointmentFolder.h"
 #import "SOGoAppointmentOccurence.h"
-#import "SOGoCalendarComponent.h"
 
 #import "SOGoAppointmentObject.h"
 
diff --git a/SoObjects/Appointments/SOGoAptMailInvitation.m b/SoObjects/Appointments/SOGoAptMailInvitation.m
index bfd709de0..f3a449b1c 100644
--- a/SoObjects/Appointments/SOGoAptMailInvitation.m
+++ b/SoObjects/Appointments/SOGoAptMailInvitation.m
@@ -24,11 +24,9 @@
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOResponse.h>
 
-#import <NGCards/iCalEvent.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+Utilities.h>
-#import <SOGo/SOGoUser.h>
 #import "iCalPerson+SOGo.h"
 
 #import "SOGoAptMailNotification.h"
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 4c26191ae..7073343fc 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -20,16 +20,12 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSTimeZone.h>
 
-#import <NGObjWeb/WOActionResults.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+Utilities.h>
diff --git a/SoObjects/Appointments/SOGoAptMailReceipt.h b/SoObjects/Appointments/SOGoAptMailReceipt.h
index ffc1efe93..84aad774c 100644
--- a/SoObjects/Appointments/SOGoAptMailReceipt.h
+++ b/SoObjects/Appointments/SOGoAptMailReceipt.h
@@ -30,7 +30,6 @@
 @class NSString;
 @class iCalPerson;
 
-#import <SOGo/SOGoConstants.h>
 
 @interface SOGoAptMailReceipt : SOGoAptMailNotification
 {
diff --git a/SoObjects/Appointments/SOGoAptMailReceipt.m b/SoObjects/Appointments/SOGoAptMailReceipt.m
index 5aa4295eb..ddd8a3fd1 100644
--- a/SoObjects/Appointments/SOGoAptMailReceipt.m
+++ b/SoObjects/Appointments/SOGoAptMailReceipt.m
@@ -38,7 +38,6 @@
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 
 #import "SOGoAptMailReceipt.h"
 
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 762139774..4261ba60b 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -19,10 +19,6 @@
  */
 
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
@@ -36,8 +32,6 @@
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalRepeatableEntityObject.h>
 #import <NGMime/NGMimeBodyPart.h>
 #import <NGMime/NGMimeMultipartBody.h>
 #import <NGMail/NGMimeMessage.h>
@@ -49,12 +43,10 @@
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoBuild.h>
-#import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoMailer.h>
 #import <SOGo/SOGoGroup.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoWebDAVAclManager.h>
@@ -63,14 +55,12 @@
 #import <Mailer/NSString+Mail.h>
 
 #import "SOGoAptMailICalReply.h"
-#import "SOGoAptMailNotification.h"
 #import "SOGoAptMailReceipt.h"
 #import "SOGoEMailAlarmsManager.h"
 #import "iCalEntityObject+SOGo.h"
 #import "iCalPerson+SOGo.h"
 #import "iCalRepeatableEntityObject+SOGo.h"
 #import "SOGoCalendarComponent.h"
-#import "SOGoComponentOccurence.h"
 
 @implementation SOGoCalendarComponent
 
diff --git a/SoObjects/Appointments/SOGoCalendarProxy.h b/SoObjects/Appointments/SOGoCalendarProxy.h
index 4279f67f6..60e693772 100644
--- a/SoObjects/Appointments/SOGoCalendarProxy.h
+++ b/SoObjects/Appointments/SOGoCalendarProxy.h
@@ -23,7 +23,6 @@
 #ifndef SOGOCALENDARPROXY_H
 #define SOGOCALENDARPROXY_H
 
-#import <SOGo/SOGoFolder.h>
 
 @interface SOGoCalendarProxy : SOGoFolder
 {
diff --git a/SoObjects/Appointments/SOGoCalendarProxy.m b/SoObjects/Appointments/SOGoCalendarProxy.m
index ca2a6a2cf..dff9a4c46 100644
--- a/SoObjects/Appointments/SOGoCalendarProxy.m
+++ b/SoObjects/Appointments/SOGoCalendarProxy.m
@@ -20,16 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
 #import <SaxObjC/XMLNamespaces.h>
 #import <SOGo/NSArray+Utilities.h>
-#import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserSettings.h>
 
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoPermissions.h>
diff --git a/SoObjects/Appointments/SOGoComponentOccurence.m b/SoObjects/Appointments/SOGoComponentOccurence.m
index f81a73f5a..ccef02f7c 100644
--- a/SoObjects/Appointments/SOGoComponentOccurence.m
+++ b/SoObjects/Appointments/SOGoComponentOccurence.m
@@ -18,15 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSString.h>
 
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalRepeatableEntityObject.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 
@@ -34,9 +29,7 @@
 #import <SOGo/SOGoDomainDefaults.h>
 
 #import "SOGoAppointmentObject.h"
-#import "SOGoCalendarComponent.h"
 
-#import "SOGoComponentOccurence.h"
 
 @interface SOGoCalendarComponent (OccurenceExtensions)
 
diff --git a/SoObjects/Appointments/SOGoEMailAlarmsManager.h b/SoObjects/Appointments/SOGoEMailAlarmsManager.h
index 3f9e21ffa..d461361da 100644
--- a/SoObjects/Appointments/SOGoEMailAlarmsManager.h
+++ b/SoObjects/Appointments/SOGoEMailAlarmsManager.h
@@ -21,7 +21,6 @@
 #ifndef SOGOEMAILALARMSMANAGER_H
 #define SOGOEMAILALARMSMANAGER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSCalendarDate;
 
diff --git a/SoObjects/Appointments/SOGoEMailAlarmsManager.m b/SoObjects/Appointments/SOGoEMailAlarmsManager.m
index 6592b348e..2894bc22f 100644
--- a/SoObjects/Appointments/SOGoEMailAlarmsManager.m
+++ b/SoObjects/Appointments/SOGoEMailAlarmsManager.m
@@ -21,14 +21,12 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/iCalAlarm.h>
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEntityObject.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalToDo.h>
 
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index 1c6e55662..8d4528511 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -19,13 +19,7 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
@@ -37,9 +31,7 @@
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoSource.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserManager.h>
-#import <SOGo/SOGoPermissions.h>
 
 #import "SOGoAppointmentFolder.h"
 #import "SOGoAppointmentFolders.h"
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index 3e1343726..3d8a99bb2 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -21,23 +21,15 @@
 */
 
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDate.h>
-#import <Foundation/NSException.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalToDo.h>
-#import <NGCards/iCalEventChanges.h>
-#import <NGCards/iCalPerson.h>
-#import <SOGo/SOGoUserManager.h>
 
-#import <SoObjects/SOGo/SOGoMailer.h>
 
 #import "iCalCalendar+SOGo.h"
 #import "NSArray+Appointments.h"
-#import "SOGoAptMailNotification.h"
-#import "SOGoAppointmentFolder.h"
 #import "SOGoTaskOccurence.h"
 
 #import "SOGoTaskObject.h"
diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
index 7c1e6403e..c495527f2 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -18,17 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>
 
 #import <SOGo/NSArray+Utilities.h>
@@ -36,7 +31,6 @@
 #import <SOGo/NSString+DAV.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoGCSFolder.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/WOResponse+SOGo.h>
diff --git a/SoObjects/Appointments/SOGoWebAppointmentFolder.m b/SoObjects/Appointments/SOGoWebAppointmentFolder.m
index 5ee97a671..1c8d72f55 100644
--- a/SoObjects/Appointments/SOGoWebAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoWebAppointmentFolder.m
@@ -20,13 +20,9 @@
 
 #import <curl/curl.h>
 
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOHTTPConnection.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGHttp/NGHttpResponse.h>
@@ -35,8 +31,6 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <SOGo/SOGoAuthenticator.h>
 #import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 
diff --git a/SoObjects/Appointments/iCalEntityObject+SOGo.m b/SoObjects/Appointments/iCalEntityObject+SOGo.m
index 644738881..fe9ad4c93 100644
--- a/SoObjects/Appointments/iCalEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalEntityObject+SOGo.m
@@ -18,19 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSTimeZone.h>
-#import <Foundation/NSURL.h>
 
-#import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalPerson.h>
 #import <NGCards/iCalTrigger.h>
 #import <NGCards/iCalRepeatableEntityObject.h>
 #import <NGCards/NSString+NGCards.h>
@@ -41,7 +33,6 @@
 
 #import "SOGoAppointmentFolder.h"
 
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 
 #import <SOGo/NSArray+Utilities.h>
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index c9512a044..afacd6d97 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -18,24 +18,18 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
 
-#import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalEvent.h>
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalRecurrenceRule.h>
-#import <NGCards/iCalTrigger.h>
 #import <NGCards/NSString+NGCards.h>
 
 #import <SoObjects/SOGo/SOGoUser.h>
@@ -44,7 +38,6 @@
 
 #import <SOGo/NSCalendarDate+SOGo.h>
 
-#import "SOGoAppointmentFolder.h"
 #import "iCalRepeatableEntityObject+SOGo.h"
 
 #import "iCalEvent+SOGo.h"
diff --git a/SoObjects/Appointments/iCalEventChanges+SOGo.m b/SoObjects/Appointments/iCalEventChanges+SOGo.m
index 5e5c3d383..562919d58 100644
--- a/SoObjects/Appointments/iCalEventChanges+SOGo.m
+++ b/SoObjects/Appointments/iCalEventChanges+SOGo.m
@@ -21,7 +21,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
 #import "iCalEventChanges+SOGo.h"
diff --git a/SoObjects/Appointments/iCalPerson+SOGo.m b/SoObjects/Appointments/iCalPerson+SOGo.m
index fc14cf0fd..9f2fbde05 100644
--- a/SoObjects/Appointments/iCalPerson+SOGo.m
+++ b/SoObjects/Appointments/iCalPerson+SOGo.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserManager.h>
diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
index bd9d1d9b9..f804c8819 100644
--- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
@@ -18,18 +18,11 @@
  * 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 <Foundation/NSValue.h>
 
 #import <NGCards/iCalByDayMask.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalRecurrenceCalculator.h>
 #import <NGCards/iCalTimeZone.h>
 #import <NGCards/NSString+NGCards.h>
diff --git a/SoObjects/Appointments/iCalToDo+SOGo.m b/SoObjects/Appointments/iCalToDo+SOGo.m
index 585f26fe0..6f5ac26b0 100644
--- a/SoObjects/Appointments/iCalToDo+SOGo.m
+++ b/SoObjects/Appointments/iCalToDo+SOGo.m
@@ -18,22 +18,17 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
 
-#import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/NSString+NGCards.h>
-#import <NGCards/iCalAlarm.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalTrigger.h>
 
 #import <SoObjects/SOGo/WOContext+SOGo.h>
 
diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 8ab357bc5..123a56323 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -18,11 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSNull+misc.h>
 
diff --git a/SoObjects/Contacts/NGVList+SOGo.m b/SoObjects/Contacts/NGVList+SOGo.m
index 98b38c319..e43393afa 100644
--- a/SoObjects/Contacts/NGVList+SOGo.m
+++ b/SoObjects/Contacts/NGVList+SOGo.m
@@ -19,8 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
 #import <NGCards/NGVCardReference.h>
diff --git a/SoObjects/Contacts/NSDictionary+LDIF.m b/SoObjects/Contacts/NSDictionary+LDIF.m
index dd7a6e539..3e94c6aaf 100644
--- a/SoObjects/Contacts/NSDictionary+LDIF.m
+++ b/SoObjects/Contacts/NSDictionary+LDIF.m
@@ -21,7 +21,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <NGExtensions/NGBase64Coding.h>
 
 #import "NSString+LDIF.h"
diff --git a/SoObjects/Contacts/NSString+LDIF.h b/SoObjects/Contacts/NSString+LDIF.h
index 5f6c0f1da..e93797242 100644
--- a/SoObjects/Contacts/NSString+LDIF.h
+++ b/SoObjects/Contacts/NSString+LDIF.h
@@ -23,7 +23,6 @@
 #ifndef NSSTRING_LDIF_H
 #define NSSTRING_LDIF_H
 
-#import <Foundation/NSString.h>
 
 @interface NSString (SOGoLDIF)
 
diff --git a/SoObjects/Contacts/SOGoContactEntryPhoto.m b/SoObjects/Contacts/SOGoContactEntryPhoto.m
index 6ae248e08..153c5ca66 100644
--- a/SoObjects/Contacts/SOGoContactEntryPhoto.m
+++ b/SoObjects/Contacts/SOGoContactEntryPhoto.m
@@ -20,9 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
diff --git a/SoObjects/Contacts/SOGoContactFolder.h b/SoObjects/Contacts/SOGoContactFolder.h
index f523c3085..47b098548 100644
--- a/SoObjects/Contacts/SOGoContactFolder.h
+++ b/SoObjects/Contacts/SOGoContactFolder.h
@@ -32,7 +32,6 @@
   is, a content folder containing vcal?? files (and a proper quicktable).
 */
 
-#import <Foundation/NSObject.h>
 
 #import <SOGo/SOGoFolder.h>
 
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index e7984b172..5a0d81333 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -18,16 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSSortDescriptor.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
 #import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/GCSFolderManager.h>
@@ -36,7 +31,6 @@
 
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/WORequest+SOGo.h>
diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index dfaa66426..4985dbe75 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -18,12 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 
-#import <NGCards/NGVCard.h>
-#import <NGCards/NGVCardPhoto.h>
 
 #import "NGVCard+SOGo.h"
 #import "SOGoContactEntryPhoto.h"
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.h b/SoObjects/Contacts/SOGoContactGCSFolder.h
index 6ed85c1e8..496a1796c 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.h
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.h
@@ -24,7 +24,6 @@
 
 #import <SOGo/SOGoGCSFolder.h>
 
-#import "SOGoContactFolder.h"
 #import "SOGoFolder+CardDAV.h"
 
 @class NSArray;
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 6bd1a67ff..85a450967 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -19,16 +19,10 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <SaxObjC/XMLNamespaces.h>
diff --git a/SoObjects/Contacts/SOGoContactGCSList.m b/SoObjects/Contacts/SOGoContactGCSList.m
index ad1b3277b..28ada8c3e 100644
--- a/SoObjects/Contacts/SOGoContactGCSList.m
+++ b/SoObjects/Contacts/SOGoContactGCSList.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 
 #import <NGCards/NGVList.h>
diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.h b/SoObjects/Contacts/SOGoContactLDIFEntry.h
index e2625e665..a1db9cfcb 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.h
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.h
@@ -22,7 +22,6 @@
 #ifndef SOGOCONTACTLDIFENTRY_H
 #define SOGOCONTACTLDIFENTRY_H
 
-#import <SOGo/SOGoObject.h>
 
 #import "SOGoContactObject.h"
 
diff --git a/SoObjects/Contacts/SOGoContactLDIFEntry.m b/SoObjects/Contacts/SOGoContactLDIFEntry.m
index 5d45bbcaf..1b51be3f3 100644
--- a/SoObjects/Contacts/SOGoContactLDIFEntry.m
+++ b/SoObjects/Contacts/SOGoContactLDIFEntry.m
@@ -20,13 +20,9 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
-#import <NGCards/NGVCard.h>
-#import <NGCards/CardVersitRenderer.h>
 
 #import <SOGo/SOGoBuild.h>
-#import <SOGo/SOGoSource.h>
 #import <SOGo/SOGoPermissions.h>
 
 #import "NGVCard+SOGo.h"
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.h b/SoObjects/Contacts/SOGoContactSourceFolder.h
index 610cf63df..ccf3ce57f 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.h
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.h
@@ -21,7 +21,6 @@
 #ifndef SOGOCONTACTSOURCEFOLDER_H
 #define SOGOCONTACTSOURCEFOLDER_H
 
-#import "SOGoContactFolder.h"
 #import "SOGoFolder+CardDAV.h"
 
 #import <SOGo/SOGoSource.h>
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index e1e39a910..315da572d 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -18,25 +18,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
-#import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/SoSelectorInvocation.h>
-#import <NGObjWeb/SoUser.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 #import <EOControl/EOSortOrdering.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -46,9 +33,6 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/SOGoPermissions.h>
-#import <SOGo/SOGoSource.h>
-#import <SOGo/SOGoUserManager.h>
-#import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/WORequest+SOGo.h>
 #import <SOGo/WOResponse+SOGo.h>
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index d19306987..fe976d355 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -18,21 +18,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <DOM/DOMProtocols.h>
 #import <DOM/DOMNode.h>
 #import <SaxObjC/SaxObjC.h>
-#import <SaxObjC/XMLNamespaces.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/WOResponse+SOGo.h>
diff --git a/SoObjects/Contacts/SOGoUserFolder+Contacts.m b/SoObjects/Contacts/SOGoUserFolder+Contacts.m
index 373bbca6e..5a1e8d511 100644
--- a/SoObjects/Contacts/SOGoUserFolder+Contacts.m
+++ b/SoObjects/Contacts/SOGoUserFolder+Contacts.m
@@ -20,13 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <SaxObjC/XMLNamespaces.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserManager.h>
diff --git a/SoObjects/Mailer/EOQualifier+MailDAV.m b/SoObjects/Mailer/EOQualifier+MailDAV.m
index 0030f0b9d..46f64e260 100644
--- a/SoObjects/Mailer/EOQualifier+MailDAV.m
+++ b/SoObjects/Mailer/EOQualifier+MailDAV.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSSet.h>
 
 #import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
-#import <SaxObjC/XMLNamespaces.h>
 #import <SOGo/DOMNode+SOGo.h>
 
 #import <NGCards/NSString+NGCards.h>
diff --git a/SoObjects/Mailer/NSData+Mail.m b/SoObjects/Mailer/NSData+Mail.m
index 92f379ec4..109ebd615 100644
--- a/SoObjects/Mailer/NSData+Mail.m
+++ b/SoObjects/Mailer/NSData+Mail.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NGQuotedPrintableCoding.h>
diff --git a/SoObjects/Mailer/NSDictionary+Mail.h b/SoObjects/Mailer/NSDictionary+Mail.h
index fceea68da..bdc54a704 100644
--- a/SoObjects/Mailer/NSDictionary+Mail.h
+++ b/SoObjects/Mailer/NSDictionary+Mail.h
@@ -21,7 +21,6 @@
 #ifndef NSDICTIONARY_MAIL_H
 #define NSDICTIONARY_MAIL_H
 
-#import <Foundation/NSDictionary.h>
 
 @class NSString;
 
diff --git a/SoObjects/Mailer/NSDictionary+Mail.m b/SoObjects/Mailer/NSDictionary+Mail.m
index 3ed67ff39..01142d6cd 100644
--- a/SoObjects/Mailer/NSDictionary+Mail.m
+++ b/SoObjects/Mailer/NSDictionary+Mail.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <NGExtensions/NSString+misc.h>
 
 #import "NSDictionary+Mail.h"
diff --git a/SoObjects/Mailer/NSString+Mail.h b/SoObjects/Mailer/NSString+Mail.h
index a4851855e..6398f136e 100644
--- a/SoObjects/Mailer/NSString+Mail.h
+++ b/SoObjects/Mailer/NSString+Mail.h
@@ -22,7 +22,6 @@
 #define NSSTRING_MAIL_H
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 @interface NSString (SOGoExtension)
 
diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index f0e19046a..c2e5f4e04 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -18,20 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSObject.h>
 #import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSValue.h>
 
-#import <SaxObjC/SaxAttributes.h>
-#import <SaxObjC/SaxContentHandler.h>
 #import <SaxObjC/SaxLexicalHandler.h>
-#import <SaxObjC/SaxXMLReader.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 #import <NGExtensions/NGHashMap.h>
-#import <NGExtensions/NGQuotedPrintableCoding.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGMime/NGMimeBodyPart.h>
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 45649e6bc..2b81b560e 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -20,13 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
@@ -34,13 +27,11 @@
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest+So.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSFileManager+Extensions.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGExtensions/NGQuotedPrintableCoding.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
@@ -54,7 +45,6 @@
 #import <NGMime/NGMimeFileData.h>
 #import <NGMime/NGMimeMultipartBody.h>
 #import <NGMime/NGMimeType.h>
-#import <NGMime/NGMimeHeaderFieldGenerator.h>
 #import <NGMime/NGMimeHeaderFields.h>
 
 #import <SOGo/NSArray+Utilities.h>
@@ -65,19 +55,15 @@
 #import <SOGo/SOGoMailer.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserDefaults.h>
 
 #import <NGCards/NGVCard.h>
 
-#import <Contacts/SOGoContactFolder.h>
 #import <Contacts/SOGoContactFolders.h>
 #import <Contacts/SOGoContactGCSEntry.h>
 
 #import "NSData+Mail.h"
 #import "NSString+Mail.h"
 #import "SOGoMailAccount.h"
-#import "SOGoMailFolder.h"
-#import "SOGoMailObject.h"
 #import "SOGoMailObject+Draft.h"
 #import "SOGoSentFolder.h"
 
diff --git a/SoObjects/Mailer/SOGoDraftsFolder.m b/SoObjects/Mailer/SOGoDraftsFolder.m
index d7157beee..0c57df427 100644
--- a/SoObjects/Mailer/SOGoDraftsFolder.m
+++ b/SoObjects/Mailer/SOGoDraftsFolder.m
@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDate.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <SoObjects/SOGo/SOGoUser.h>
 
 #import "SOGoDraftObject.h"
 
diff --git a/SoObjects/Mailer/SOGoHTMLMailBodyPart.m b/SoObjects/Mailer/SOGoHTMLMailBodyPart.m
index a3beafc66..c6a671bec 100644
--- a/SoObjects/Mailer/SOGoHTMLMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoHTMLMailBodyPart.m
@@ -20,9 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
-#import <NGObjWeb/SoClass.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WORequest+So.h>
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 24c73a7e3..edaa71d6c 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -20,41 +20,30 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSURL.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoHTTPAuthenticator.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
-#import <NGImap4/NGImap4Context.h>
 #import <NGImap4/NSString+Imap4.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoAuthenticator.h>
 #import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoSieveManager.h>
 
 #import "SOGoDraftsFolder.h"
-#import "SOGoMailFolder.h"
-#import "SOGoMailManager.h"
 #import "SOGoMailNamespace.h"
 #import "SOGoSentFolder.h"
 #import "SOGoTrashFolder.h"
diff --git a/SoObjects/Mailer/SOGoMailAccounts.m b/SoObjects/Mailer/SOGoMailAccounts.m
index 9c26a8efa..4411a5be3 100644
--- a/SoObjects/Mailer/SOGoMailAccounts.m
+++ b/SoObjects/Mailer/SOGoMailAccounts.m
@@ -20,8 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -29,7 +27,6 @@
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 
 #import "../SOGo/NSArray+Utilities.h"
 #import "../SOGo/NSObject+DAV.h"
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 4948abe7e..a1efa3548 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -20,10 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -41,7 +37,6 @@
 #import "SOGoMailAccount.h"
 #import "SOGoMailManager.h"
 
-#import "SOGoMailBaseObject.h"
 
 @implementation SOGoMailBaseObject
 
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index 71d2dd385..299fcd678 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -20,9 +20,6 @@
 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
@@ -40,7 +37,6 @@
 
 #import "NSDictionary+Mail.h"
 #import "SOGoMailObject.h"
-#import "SOGoMailManager.h"
 
 #import "SOGoMailBodyPart.h"
 
diff --git a/SoObjects/Mailer/SOGoMailFolder.h b/SoObjects/Mailer/SOGoMailFolder.h
index 239941387..cbf0dc867 100644
--- a/SoObjects/Mailer/SOGoMailFolder.h
+++ b/SoObjects/Mailer/SOGoMailFolder.h
@@ -24,7 +24,6 @@
 #define __Mailer_SOGoMailFolder_H__
 
 #include <Mailer/SOGoMailBaseObject.h>
-#import <Foundation/NSRange.h>
 #import <NGObjWeb/WOResponse.h>
 
 /*
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index b9497d044..97e10e92d 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -20,16 +20,11 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 #import <Foundation/NSTask.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSURL+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -38,8 +33,6 @@
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>
 
 #import <EOControl/EOSortOrdering.h>
@@ -63,7 +56,6 @@
 #import <SOGo/NSString+DAV.h>
 #import <SOGo/NSArray+DAV.h>
 #import <SOGo/NSObject+DAV.h>
-#import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
@@ -74,11 +66,8 @@
 #import <SOGo/SOGoMailer.h>
 
 #import "EOQualifier+MailDAV.h"
-#import "SOGoMailObject.h"
 #import "SOGoMailAccount.h"
 #import "SOGoMailAccounts.h"
-#import "SOGoMailManager.h"
-#import "SOGoMailFolder.h"
 #import "SOGoTrashFolder.h"
 #import "SOGoMailObject+Draft.h"
 
diff --git a/SoObjects/Mailer/SOGoMailLabel.h b/SoObjects/Mailer/SOGoMailLabel.h
index 28a3e5577..4e016eaf9 100644
--- a/SoObjects/Mailer/SOGoMailLabel.h
+++ b/SoObjects/Mailer/SOGoMailLabel.h
@@ -22,8 +22,6 @@
 #ifndef SOGOMAILLABEL_H
 #define SOGOMAILLABEL_H
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import "../../UI/SOGoUI/UIxComponent.h"
 
diff --git a/SoObjects/Mailer/SOGoMailManager.m b/SoObjects/Mailer/SOGoMailManager.m
index f88723318..5d5f7d3b7 100644
--- a/SoObjects/Mailer/SOGoMailManager.m
+++ b/SoObjects/Mailer/SOGoMailManager.m
@@ -19,14 +19,12 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGImap4/NGImap4Connection.h>
-#import <NGImap4/NGImap4ConnectionManager.h>
 
 #import "SOGoMailManager.h"
 
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 1aa24ea5b..90ebf6eef 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -20,9 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOResponse.h>
@@ -35,7 +33,6 @@
 #import <SoObjects/SOGo/SOGoUserDefaults.h>
 
 #import "NSString+Mail.h"
-#import "SOGoMailForward.h"
 #import "SOGoMailObject+Draft.h"
 #import "SOGoMailReply.h"
 
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 045de4149..f97d9882e 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -20,18 +20,11 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSNull+misc.h>
@@ -54,8 +47,6 @@
 #import "NSData+Mail.h"
 #import "NSDictionary+Mail.h"
 #import "SOGoMailFolder.h"
-#import "SOGoMailAccount.h"
-#import "SOGoMailAccounts.h"
 #import "SOGoMailManager.h"
 #import "SOGoMailBodyPart.h"
 
diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m
index 3875cc0f6..8012994c8 100644
--- a/SoObjects/Mailer/SOGoMailReply.m
+++ b/SoObjects/Mailer/SOGoMailReply.m
@@ -22,8 +22,6 @@
 #import <NGExtensions/NSString+misc.h>
 #import <NGImap4/NGImap4Envelope.h>
 
-#import <SoObjects/SOGo/SOGoDateFormatter.h>
-#import <SoObjects/SOGo/SOGoUser.h>
 
 #import "SOGoMailObject+Draft.h"
 #import "SOGoMailReply.h"
diff --git a/SoObjects/Mailer/SOGoSentFolder.m b/SoObjects/Mailer/SOGoSentFolder.m
index 9dce47464..7fdc19344 100644
--- a/SoObjects/Mailer/SOGoSentFolder.m
+++ b/SoObjects/Mailer/SOGoSentFolder.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSString.h>
 
 #import "SOGoSentFolder.h"
 
diff --git a/SoObjects/SOGo/BSONCodec.h b/SoObjects/SOGo/BSONCodec.h
index f3a1b6a0c..3c00596db 100644
--- a/SoObjects/SOGo/BSONCodec.h
+++ b/SoObjects/SOGo/BSONCodec.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <stdint.h>
 
 @protocol BSONCoding
 - (uint8_t) BSONTypeID;
diff --git a/SoObjects/SOGo/BSONCodec.m b/SoObjects/SOGo/BSONCodec.m
index 0e68f966c..2b5b9d1eb 100644
--- a/SoObjects/SOGo/BSONCodec.m
+++ b/SoObjects/SOGo/BSONCodec.m
@@ -9,9 +9,6 @@
 */
 
 #import "BSONCodec.h"
-#import <ctype.h>
-#import <string.h>
-#import <objc/objc.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
diff --git a/SoObjects/SOGo/CardElement+SOGo.m b/SoObjects/SOGo/CardElement+SOGo.m
index 12af02485..2ef1a741d 100644
--- a/SoObjects/SOGo/CardElement+SOGo.m
+++ b/SoObjects/SOGo/CardElement+SOGo.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 
 #import "NSDictionary+Utilities.h"
diff --git a/SoObjects/SOGo/DOMNode+SOGo.h b/SoObjects/SOGo/DOMNode+SOGo.h
index 731bf7e36..f70242f05 100644
--- a/SoObjects/SOGo/DOMNode+SOGo.h
+++ b/SoObjects/SOGo/DOMNode+SOGo.h
@@ -24,7 +24,6 @@
 #define S_GO_SOOBJECTS_SOGO_DOMNODE_SOGO_H
 
 #import <DOM/DOMElement.h>
-#import <DOM/DOMNode.h>
 
 @class DOMElement;
 
diff --git a/SoObjects/SOGo/DOMNode+SOGo.m b/SoObjects/SOGo/DOMNode+SOGo.m
index 70295f478..519a792ef 100644
--- a/SoObjects/SOGo/DOMNode+SOGo.m
+++ b/SoObjects/SOGo/DOMNode+SOGo.m
@@ -23,8 +23,6 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSString.h>
 
-#import <DOM/DOMProtocols.h>
-#import <DOM/DOMElement.h>
 
 #import <SaxObjC/XMLNamespaces.h>
 
diff --git a/SoObjects/SOGo/EOQualifier+SOGoCacheObject.m b/SoObjects/SOGo/EOQualifier+SOGoCacheObject.m
index f21e9c7d6..1d48c3766 100644
--- a/SoObjects/SOGo/EOQualifier+SOGoCacheObject.m
+++ b/SoObjects/SOGo/EOQualifier+SOGoCacheObject.m
@@ -18,10 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/LDAPSource.h b/SoObjects/SOGo/LDAPSource.h
index 9081196be..c19bf1b96 100644
--- a/SoObjects/SOGo/LDAPSource.h
+++ b/SoObjects/SOGo/LDAPSource.h
@@ -21,7 +21,6 @@
 #ifndef LDAPSOURCE_H
 #define LDAPSOURCE_H
 
-#import <Foundation/NSObject.h>
 
 #include "SOGoSource.h"
 #include "SOGoConstants.h"
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 0a7b9b8ec..34a26c4ca 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -20,10 +20,6 @@
 
 #include <ldap.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <EOControl/EOControl.h>
@@ -38,11 +34,9 @@
 #import "NSString+Utilities.h"
 #import "NSString+Crypto.h"
 #import "SOGoCache.h"
-#import "SOGoDomainDefaults.h"
 #import "SOGoSystemDefaults.h"
 
 #import "LDAPSource.h"
-#import "../../Main/SOGo.h"
 
 static Class NSStringK;
 
diff --git a/SoObjects/SOGo/LDAPSourceSchema.h b/SoObjects/SOGo/LDAPSourceSchema.h
index 13d415bae..cf6598967 100644
--- a/SoObjects/SOGo/LDAPSourceSchema.h
+++ b/SoObjects/SOGo/LDAPSourceSchema.h
@@ -23,7 +23,6 @@
 #ifndef LDAPSOURCESCHEMA_H
 #define LDAPSOURCESCHEMA_H
 
-#import <Foundation/NSObject.h>
 
 @class NSMutableDictionary;
 @class NGLdapConnection;
diff --git a/SoObjects/SOGo/LDAPSourceSchema.m b/SoObjects/SOGo/LDAPSourceSchema.m
index a81417782..796251324 100644
--- a/SoObjects/SOGo/LDAPSourceSchema.m
+++ b/SoObjects/SOGo/LDAPSourceSchema.m
@@ -20,9 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <EOControl/EOQualifier.h>
diff --git a/SoObjects/SOGo/NSArray+DAV.m b/SoObjects/SOGo/NSArray+DAV.m
index fe2e1a6d7..bd343f2e7 100644
--- a/SoObjects/SOGo/NSArray+DAV.m
+++ b/SoObjects/SOGo/NSArray+DAV.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
 #import <SaxObjC/XMLNamespaces.h>
diff --git a/SoObjects/SOGo/NSArray+Utilities.m b/SoObjects/SOGo/NSArray+Utilities.m
index e82e3cf28..11b0427ec 100644
--- a/SoObjects/SOGo/NSArray+Utilities.m
+++ b/SoObjects/SOGo/NSArray+Utilities.m
@@ -19,9 +19,7 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import "NSArray+Utilities.h"
diff --git a/SoObjects/SOGo/NSCalendarDate+SOGo.m b/SoObjects/SOGo/NSCalendarDate+SOGo.m
index 6511e48d6..5a48d681d 100644
--- a/SoObjects/SOGo/NSCalendarDate+SOGo.m
+++ b/SoObjects/SOGo/NSCalendarDate+SOGo.m
@@ -19,7 +19,6 @@
    02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
 
diff --git a/SoObjects/SOGo/NSDictionary+DAV.m b/SoObjects/SOGo/NSDictionary+DAV.m
index a2d52e71e..057ee4b4a 100644
--- a/SoObjects/SOGo/NSDictionary+DAV.m
+++ b/SoObjects/SOGo/NSDictionary+DAV.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSString.h>
 
 #import "NSDictionary+DAV.h"
diff --git a/SoObjects/SOGo/NSDictionary+URL.m b/SoObjects/SOGo/NSDictionary+URL.m
index b2f248354..bfc1437ce 100644
--- a/SoObjects/SOGo/NSDictionary+URL.m
+++ b/SoObjects/SOGo/NSDictionary+URL.m
@@ -21,8 +21,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSString+misc.h>
 
diff --git a/SoObjects/SOGo/NSDictionary+Utilities.m b/SoObjects/SOGo/NSDictionary+Utilities.m
index 79e0c6c6d..44cdc3b51 100644
--- a/SoObjects/SOGo/NSDictionary+Utilities.m
+++ b/SoObjects/SOGo/NSDictionary+Utilities.m
@@ -20,12 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
 #import <Foundation/NSNull.h>
-#import <Foundation/NSString.h>
 
 #import "NSArray+Utilities.h"
 #import "NSString+Utilities.h"
diff --git a/SoObjects/SOGo/NSNumber+Utilities.m b/SoObjects/SOGo/NSNumber+Utilities.m
index 1fac51667..b601769bb 100644
--- a/SoObjects/SOGo/NSNumber+Utilities.m
+++ b/SoObjects/SOGo/NSNumber+Utilities.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import "NSNumber+Utilities.h"
 
diff --git a/SoObjects/SOGo/NSObject+DAV.h b/SoObjects/SOGo/NSObject+DAV.h
index ef5399e57..5cee7119b 100644
--- a/SoObjects/SOGo/NSObject+DAV.h
+++ b/SoObjects/SOGo/NSObject+DAV.h
@@ -21,7 +21,6 @@
 #ifndef NSOBJECT_DAV_H
 #define NSOBJECT_DAV_H
 
-#import <Foundation/NSObject.h>
 #import <Foundation/NSDictionary.h>
 
 @class NSMutableDictionary;
diff --git a/SoObjects/SOGo/NSObject+DAV.m b/SoObjects/SOGo/NSObject+DAV.m
index b5e9a40f6..856623e51 100644
--- a/SoObjects/SOGo/NSObject+DAV.m
+++ b/SoObjects/SOGo/NSObject+DAV.m
@@ -18,12 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/SoSelectorInvocation.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
@@ -34,8 +32,6 @@
 
 #import "NSArray+DAV.h"
 #import "NSString+DAV.h"
-#import "SOGoUser.h"
-#import "SOGoUserFolder.h"
 #import "SOGoWebDAVValue.h"
 
 #import "SOGoObject.h"
diff --git a/SoObjects/SOGo/NSObject+Utilities.h b/SoObjects/SOGo/NSObject+Utilities.h
index 138ecd7b1..867725db8 100644
--- a/SoObjects/SOGo/NSObject+Utilities.h
+++ b/SoObjects/SOGo/NSObject+Utilities.h
@@ -21,7 +21,6 @@
 #ifndef NSOBJECT_UTILITIES_H
 #define NSOBJECT_UTILITIES_H
 
-#import <Foundation/NSObject.h>
 
 #import <DOM/DOMProtocols.h>
 
diff --git a/SoObjects/SOGo/NSObject+Utilities.m b/SoObjects/SOGo/NSObject+Utilities.m
index 6047468f0..21d366083 100644
--- a/SoObjects/SOGo/NSObject+Utilities.m
+++ b/SoObjects/SOGo/NSObject+Utilities.m
@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSDebug.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
diff --git a/SoObjects/SOGo/NSString+Crypto.h b/SoObjects/SOGo/NSString+Crypto.h
index ba4e23cbe..b07298a08 100644
--- a/SoObjects/SOGo/NSString+Crypto.h
+++ b/SoObjects/SOGo/NSString+Crypto.h
@@ -25,7 +25,6 @@
 #ifndef NSSTRING_CRYPTO_H
 #define NSSTRING_CRYPTO_H
 
-#import <Foundation/NSData.h>
 #import <Foundation/NSString.h>
 
 typedef enum {
diff --git a/SoObjects/SOGo/NSString+DAV.h b/SoObjects/SOGo/NSString+DAV.h
index 83a5ce26d..747ce1620 100644
--- a/SoObjects/SOGo/NSString+DAV.h
+++ b/SoObjects/SOGo/NSString+DAV.h
@@ -21,7 +21,6 @@
 #ifndef NSSTRING_DAV_H
 #define NSSTRING_DAV_H
 
-#import <Foundation/NSString.h>
 
 @class NSMutableDictionary;
 
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 9ac5c6775..32756d4fc 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -18,11 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSValue.h>
 
 #import <EOControl/EOQualifier.h>
 
diff --git a/SoObjects/SOGo/NSURL+DAV.h b/SoObjects/SOGo/NSURL+DAV.h
index 7b4e93432..4da8b68c2 100644
--- a/SoObjects/SOGo/NSURL+DAV.h
+++ b/SoObjects/SOGo/NSURL+DAV.h
@@ -23,7 +23,6 @@
 #ifndef NSURL_DAV_H
 #define NSURL_DAV_H
 
-#import <Foundation/NSURL.h>
 
 @class NSMutableDictionary;
 
diff --git a/SoObjects/SOGo/SOGoAuthenticator.h b/SoObjects/SOGo/SOGoAuthenticator.h
index 46c4395af..909edda0e 100644
--- a/SoObjects/SOGo/SOGoAuthenticator.h
+++ b/SoObjects/SOGo/SOGoAuthenticator.h
@@ -23,7 +23,6 @@
 #ifndef SOGOAUTHENTICATOR_H
 #define SOGOAUTHENTICATOR_H
 
-#import <Foundation/NSObject.h>
 
 @class NSString;
 @class SOGoUser;
diff --git a/SoObjects/SOGo/SOGoCASSession.h b/SoObjects/SOGo/SOGoCASSession.h
index e7d6fabb9..5ba9e3c0e 100644
--- a/SoObjects/SOGo/SOGoCASSession.h
+++ b/SoObjects/SOGo/SOGoCASSession.h
@@ -24,7 +24,6 @@
 /* implementation of the CAS protocol as required for a client/proxy:
    http://www.jasig.org/cas/protocol */
 
-#import <Foundation/NSObject.h>
 
 @class NSString;
 @class NSMutableDictionary;
diff --git a/SoObjects/SOGo/SOGoCASSession.m b/SoObjects/SOGo/SOGoCASSession.m
index 6eac8b2c5..457012153 100644
--- a/SoObjects/SOGo/SOGoCASSession.m
+++ b/SoObjects/SOGo/SOGoCASSession.m
@@ -18,13 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSURL.h>
 
 #import <DOM/DOMElement.h>
 #import <DOM/DOMDocument.h>
-#import <DOM/DOMProtocols.h>
 #import <DOM/DOMText.h>
 
 #import <NGObjWeb/WOApplication.h>
@@ -34,8 +30,6 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <SaxObjC/SaxObjC.h>
-#import <SaxObjC/SaxMethodCallHandler.h>
 #import <SaxObjC/SaxObjectDecoder.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 
diff --git a/SoObjects/SOGo/SOGoCache.h b/SoObjects/SOGo/SOGoCache.h
index 12e665ea7..a89de5907 100644
--- a/SoObjects/SOGo/SOGoCache.h
+++ b/SoObjects/SOGo/SOGoCache.h
@@ -22,7 +22,6 @@
 #define SOGOCACHE_H
 
 #import <Foundation/Foundation.h>
-#import <Foundation/NSObject.h>
 
 #include <libmemcached/memcached.h>
 
diff --git a/SoObjects/SOGo/SOGoCache.m b/SoObjects/SOGo/SOGoCache.m
index 13e171e09..4045672ed 100644
--- a/SoObjects/SOGo/SOGoCache.m
+++ b/SoObjects/SOGo/SOGoCache.m
@@ -44,23 +44,13 @@
  */
 
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSLock.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimer.h>
 
-#import <NGObjWeb/SoObject.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import "NSDictionary+Utilities.h"
 #import "NSString+Utilities.h"
 #import "SOGoObject.h"
 #import "SOGoSystemDefaults.h"
-#import "SOGoUser.h"
-#import "SOGoUserProfile.h"
 
 #import "SOGoCache.h"
 
diff --git a/SoObjects/SOGo/SOGoCacheGCSFolder.m b/SoObjects/SOGo/SOGoCacheGCSFolder.m
index 2e483bc32..bdb22527f 100644
--- a/SoObjects/SOGo/SOGoCacheGCSFolder.m
+++ b/SoObjects/SOGo/SOGoCacheGCSFolder.m
@@ -18,24 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSPropertyList.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSURL.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
-#import <GDLAccess/EOAdaptorChannel.h>
-#import <GDLContentStore/GCSChannelManager.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoUser.h>
 #import "EOQualifier+SOGoCacheObject.h"
 #import "GCSSpecialQueries+SOGoCacheObject.h"
 
diff --git a/SoObjects/SOGo/SOGoCacheGCSObject.m b/SoObjects/SOGo/SOGoCacheGCSObject.m
index a6a5c52a3..d0b8908a8 100644
--- a/SoObjects/SOGo/SOGoCacheGCSObject.m
+++ b/SoObjects/SOGo/SOGoCacheGCSObject.m
@@ -18,18 +18,7 @@
  * 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/NSPropertyList.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
 #import <GDLAccess/EOAdaptor.h>
-#import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLAccess/EOAttribute.h>
 #import <GDLContentStore/GCSChannelManager.h>
@@ -39,14 +28,11 @@
 #import <SOGo/SOGoCache.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoDomainDefaults.h>
-#import <SOGo/SOGoUser.h>
 
 #import "GCSSpecialQueries+SOGoCacheObject.h"
 #import "SOGoCacheGCSFolder.h"
 #import "BSONCodec.h"
 
-#import "SOGoCacheGCSObject.h"
 
 static EOAttribute *textColumn = nil;
 
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 2092deacc..9e7ecb0e3 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -20,10 +20,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
@@ -32,13 +28,11 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <GDLContentStore/GCSFolder.h>
 
-#import <NGCards/iCalCalendar.h>
 #import <NGCards/NGVCard.h>
 
 #import "NSCalendarDate+SOGo.h"
 #import "SOGoCache.h"
 #import "SOGoGCSFolder.h"
-#import "SOGoUser.h"
 #import "SOGoPermissions.h"
 #import "SOGoContentObject.h"
 
diff --git a/SoObjects/SOGo/SOGoCredentialsFile.h b/SoObjects/SOGo/SOGoCredentialsFile.h
index b6946faba..23b93d2f6 100644
--- a/SoObjects/SOGo/SOGoCredentialsFile.h
+++ b/SoObjects/SOGo/SOGoCredentialsFile.h
@@ -21,7 +21,6 @@
 #ifndef SOGOCREDENTIALSFILE_H
 #define SOGOCREDENTIALSFILE_H
 
-#import <Foundation/NSObject.h>
 
 @interface SOGoCredentialsFile : NSObject
 {
diff --git a/SoObjects/SOGo/SOGoCredentialsFile.m b/SoObjects/SOGo/SOGoCredentialsFile.m
index a13a7483e..2d7bed880 100644
--- a/SoObjects/SOGo/SOGoCredentialsFile.m
+++ b/SoObjects/SOGo/SOGoCredentialsFile.m
@@ -20,7 +20,6 @@
 
 #import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSString.h>
 
 #import "SOGoCredentialsFile.h"
 
diff --git a/SoObjects/SOGo/SOGoDAVAuthenticator.m b/SoObjects/SOGo/SOGoDAVAuthenticator.m
index ad3bb7bce..789a3aeec 100644
--- a/SoObjects/SOGo/SOGoDAVAuthenticator.m
+++ b/SoObjects/SOGo/SOGoDAVAuthenticator.m
@@ -21,16 +21,13 @@
 */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 
 #import "SOGoCASSession.h"
-#import "SOGoConstants.h"
 #import "SOGoPermissions.h"
 #import "SOGoSystemDefaults.h"
 #import "SOGoUser.h"
diff --git a/SoObjects/SOGo/SOGoDefaultsSource.m b/SoObjects/SOGo/SOGoDefaultsSource.m
index 6074ea420..7295fd12d 100644
--- a/SoObjects/SOGo/SOGoDefaultsSource.m
+++ b/SoObjects/SOGo/SOGoDefaultsSource.m
@@ -22,7 +22,6 @@
 #import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index 763eb6033..72893feda 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
@@ -27,8 +26,6 @@
 
 #import "SOGoSystemDefaults.h"
 
-#import "SOGoDomainDefaults.h"
-#import "SOGoConstants.h"
 
 @implementation SOGoDomainDefaults
 
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index ac9d019c8..0932150de 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -18,21 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/SoWebDAVValue.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import <DOM/DOMElement.h>
 
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -50,7 +42,6 @@
 #import "WORequest+SOGo.h"
 #import "WOResponse+SOGo.h"
 
-#import "SOGoFolder.h"
 
 @interface SOGoObject (SOGoDAVHelpers)
 
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index adbcb348e..f80afb076 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -19,30 +19,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <DOM/DOMElement.h>
-#import <DOM/DOMProtocols.h>
 #import <EOControl/EOFetchSpecification.h>
 #import <EOControl/EOQualifier.h>
-#import <EOControl/EOSortOrdering.h>
 #import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLContentStore/GCSChannelManager.h>
@@ -67,7 +53,6 @@
 #import "SOGoParentFolder.h"
 #import "SOGoPermissions.h"
 #import "SOGoUser.h"
-#import "SOGoUserDefaults.h"
 #import "SOGoUserSettings.h"
 #import "SOGoUserManager.h"
 #import "SOGoWebDAVAclManager.h"
diff --git a/SoObjects/SOGo/SOGoGroup.m b/SoObjects/SOGo/SOGoGroup.m
index e938dc96b..dc76593cf 100644
--- a/SoObjects/SOGo/SOGoGroup.m
+++ b/SoObjects/SOGo/SOGoGroup.m
@@ -54,18 +54,12 @@
 
 #include "SOGoGroup.h"
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #include "SOGoCache.h"
 #include "SOGoSource.h"
 #include "SOGoUserManager.h"
 #include "SOGoUser.h"
 
-#import <NGLdap/NGLdapConnection.h>
-#import <NGLdap/NGLdapAttribute.h>
 #import <NGLdap/NGLdapEntry.h>
 
 #define CHECK_CLASS(o) ({ \
diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.h b/SoObjects/SOGo/SOGoLDAPUserDefaults.h
index 329793a0e..97c01632f 100644
--- a/SoObjects/SOGo/SOGoLDAPUserDefaults.h
+++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.h
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSUserDefaults.h>
 
 @interface SOGoLDAPUserDefaults : NSUserDefaults
 
diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
index 7cbdf3503..ffad7de05 100644
--- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m
+++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
@@ -24,13 +24,9 @@
 #include <stdlib.h>
 #include <ldap.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#import "SOGoLDAPUserDefaults.h"
 
 #define SOGoLDAPDescriptor @"/etc/sogo.conf"
 #define SOGoLDAPContainerSize 8192
diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaultsBootstrap.m b/SoObjects/SOGo/SOGoLDAPUserDefaultsBootstrap.m
index c483a9860..31c1f7ce5 100644
--- a/SoObjects/SOGo/SOGoLDAPUserDefaultsBootstrap.m
+++ b/SoObjects/SOGo/SOGoLDAPUserDefaultsBootstrap.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import "SOGoLDAPUserDefaults.h"
 
 void
 SOGoNSUserDefaultsBootstrap ()
diff --git a/SoObjects/SOGo/SOGoMailer.h b/SoObjects/SOGo/SOGoMailer.h
index 6f82092e2..2f7cc06c7 100644
--- a/SoObjects/SOGo/SOGoMailer.h
+++ b/SoObjects/SOGo/SOGoMailer.h
@@ -21,7 +21,6 @@
 #ifndef SOGOMAILER_H
 #define SOGOMAILER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSArray;
 @class NSException;
diff --git a/SoObjects/SOGo/SOGoMailer.m b/SoObjects/SOGo/SOGoMailer.m
index edf341bfc..a1563c0e0 100644
--- a/SoObjects/SOGo/SOGoMailer.m
+++ b/SoObjects/SOGo/SOGoMailer.m
@@ -19,9 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -31,8 +28,6 @@
 #import <NGStreams/NGInternetSocketAddress.h>
 
 #import "NSString+Utilities.h"
-#import "SOGoAuthenticator.h"
-#import "SOGoDomainDefaults.h"
 #import "SOGoStaticAuthenticator.h"
 #import "SOGoSystemDefaults.h"
 #import "SOGoUser.h"
diff --git a/SoObjects/SOGo/SOGoObject.h b/SoObjects/SOGo/SOGoObject.h
index 8ea1c6b77..8b755718c 100644
--- a/SoObjects/SOGo/SOGoObject.h
+++ b/SoObjects/SOGo/SOGoObject.h
@@ -23,7 +23,6 @@
 #ifndef __SoObjects_SOGoObject_H__
 #define __SoObjects_SOGoObject_H__
 
-#import <Foundation/NSObject.h>
 
 #if LIB_FOUNDATION_LIBRARY
 #error SOGo will not work properly with libFoundation.
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index a6c2e16b0..084244286 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -21,30 +21,14 @@
 
 #import <unistd.h>
 
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSClassDescription.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSPathUtilities.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/SoClass.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
-#import <NGObjWeb/WEClientCapabilities.h>
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WOResourceManager.h>
-#import <NGObjWeb/WOResponse.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WORequest+So.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <DOM/DOMDocument.h>
-#import <DOM/DOMNode.h>
-#import <DOM/DOMProtocols.h>
 #import <NGCards/NSDictionary+NGCards.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -58,18 +42,12 @@
 #import "NSString+DAV.h"
 #import "NSString+Utilities.h"
 #import "SOGoCache.h"
-#import "SOGoDomainDefaults.h"
-#import "SOGoPermissions.h"
 #import "SOGoSystemDefaults.h"
 #import "SOGoUser.h"
-#import "SOGoUserDefaults.h"
-#import "SOGoUserFolder.h"
 #import "SOGoWebDAVAclManager.h"
-#import "SOGoWebDAVValue.h"
 #import "WORequest+SOGo.h"
 #import "WOResponse+SOGo.h"
 
-#import "SOGoObject.h"
 
 @implementation SOGoObject
 
diff --git a/SoObjects/SOGo/SOGoParentFolder.m b/SoObjects/SOGo/SOGoParentFolder.m
index eb454dc97..d3f3c4305 100644
--- a/SoObjects/SOGo/SOGoParentFolder.m
+++ b/SoObjects/SOGo/SOGoParentFolder.m
@@ -18,22 +18,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOMessage.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/GCSFolderManager.h>
 #import <GDLContentStore/NSURL+GCS.h>
 #import <GDLAccess/EOAdaptorChannel.h>
-#import <DOM/DOMElement.h>
 #import <DOM/DOMProtocols.h>
 #import <SaxObjC/XMLNamespaces.h>
 #import <SOGo/SOGoUserDefaults.h>
diff --git a/SoObjects/SOGo/SOGoPermissions.h b/SoObjects/SOGo/SOGoPermissions.h
index 124408d87..79d4b2fdb 100644
--- a/SoObjects/SOGo/SOGoPermissions.h
+++ b/SoObjects/SOGo/SOGoPermissions.h
@@ -23,7 +23,6 @@
 #ifndef SOGOPERMISSIONS_H
 #define SOGOPERMISSIONS_H
 
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/SoPermissions.h>
 
diff --git a/SoObjects/SOGo/SOGoProductLoader.h b/SoObjects/SOGo/SOGoProductLoader.h
index 76bac8a55..bc76af4e0 100644
--- a/SoObjects/SOGo/SOGoProductLoader.h
+++ b/SoObjects/SOGo/SOGoProductLoader.h
@@ -23,7 +23,6 @@
 #ifndef __Main_SOGoProductLoader_H__
 #define __Main_SOGoProductLoader_H__
 
-#import <Foundation/NSObject.h>
 
 @class NSString, NSArray;
 
diff --git a/SoObjects/SOGo/SOGoProductLoader.m b/SoObjects/SOGo/SOGoProductLoader.m
index 4f85a0fba..aaeb7e0b0 100644
--- a/SoObjects/SOGo/SOGoProductLoader.m
+++ b/SoObjects/SOGo/SOGoProductLoader.m
@@ -21,10 +21,8 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSPathUtilities.h>
-#import <Foundation/NSProcessInfo.h>
 
 #import <NGObjWeb/SoProductRegistry.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/SOGoProxyAuthenticator.h b/SoObjects/SOGo/SOGoProxyAuthenticator.h
index d32ac5e9a..201cd98c5 100644
--- a/SoObjects/SOGo/SOGoProxyAuthenticator.h
+++ b/SoObjects/SOGo/SOGoProxyAuthenticator.h
@@ -23,8 +23,6 @@
 #ifndef _SOGoProxyAuthenticator_H__
 #define _SOGoProxyAuthenticator_H__
 
-#import <Foundation/NSObject.h>
-#import <NGObjWeb/SoHTTPAuthenticator.h>
 
 #import "SOGoAuthenticator.h"
 
diff --git a/SoObjects/SOGo/SOGoProxyAuthenticator.m b/SoObjects/SOGo/SOGoProxyAuthenticator.m
index b054512e6..212398a86 100644
--- a/SoObjects/SOGo/SOGoProxyAuthenticator.m
+++ b/SoObjects/SOGo/SOGoProxyAuthenticator.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
diff --git a/SoObjects/SOGo/SOGoSAML2Session.h b/SoObjects/SOGo/SOGoSAML2Session.h
index 0592f38e1..abc10fb10 100644
--- a/SoObjects/SOGo/SOGoSAML2Session.h
+++ b/SoObjects/SOGo/SOGoSAML2Session.h
@@ -24,7 +24,6 @@
 /* implementation of the SAML2 protocol as required for a client:
    https://www.oasis-open.org/standards#samlv2.0 */
 
-#import <Foundation/NSObject.h>
 
 #include <lasso/lasso.h>
 
diff --git a/SoObjects/SOGo/SOGoSAML2Session.m b/SoObjects/SOGo/SOGoSAML2Session.m
index 96ced1516..69728f616 100644
--- a/SoObjects/SOGo/SOGoSAML2Session.m
+++ b/SoObjects/SOGo/SOGoSAML2Session.m
@@ -26,17 +26,9 @@
 #include <lasso/xml/saml-2.0/samlp2_authn_request.h>
 #include <lasso/xml/saml-2.0/samlp2_response.h>
 
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSMapTable.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import "SOGoCache.h"
 #import "SOGoSAML2Exceptions.h"
diff --git a/SoObjects/SOGo/SOGoSession.m b/SoObjects/SOGo/SOGoSession.m
index 73bbbfa5d..c929cd549 100644
--- a/SoObjects/SOGo/SOGoSession.m
+++ b/SoObjects/SOGo/SOGoSession.m
@@ -22,15 +22,9 @@
 
 #include "SOGoCache.h"
 
-#import <NGObjWeb/WOCookie.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
 
 #import <GDLContentStore/GCSSessionsFolder.h>
-#import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/GCSFolderManager.h>
 
 #import <NGExtensions/NGBase64Coding.h>
diff --git a/SoObjects/SOGo/SOGoSieveManager.h b/SoObjects/SOGo/SOGoSieveManager.h
index a1c28fd56..574490de4 100644
--- a/SoObjects/SOGo/SOGoSieveManager.h
+++ b/SoObjects/SOGo/SOGoSieveManager.h
@@ -23,7 +23,6 @@
 #ifndef SOGOSIEVEMANAGER_H
 #define SOGOSIEVEMANAGER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSDictionary;
 @class NSMutableArray;
diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m
index f2f5a7b41..6e7f2f2bc 100644
--- a/SoObjects/SOGo/SOGoSieveManager.m
+++ b/SoObjects/SOGo/SOGoSieveManager.m
@@ -20,9 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
@@ -32,7 +29,6 @@
 #import <SOGo/SOGoUser.h>
 
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGStreams/NGInternetSocketAddress.h>
 #import <NGImap4/NGSieveClient.h>
 
 #import "../Mailer/SOGoMailAccount.h"
diff --git a/SoObjects/SOGo/SOGoSource.h b/SoObjects/SOGo/SOGoSource.h
index d59a81086..572efb569 100644
--- a/SoObjects/SOGo/SOGoSource.h
+++ b/SoObjects/SOGo/SOGoSource.h
@@ -23,7 +23,6 @@
 #ifndef SOGOSOURCE_H
 #define SOGOSOURCE_H
 
-#import <Foundation/NSObject.h>
 
 #import "SOGoConstants.h"
 
diff --git a/SoObjects/SOGo/SOGoStaticAuthenticator.h b/SoObjects/SOGo/SOGoStaticAuthenticator.h
index cb12c0276..6157d1395 100644
--- a/SoObjects/SOGo/SOGoStaticAuthenticator.h
+++ b/SoObjects/SOGo/SOGoStaticAuthenticator.h
@@ -21,7 +21,6 @@
 #ifndef SOGOSTATICAUTHENTICATOR_H
 #define SOGOSTATICAUTHENTICATOR_H
 
-#import <Foundation/NSObject.h>
 
 
 #import "SOGoAuthenticator.h"
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index d4fa79980..452fe41c6 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -20,13 +20,10 @@
  */
 
 #import <dlfcn.h>
-#import <unistd.h>
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSBundle.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSFileManager.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSUserDefaults.h>
 
 #import <NGExtensions/NSObject+Logs.h>
@@ -41,7 +38,6 @@
 @implementation SOGoSystemDefaults
 
 #if defined(LDAP_CONFIG)
-#import <SOGo/SOGoLDAPUserDefaults.h>
 #endif
 
 typedef void (*NSUserDefaultsInitFunction) ();
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 3d1f4ded4..a72523678 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -20,18 +20,9 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSNull.h>
-#import <Foundation/NSTimeZone.h>
-#import <Foundation/NSValue.h>
-#import <Foundation/NSURL.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/SoObject.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -42,14 +33,10 @@
 #import "NSArray+Utilities.h"
 #import "SOGoCache.h"
 #import "SOGoDateFormatter.h"
-#import "SOGoDomainDefaults.h"
-#import "SOGoObject.h"
 #import "SOGoPermissions.h"
 #import "SOGoSystemDefaults.h"
-#import "SOGoUserDefaults.h"
 #import "SOGoUserFolder.h"
 #import "SOGoUserManager.h"
-#import "SOGoUserProfile.h"
 #import "SOGoUserSettings.h"
 #import "WOResourceManager+SOGo.h"
 
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index ea0578f5f..50208d41c 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -18,10 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSSet.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 
 #import <NGImap4/NSString+Imap4.h>
@@ -30,11 +27,9 @@
 #import <NGObjWeb/WEClientCapabilities.h>
 
 #import "NSString+Utilities.h"
-#import "SOGoDomainDefaults.h"
 #import "SOGoSystemDefaults.h"
 #import "SOGoUserProfile.h"
 
-#import "SOGoUserDefaults.h"
 
 
 NSString *SOGoWeekStartJanuary1 = @"January1";
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index 2a44128e8..887011510 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -20,35 +20,20 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoClassSecurityInfo.h>
 #import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WORequest+So.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
-#import <DOM/DOMDocument.h>
 #import <DOM/DOMNode.h>
-#import <DOM/DOMProtocols.h>
-#import <SaxObjC/SaxObjC.h>
-#import <SaxObjC/XMLNamespaces.h>
 
 #import <Appointments/SOGoAppointmentFolders.h>
-#import <Appointments/SOGoFreeBusyObject.h>
 #import <Appointments/SOGoCalendarProxy.h>
 #import <Contacts/SOGoContactFolders.h>
-#import <Mailer/SOGoMailAccounts.h>
 
-#import <SOGoUI/UIxComponent.h>
 
 #import "NSArray+Utilities.h"
 #import "NSDictionary+Utilities.h"
diff --git a/SoObjects/SOGo/SOGoUserManager.h b/SoObjects/SOGo/SOGoUserManager.h
index 5cf246d3a..dbf656dc5 100644
--- a/SoObjects/SOGo/SOGoUserManager.h
+++ b/SoObjects/SOGo/SOGoUserManager.h
@@ -21,7 +21,6 @@
 #ifndef SOGOUSERMANAGER_H
 #define SOGOUSERMANAGER_H
 
-#import <Foundation/NSObject.h>
 
 #import "SOGoConstants.h"
 
diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m
index e62ef9ecf..1fb183188 100644
--- a/SoObjects/SOGo/SOGoUserManager.m
+++ b/SoObjects/SOGo/SOGoUserManager.m
@@ -17,16 +17,6 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSLock.h>
-#import <Foundation/NSNull.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimer.h>
-#import <Foundation/NSValue.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 
@@ -34,12 +24,10 @@
 #import "NSString+Utilities.h"
 #import "NSString+Crypto.h"
 #import "NSObject+Utilities.h"
-#import "SOGoDomainDefaults.h"
 #import "SOGoSource.h"
 #import "SOGoSystemDefaults.h"
 #import "SOGoUserManager.h"
 #import "SOGoCache.h"
-#import "SOGoConstants.h"
 #import "SOGoSource.h"
 
 static Class NSNullK;
diff --git a/SoObjects/SOGo/SOGoUserProfile.h b/SoObjects/SOGo/SOGoUserProfile.h
index c792a7c27..3cd1ac9d8 100644
--- a/SoObjects/SOGo/SOGoUserProfile.h
+++ b/SoObjects/SOGo/SOGoUserProfile.h
@@ -22,7 +22,6 @@
 #ifndef	__SOGoUserDefaults_H_
 #define	__SOGoUserDefaults_H_
 
-#import <Foundation/NSObject.h>
 
 /*
   SOGoUserDefaults
diff --git a/SoObjects/SOGo/SOGoUserProfile.m b/SoObjects/SOGo/SOGoUserProfile.m
index 02d911f6a..40f417ad3 100644
--- a/SoObjects/SOGo/SOGoUserProfile.m
+++ b/SoObjects/SOGo/SOGoUserProfile.m
@@ -19,10 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSPropertyList.h>
-#import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/SOGoUserSettings.m b/SoObjects/SOGo/SOGoUserSettings.m
index cca5f78ac..7f0af9bc4 100644
--- a/SoObjects/SOGo/SOGoUserSettings.m
+++ b/SoObjects/SOGo/SOGoUserSettings.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSString.h>
 
diff --git a/SoObjects/SOGo/SOGoWebAuthenticator.m b/SoObjects/SOGo/SOGoWebAuthenticator.m
index bd386d035..a677aa8dc 100644
--- a/SoObjects/SOGo/SOGoWebAuthenticator.m
+++ b/SoObjects/SOGo/SOGoWebAuthenticator.m
@@ -18,14 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSURL.h>
 
 #import <NGObjWeb/SoDefaultRenderer.h>
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOCookie.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -35,13 +30,11 @@
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSString+Ext.h>
-#import <NGLdap/NGLdapConnection.h>
 
 #import <MainUI/SOGoRootPage.h>
 
 #import "SOGoCache.h"
 #import "SOGoCASSession.h"
-#import "SOGoConstants.h"
 #import "SOGoPermissions.h"
 #import "SOGoSession.h"
 #import "SOGoSystemDefaults.h"
diff --git a/SoObjects/SOGo/SOGoWebDAVAclManager.h b/SoObjects/SOGo/SOGoWebDAVAclManager.h
index ebe0aab5b..97da808bb 100644
--- a/SoObjects/SOGo/SOGoWebDAVAclManager.h
+++ b/SoObjects/SOGo/SOGoWebDAVAclManager.h
@@ -23,7 +23,6 @@
 #ifndef SOGOWEBDAVACLMANAGER_H
 #define SOGOWEBDAVACLMANAGER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSDictionary;
 @class NSMutableDictionary;
diff --git a/SoObjects/SOGo/SOGoWebDAVAclManager.m b/SoObjects/SOGo/SOGoWebDAVAclManager.m
index dcc4210df..ff59feaab 100644
--- a/SoObjects/SOGo/SOGoWebDAVAclManager.m
+++ b/SoObjects/SOGo/SOGoWebDAVAclManager.m
@@ -19,8 +19,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/SoClass.h>
@@ -30,8 +28,6 @@
 #import "NSDictionary+Utilities.h"
 #import "NSObject+DAV.h"
 #import "SOGoObject.h"
-#import "SOGoUser.h"
-#import "SOGoWebDAVValue.h"
 
 #import "SOGoWebDAVAclManager.h"
 
diff --git a/SoObjects/SOGo/SOGoWebDAVValue.m b/SoObjects/SOGo/SOGoWebDAVValue.m
index 3734491e4..22217597f 100644
--- a/SoObjects/SOGo/SOGoWebDAVValue.m
+++ b/SoObjects/SOGo/SOGoWebDAVValue.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import "SOGoWebDAVValue.h"
 
diff --git a/SoObjects/SOGo/SQLSource.h b/SoObjects/SOGo/SQLSource.h
index 00bf48dda..572dd9b94 100644
--- a/SoObjects/SOGo/SQLSource.h
+++ b/SoObjects/SOGo/SQLSource.h
@@ -24,7 +24,6 @@
 #ifndef SQLSOURCE_H
 #define SQLSOURCE_H
 
-#import <Foundation/NSObject.h>
 
 #import "SOGoSource.h"
 
diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index 307348f80..50091584a 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -21,13 +21,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSURL.h>
 
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -39,7 +35,6 @@
 
 #import <SOGo/SOGoSystemDefaults.h>
 
-#import "SOGoConstants.h"
 #import "NSString+Utilities.h"
 #import "NSString+Crypto.h"
 
diff --git a/SoObjects/SOGo/WOContext+SOGo.m b/SoObjects/SOGo/WOContext+SOGo.m
index 1b5c0692a..18c4286b6 100644
--- a/SoObjects/SOGo/WOContext+SOGo.m
+++ b/SoObjects/SOGo/WOContext+SOGo.m
@@ -18,16 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOSession.h>
 
 #import "SOGoDomainDefaults.h"
 #import "SOGoUser.h"
-#import "SOGoUserDefaults.h"
 
 #import "WOContext+SOGo.h"
 
diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m
index d7c750b65..171861b6b 100644
--- a/SoObjects/SOGo/WORequest+SOGo.m
+++ b/SoObjects/SOGo/WORequest+SOGo.m
@@ -18,10 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 
-#import <NGObjWeb/SoObjectRequestHandler.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WEClientCapabilities.h>
 #import <NGObjWeb/WORequest+So.h>
diff --git a/SoObjects/SOGo/WOResponse+SOGo.m b/SoObjects/SOGo/WOResponse+SOGo.m
index 282a264fe..a09dbd59a 100644
--- a/SoObjects/SOGo/WOResponse+SOGo.m
+++ b/SoObjects/SOGo/WOResponse+SOGo.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import <SaxObjC/XMLNamespaces.h>
 
diff --git a/Tests/Integration/teststrings.m b/Tests/Integration/teststrings.m
index 6ae5f979e..94f98c3a7 100644
--- a/Tests/Integration/teststrings.m
+++ b/Tests/Integration/teststrings.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/Foundation.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 
diff --git a/Tests/Unit/SOGoTest.h b/Tests/Unit/SOGoTest.h
index ed49be707..db9f7d9fe 100644
--- a/Tests/Unit/SOGoTest.h
+++ b/Tests/Unit/SOGoTest.h
@@ -23,10 +23,7 @@
 #ifndef SOGOTEST_H
 #define SOGOTEST_H
 
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSArray.h>
-#import <Foundation/NSData.h>
 #import <Foundation/NSValue.h>
 
 @class NSArray;
diff --git a/Tests/Unit/SOGoTest.m b/Tests/Unit/SOGoTest.m
index 408ca77d6..ba1c00340 100644
--- a/Tests/Unit/SOGoTest.m
+++ b/Tests/Unit/SOGoTest.m
@@ -20,10 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #import "SOGoTestRunner.h"
 
diff --git a/Tests/Unit/SOGoTestRunner.h b/Tests/Unit/SOGoTestRunner.h
index 66ceabdc2..0a00be5e1 100644
--- a/Tests/Unit/SOGoTestRunner.h
+++ b/Tests/Unit/SOGoTestRunner.h
@@ -23,7 +23,6 @@
 #ifndef SOGOTESTRUNNER_H
 #define SOGOTESTRUNNER_H
 
-#import <Foundation/NSObject.h>
 
 @class NSException;
 @class NSMutableArray;
diff --git a/Tests/Unit/SOGoTestRunner.m b/Tests/Unit/SOGoTestRunner.m
index 677768bbf..e677c0105 100644
--- a/Tests/Unit/SOGoTestRunner.m
+++ b/Tests/Unit/SOGoTestRunner.m
@@ -20,13 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #import "SOGoTest.h"
 
diff --git a/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
index 885b6d912..243548384 100644
--- a/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
+++ b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
@@ -21,8 +21,6 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSFileManager.h>
 #import <Foundation/NSProcessInfo.h>
 
 #import <SaxObjC/SaxXMLReaderFactory.h>
diff --git a/Tests/Unit/TestNSData+Crypto.m b/Tests/Unit/TestNSData+Crypto.m
index 6039a9ae6..62963051e 100644
--- a/Tests/Unit/TestNSData+Crypto.m
+++ b/Tests/Unit/TestNSData+Crypto.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSData.h>
 #import "SOGo/NSData+Crypto.h"
 
 #import "SOGoTest.h"
diff --git a/Tests/Unit/TestNSString+Crypto.m b/Tests/Unit/TestNSString+Crypto.m
index f0a08c556..7d53eebc1 100644
--- a/Tests/Unit/TestNSString+Crypto.m
+++ b/Tests/Unit/TestNSString+Crypto.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 #import "SOGo/NSString+Crypto.h"
 
 #import "SOGoTest.h"
diff --git a/Tests/Unit/TestSBJsonParser.m b/Tests/Unit/TestSBJsonParser.m
index f0436af19..974751f9f 100644
--- a/Tests/Unit/TestSBJsonParser.m
+++ b/Tests/Unit/TestSBJsonParser.m
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSException.h>
-#import <Foundation/NSLocale.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
 
 #import <SBJson/SBJsonParser.h>
 
diff --git a/Tests/Unit/TestVersit.m b/Tests/Unit/TestVersit.m
index e09dce49f..fb13b5c2c 100644
--- a/Tests/Unit/TestVersit.m
+++ b/Tests/Unit/TestVersit.m
@@ -20,9 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <NGCards/CardVersitRenderer.h>
-#import <NGCards/CardElement.h>
 #import <NGCards/CardGroup.h>
 
 #import "SOGoTest.h"
diff --git a/Tests/Unit/TestiCalRecurrenceCalculator.m b/Tests/Unit/TestiCalRecurrenceCalculator.m
index ae1d34f3d..3d25f0670 100644
--- a/Tests/Unit/TestiCalRecurrenceCalculator.m
+++ b/Tests/Unit/TestiCalRecurrenceCalculator.m
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSArray.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSCalendarDate.h>
 
 #import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalRecurrenceCalculator.h>
diff --git a/Tests/Unit/TestiCalTimeZonePeriod.m b/Tests/Unit/TestiCalTimeZonePeriod.m
index 836f0e1ec..9fd73c296 100644
--- a/Tests/Unit/TestiCalTimeZonePeriod.m
+++ b/Tests/Unit/TestiCalTimeZonePeriod.m
@@ -20,11 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 
-#import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalTimeZonePeriod.h>
 #import <NGCards/NSString+NGCards.h>
 
diff --git a/Tests/Unit/sogo-tests.m b/Tests/Unit/sogo-tests.m
index d30066312..5435c9d78 100644
--- a/Tests/Unit/sogo-tests.m
+++ b/Tests/Unit/sogo-tests.m
@@ -21,7 +21,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <Foundation/NSProcessInfo.h>
 
 #import "SOGoTestRunner.h"
 
diff --git a/Tools/SOGoEAlarmsNotifier.h b/Tools/SOGoEAlarmsNotifier.h
index bc34b99c1..ab245f71b 100644
--- a/Tools/SOGoEAlarmsNotifier.h
+++ b/Tools/SOGoEAlarmsNotifier.h
@@ -21,7 +21,6 @@
 #ifndef SOGOEALARMSNOTIFIER_H
 #define SOGOEALARMSNOTIFIER_H
 
-#import <Foundation/NSObject.h>
 
 #import <SOGo/SOGoStaticAuthenticator.h>
 
diff --git a/Tools/SOGoEAlarmsNotifier.m b/Tools/SOGoEAlarmsNotifier.m
index 382e25675..0aefec114 100644
--- a/Tools/SOGoEAlarmsNotifier.m
+++ b/Tools/SOGoEAlarmsNotifier.m
@@ -20,31 +20,22 @@
 
 #include <unistd.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NGQuotedPrintableCoding.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGMail/NGMimeMessage.h>
-#import <NGMime/NGMimeBodyPart.h>
 
 #import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalEntityObject.h>
-#import <NGCards/iCalPerson.h>
 
 #import "SOGo/SOGoCredentialsFile.h"
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoMailer.h>
 #import <SOGo/SOGoProductLoader.h>
-#import <SOGo/SOGoStaticAuthenticator.h>
-#import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
 #import <Appointments/iCalPerson+SOGo.h>
 #import <Appointments/SOGoEMailAlarmsManager.h>
diff --git a/Tools/SOGoSockD.h b/Tools/SOGoSockD.h
index cd5c2993a..18508c0e6 100644
--- a/Tools/SOGoSockD.h
+++ b/Tools/SOGoSockD.h
@@ -23,7 +23,6 @@
 #ifndef SOGOSOCKD_H
 #define SOGOSOCKD_H
 
-#import <Foundation/NSObject.h>
 #import <Foundation/NSRunLoop.h>
 
 @class NGPassiveSocket;
diff --git a/Tools/SOGoSockD.m b/Tools/SOGoSockD.m
index 7ce42d362..a3a25f472 100644
--- a/Tools/SOGoSockD.m
+++ b/Tools/SOGoSockD.m
@@ -22,10 +22,8 @@
 
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSRunLoop.h>
 #import <Foundation/NSUserDefaults.h>
 
-#import <NGStreams/NGActiveSocket.h>
 #import <NGStreams/NGLocalSocketAddress.h>
 #import <NGStreams/NGPassiveSocket.h>
 
diff --git a/Tools/SOGoSockDOperation.h b/Tools/SOGoSockDOperation.h
index 671427d76..b97213fc4 100644
--- a/Tools/SOGoSockDOperation.h
+++ b/Tools/SOGoSockDOperation.h
@@ -23,7 +23,6 @@
 #ifndef SOGOSOCKDOPERATION_H
 #define SOGOSOCKDOPERATION_H
 
-#import <Foundation/NSObject.h>
 
 @class NGActiveSocket;
 
diff --git a/Tools/SOGoSockDOperation.m b/Tools/SOGoSockDOperation.m
index 56cae6b35..d3aa4f3d4 100644
--- a/Tools/SOGoSockDOperation.m
+++ b/Tools/SOGoSockDOperation.m
@@ -23,7 +23,6 @@
 #include <ldap.h>
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGStreams/NGActiveSocket.h>
diff --git a/Tools/SOGoSockDScanner.m b/Tools/SOGoSockDScanner.m
index 611549005..5a16cec34 100644
--- a/Tools/SOGoSockDScanner.m
+++ b/Tools/SOGoSockDScanner.m
@@ -23,7 +23,6 @@
 
 #import <Foundation/NSArray.h>
 
-#import "SOGoSockDOperation.h"
 
 #import "SOGoSockDScanner.h"
 
diff --git a/Tools/SOGoTool.h b/Tools/SOGoTool.h
index 8eb67d417..d75b498bb 100644
--- a/Tools/SOGoTool.h
+++ b/Tools/SOGoTool.h
@@ -21,7 +21,6 @@
 #ifndef SOGOTOOL_H
 #define SOGOTOOL_H
 
-#import <Foundation/NSObject.h>
 
 // void printStringOnChannel(int channel, NSString * format, ...);
 
diff --git a/Tools/SOGoTool.m b/Tools/SOGoTool.m
index 6bd230c3d..0a26de021 100644
--- a/Tools/SOGoTool.m
+++ b/Tools/SOGoTool.m
@@ -19,9 +19,7 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 
 #import "SOGoTool.h"
diff --git a/Tools/SOGoToolBackup.m b/Tools/SOGoToolBackup.m
index 3f2cb27bc..e22250ef2 100644
--- a/Tools/SOGoToolBackup.m
+++ b/Tools/SOGoToolBackup.m
@@ -18,9 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSError.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSString.h>
 
@@ -36,7 +34,6 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserProfile.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoSystemDefaults.h>
diff --git a/Tools/SOGoToolCheckDoubles.m b/Tools/SOGoToolCheckDoubles.m
index 75c8263c5..3d6995a10 100644
--- a/Tools/SOGoToolCheckDoubles.m
+++ b/Tools/SOGoToolCheckDoubles.m
@@ -27,8 +27,6 @@
 
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
diff --git a/Tools/SOGoToolCreateFolder.m b/Tools/SOGoToolCreateFolder.m
index 2eba46e8b..585b941f2 100644
--- a/Tools/SOGoToolCreateFolder.m
+++ b/Tools/SOGoToolCreateFolder.m
@@ -19,16 +19,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSException.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoObject.h>
 
 #import <GDLContentStore/GCSFolderManager.h>
-#import <GDLContentStore/GCSFolder.h>
 
 #import "SOGoToolRestore.h"
 
diff --git a/Tools/SOGoToolDumpDefaults.m b/Tools/SOGoToolDumpDefaults.m
index 2344c3a3c..cf3c81e65 100644
--- a/Tools/SOGoToolDumpDefaults.m
+++ b/Tools/SOGoToolDumpDefaults.m
@@ -22,12 +22,7 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
 #import <Foundation/NSPropertyList.h>
 
 #import "SOGoTool.h"
diff --git a/Tools/SOGoToolExpireAutoReply.m b/Tools/SOGoToolExpireAutoReply.m
index d3f600054..69d7235ce 100644
--- a/Tools/SOGoToolExpireAutoReply.m
+++ b/Tools/SOGoToolExpireAutoReply.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#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/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
@@ -41,10 +37,8 @@
 #import <SOGo/NSString+Utilities.h>
 #import "SOGo/SOGoCredentialsFile.h"
 #import <SOGo/SOGoProductLoader.h>
-#import <SOGo/SOGoSieveManager.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 
 #import <Mailer/SOGoMailAccounts.h>
 #import <Mailer/SOGoMailAccount.h>
diff --git a/Tools/SOGoToolExpireUserSessions.m b/Tools/SOGoToolExpireUserSessions.m
index dbe78d6d9..d711ace92 100644
--- a/Tools/SOGoToolExpireUserSessions.m
+++ b/Tools/SOGoToolExpireUserSessions.m
@@ -22,12 +22,9 @@
 
 #import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
-#import <Foundation/NSValue.h>
 
 #import <GDLAccess/EOAdaptorChannel.h>
 
@@ -37,9 +34,6 @@
 #import <NGExtensions/NSNull+misc.h>
 
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUserDefaults.h>
 
 #import "SOGoTool.h"
 
diff --git a/Tools/SOGoToolManageEAS.m b/Tools/SOGoToolManageEAS.m
index 115f49eb6..4d8154ce3 100644
--- a/Tools/SOGoToolManageEAS.m
+++ b/Tools/SOGoToolManageEAS.m
@@ -18,27 +18,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSURL.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOApplication.h>
 
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoProductLoader.h>
-#import "SOGo/SOGoCredentialsFile.h"
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUserSettings.h>
-#import <Mailer/SOGoMailAccounts.h>
-#import <Mailer/SOGoMailAccount.h>
 
 #import <SOGo/SOGoCacheGCSObject.h>
 
diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m
index 4d6a36115..5ee3a11ff 100644
--- a/Tools/SOGoToolRemoveDoubles.m
+++ b/Tools/SOGoToolRemoveDoubles.m
@@ -22,15 +22,8 @@
 
 #include <stdio.h>
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSObject.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
 #import <NGCards/NGVList.h>
@@ -40,7 +33,6 @@
 #import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 
-#import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/GCSFolderManager.h>
 #import <GDLContentStore/GCSFolder.h>
 
diff --git a/Tools/SOGoToolRenameUser.m b/Tools/SOGoToolRenameUser.m
index cf260134e..69fd01310 100644
--- a/Tools/SOGoToolRenameUser.m
+++ b/Tools/SOGoToolRenameUser.m
@@ -23,13 +23,10 @@
 #include <stdio.h>
 
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSException.h>
-#import <Foundation/NSString.h>
 
 #import <EOControl/EOQualifier.h>
-#import <GDLAccess/EOAdaptorChannel.h>
 #import <GDLAccess/EOAdaptorContext.h>
 
 #import <GDLContentStore/GCSChannelManager.h>
diff --git a/Tools/SOGoToolRestore.m b/Tools/SOGoToolRestore.m
index 5f1527cc8..4042048e9 100644
--- a/Tools/SOGoToolRestore.m
+++ b/Tools/SOGoToolRestore.m
@@ -18,9 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSError.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSString.h>
 
@@ -36,14 +34,12 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoProductLoader.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoUserProfile.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoSystemDefaults.h>
 
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/NGVCard.h>
 #import <NGCards/NGVList.h>
 
 #import "SOGoToolRestore.h"
diff --git a/Tools/SOGoToolUserPreferences.m b/Tools/SOGoToolUserPreferences.m
index 8d144fcb7..2746ba5db 100644
--- a/Tools/SOGoToolUserPreferences.m
+++ b/Tools/SOGoToolUserPreferences.m
@@ -20,21 +20,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCharacterSet.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOApplication.h>
 
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoProductLoader.h>
 #import "SOGo/SOGoCredentialsFile.h"
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <Mailer/SOGoMailAccounts.h>
diff --git a/Tools/sogo-slapd-sockd.m b/Tools/sogo-slapd-sockd.m
index 300aec4a3..2473ce84e 100644
--- a/Tools/sogo-slapd-sockd.m
+++ b/Tools/sogo-slapd-sockd.m
@@ -21,7 +21,6 @@
  */
 
 #import <Foundation/NSAutoreleasePool.h>
-#import <Foundation/NSUserDefaults.h>
 
 #import <SOGo/SOGoSystemDefaults.h>
 
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index 85c87d528..e9c0e3c2a 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -21,10 +21,7 @@
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSObject.h>
 #import <Foundation/NSProcessInfo.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
 
diff --git a/UI/AdministrationUI/UIxAdministration.m b/UI/AdministrationUI/UIxAdministration.m
index ba396a882..44134b2ab 100644
--- a/UI/AdministrationUI/UIxAdministration.m
+++ b/UI/AdministrationUI/UIxAdministration.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
 
 #import <SoObjects/SOGo/SOGoUser.h>
diff --git a/UI/AdministrationUI/UIxAdministrationAclEditor.m b/UI/AdministrationUI/UIxAdministrationAclEditor.m
index 9370aa34a..c32b2a4d9 100644
--- a/UI/AdministrationUI/UIxAdministrationAclEditor.m
+++ b/UI/AdministrationUI/UIxAdministrationAclEditor.m
@@ -18,22 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSKeyValueCoding.h>
 
-#import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
-#import <NGCards/iCalPerson.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
-#import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoGCSFolder.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserManager.h>
diff --git a/UI/Common/UIxAclEditor.m b/UI/Common/UIxAclEditor.m
index c57f41a3c..bd9e6aeb4 100644
--- a/UI/Common/UIxAclEditor.m
+++ b/UI/Common/UIxAclEditor.m
@@ -18,22 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSKeyValueCoding.h>
 
-#import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
-#import <NGCards/iCalPerson.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
-#import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoGCSFolder.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserManager.h>
diff --git a/UI/Common/UIxFolderActions.h b/UI/Common/UIxFolderActions.h
index 83d1a34c9..194bf8625 100644
--- a/UI/Common/UIxFolderActions.h
+++ b/UI/Common/UIxFolderActions.h
@@ -21,7 +21,6 @@
 #ifndef UIXFOLDERACTIONS_H
 #define UIXFOLDERACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class NSString;
 @class NSMutableString;
diff --git a/UI/Common/UIxFolderActions.m b/UI/Common/UIxFolderActions.m
index 2e3f1c3e9..5ae55c3fb 100644
--- a/UI/Common/UIxFolderActions.m
+++ b/UI/Common/UIxFolderActions.m
@@ -18,18 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/SoClassSecurityInfo.h>
 #import <NGObjWeb/NSException+HTTP.h>
 
 #import <SOGo/SOGoUserManager.h>
@@ -37,7 +32,6 @@
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoContentObject.h>
-#import <SOGo/SOGoGCSFolder.h>
 #import <SOGo/SOGoParentFolder.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
diff --git a/UI/Common/UIxObjectActions.h b/UI/Common/UIxObjectActions.h
index 02f2e532b..314a9747b 100644
--- a/UI/Common/UIxObjectActions.h
+++ b/UI/Common/UIxObjectActions.h
@@ -23,7 +23,6 @@
 #ifndef UIXOBJECTACTIONS_H
 #define UIXOBJECTACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class WOResponse;
 
diff --git a/UI/Common/UIxObjectActions.m b/UI/Common/UIxObjectActions.m
index 632327620..602f039d6 100644
--- a/UI/Common/UIxObjectActions.m
+++ b/UI/Common/UIxObjectActions.m
@@ -20,8 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -29,8 +27,6 @@
 #import <NGObjWeb/WOResponse.h>
 
 #import <SoObjects/SOGo/SOGoContentObject.h>
-#import <SoObjects/SOGo/SOGoObject.h>
-#import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 
diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m
index 3c1ef68d9..0b78dfb4f 100644
--- a/UI/Common/UIxPageFrame.m
+++ b/UI/Common/UIxPageFrame.m
@@ -21,9 +21,7 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h> /* for locale strings */
 
 #import <NGObjWeb/WOResourceManager.h>
@@ -31,8 +29,6 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoUserProfile.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoWebAuthenticator.h>
diff --git a/UI/Common/UIxParentFolderActions.h b/UI/Common/UIxParentFolderActions.h
index eeacf9f61..9b6d4cfce 100644
--- a/UI/Common/UIxParentFolderActions.h
+++ b/UI/Common/UIxParentFolderActions.h
@@ -23,7 +23,6 @@
 #ifndef UIXPARENTFOLDERACTIONS_H
 #define UIXPARENTFOLDERACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @interface UIxParentFolderActions : WODirectAction
 @end
diff --git a/UI/Common/UIxParentFolderActions.m b/UI/Common/UIxParentFolderActions.m
index 08e79d161..d1bb60342 100644
--- a/UI/Common/UIxParentFolderActions.m
+++ b/UI/Common/UIxParentFolderActions.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index e3ce52a20..bcde4b88d 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -22,12 +22,10 @@
 
 #import <Foundation/NSKeyValueCoding.h>
 #import <NGExtensions/NGExtensions.h>
-#import <NGObjWeb/NGObjWeb.h>
 #import <NGObjWeb/SoObjects.h>
 
 #import <SOGoUI/UIxComponent.h>
 
-#import <NGObjWeb/SoComponent.h>
 
 @class NSArray, NSDictionary;
 
diff --git a/UI/Common/UIxUserRightsEditor.m b/UI/Common/UIxUserRightsEditor.m
index 643a1c3fc..0546374cd 100644
--- a/UI/Common/UIxUserRightsEditor.m
+++ b/UI/Common/UIxUserRightsEditor.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOApplication.h>
@@ -29,10 +28,7 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoGroup.h>
-#import <SOGo/SOGoObject.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserManager.h>
 
 #import <UI/SOGoUI/SOGoACLAdvisory.h>
diff --git a/UI/Common/WODirectAction+SOGo.m b/UI/Common/WODirectAction+SOGo.m
index 12dc4d019..5055c2db1 100644
--- a/UI/Common/WODirectAction+SOGo.m
+++ b/UI/Common/WODirectAction+SOGo.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSBundle.h>
 #import <Foundation/NSKeyValueCoding.h>
 
 #import <NGObjWeb/SoObjects.h>
@@ -29,8 +27,6 @@
 #import <SoObjects/SOGo/NSObject+Utilities.h>
 #import <SoObjects/SOGo/NSDictionary+Utilities.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
-#import <SoObjects/SOGo/SOGoUser.h>
-#import <SoObjects/SOGo/SOGoUserDefaults.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
diff --git a/UI/Contacts/UIxContactActions.m b/UI/Contacts/UIxContactActions.m
index 9706e402c..fa50fe1db 100644
--- a/UI/Contacts/UIxContactActions.m
+++ b/UI/Contacts/UIxContactActions.m
@@ -21,10 +21,8 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WODirectAction.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index dd9212c85..0c9697d2f 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -20,33 +20,25 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSURL.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSCalendarDate.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoPermissions.h>
 #import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSNull+misc.h>
 
-#import <NGCards/NGVCard.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 
 #import <Contacts/NGVCard+SOGo.h>
-#import <Contacts/SOGoContactFolder.h>
 #import <Contacts/SOGoContactFolders.h>
-#import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactGCSFolder.h>
 
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 33e4afe6f..9fbc81850 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -26,7 +26,6 @@
 #import <SoObjects/SOGo/NSString+Utilities.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
 #define COMPILING_NGOBJWEB 1 /* we want httpRequest for parsing multi-part
                                 form data */
@@ -38,10 +37,6 @@
 #import <NGHttp/NGHttpRequest.h>
 #import <NGMime/NGMimeMultipartBody.h>
 
-#import <Contacts/SOGoContactObject.h>
-#import <Contacts/SOGoContactFolder.h>
-#import <Contacts/SOGoContactFolders.h>
-#import <Contacts/SOGoContactGCSFolder.h>
 #import <Contacts/NSDictionary+LDIF.h>
 
 #import <SoObjects/Contacts/NGVCard+SOGo.h>
@@ -50,7 +45,6 @@
 #import <SoObjects/Contacts/SOGoContactLDIFEntry.h>
 #import <SoObjects/Contacts/SOGoContactGCSList.h>
 #import <SoObjects/Contacts/SOGoContactGCSFolder.h>
-#import <GDLContentStore/GCSFolder.h>
 
 #import <SOGo/NSString+Utilities.h>
 
diff --git a/UI/Contacts/UIxContactFolderProperties.m b/UI/Contacts/UIxContactFolderProperties.m
index add74c931..2adcecb82 100644
--- a/UI/Contacts/UIxContactFolderProperties.m
+++ b/UI/Contacts/UIxContactFolderProperties.m
@@ -19,16 +19,11 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WORequest.h>
 
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
-#import <SOGo/SOGoSystemDefaults.h>
 
 #import <Contacts/SOGoContactGCSFolder.h>
 
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index 111af01b6..8b24dc109 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -18,36 +18,24 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
 #import <NGExtensions/NSNull+misc.h>
 
-#import <GDLContentStore/GCSFolder.h>
-#import <GDLContentStore/GCSFolderManager.h>
 
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <Contacts/SOGoContactFolders.h>
-#import <Contacts/SOGoContactFolder.h>
 #import <Contacts/SOGoContactGCSFolder.h>
 #import <Contacts/SOGoContactSourceFolder.h>
 
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index ac61300c3..758209d2a 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -24,9 +24,6 @@
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOResponse.h>
-#import <NGCards/NGVCard.h>
-#import <NGCards/NGVCardPhoto.h>
-#import <NGCards/CardElement.h>
 #import <NGCards/NSArray+NGCards.h>
 #import <NGExtensions/NSString+Ext.h>
 #import <NGExtensions/NSString+misc.h>
@@ -34,7 +31,6 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSDictionary+Utilities.h>
-#import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 
diff --git a/UI/Contacts/UIxContactsListActions.h b/UI/Contacts/UIxContactsListActions.h
index 875fed8f4..2bd06c98c 100644
--- a/UI/Contacts/UIxContactsListActions.h
+++ b/UI/Contacts/UIxContactsListActions.h
@@ -22,7 +22,6 @@
 #ifndef __UIxContactsListActions_H__
 #define __UIxContactsListActions_H__
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class NSDictionary;
 @class NSString;
diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m
index dbaf94505..dccbcf960 100644
--- a/UI/Contacts/UIxContactsListActions.m
+++ b/UI/Contacts/UIxContactsListActions.m
@@ -26,7 +26,6 @@
 #import <SoObjects/SOGo/SOGoSystemDefaults.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WORequest.h>
@@ -35,20 +34,12 @@
 
 #import <Common/WODirectAction+SOGo.h>
 
-#import <Contacts/SOGoContactObject.h>
-#import <Contacts/SOGoContactFolder.h>
-#import <Contacts/SOGoContactFolders.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserSettings.h>
 
-#import <NGCards/NGVCard.h>
-#import <NGCards/NGVList.h>
 #import <SoObjects/Contacts/SOGoContactGCSEntry.h>
-#import <SoObjects/Contacts/SOGoContactLDIFEntry.h>
-#import <SoObjects/Contacts/SOGoContactGCSList.h>
 #import <SoObjects/Contacts/SOGoContactGCSFolder.h>
-#import <GDLContentStore/GCSFolder.h>
 
 #import "UIxContactsListActions.h"
 
diff --git a/UI/Contacts/UIxContactsUserRightsEditor.m b/UI/Contacts/UIxContactsUserRightsEditor.m
index 09114b373..11677122a 100644
--- a/UI/Contacts/UIxContactsUserRightsEditor.m
+++ b/UI/Contacts/UIxContactsUserRightsEditor.m
@@ -18,12 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WORequest.h>
 
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
diff --git a/UI/Contacts/UIxListEditor.m b/UI/Contacts/UIxListEditor.m
index 10ea2736e..6a1aa9cfa 100644
--- a/UI/Contacts/UIxListEditor.m
+++ b/UI/Contacts/UIxListEditor.m
@@ -18,9 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/NSException+HTTP.h>
@@ -34,7 +31,6 @@
 
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactGCSFolder.h>
-#import <Contacts/SOGoContactGCSList.h>
 
 #import "UIxListEditor.h"
 
diff --git a/UI/Contacts/UIxListView.m b/UI/Contacts/UIxListView.m
index dcea4d3bc..da00ff65a 100644
--- a/UI/Contacts/UIxListView.m
+++ b/UI/Contacts/UIxListView.m
@@ -21,7 +21,6 @@
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGCards/NGVList.h>
-#import <NGCards/NGVCard.h>
 #import <NGCards/NGVCardReference.h>
 
 #import <SOGo/NSArray+Utilities.h>
diff --git a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
index 68c402e58..094826204 100644
--- a/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
+++ b/UI/MailPartViewers/UIxMailPartAlternativeViewer.m
@@ -27,7 +27,6 @@
 
 #import <UI/MailerUI/WOContext+UIxMailer.h>
 
-#import "UIxMailPartViewer.h"
 #import "UIxMailPartMixedViewer.h"
 #import "UIxMailRenderingContext.h"
 
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index e472e735a..a807b56d5 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -18,21 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSData.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSValue.h>
 
-#import <SaxObjC/SaxAttributes.h>
-#import <SaxObjC/SaxContentHandler.h>
 #import <SaxObjC/SaxLexicalHandler.h>
-#import <SaxObjC/SaxXMLReader.h>
 #import <SaxObjC/SaxXMLReaderFactory.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSString+Encoding.h>
-#import <NGObjWeb/SoObjects.h>
 
 #include <libxml/encoding.h>
 
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.h b/UI/MailPartViewers/UIxMailPartICalActions.h
index b90b921e0..a0299402e 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.h
+++ b/UI/MailPartViewers/UIxMailPartICalActions.h
@@ -23,7 +23,6 @@
 #ifndef UIXMAILPARTICALACTIONS_H
 #define UIXMAILPARTICALACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class iCalCalendar;
 @class SOGoMailBodyPart;
diff --git a/UI/MailPartViewers/UIxMailPartICalActions.m b/UI/MailPartViewers/UIxMailPartICalActions.m
index d8939d818..b7c15267f 100644
--- a/UI/MailPartViewers/UIxMailPartICalActions.m
+++ b/UI/MailPartViewers/UIxMailPartICalActions.m
@@ -20,7 +20,6 @@
 
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
@@ -32,8 +31,6 @@
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
 
 #import <UI/Common/WODirectAction+SOGo.h>
 
@@ -45,7 +42,6 @@
 #import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
 #import <Mailer/SOGoMailObject.h>
-#import <SOGo/SOGoParentFolder.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/NSString+Utilities.h>
 #import <Mailer/SOGoMailBodyPart.h>
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index 0cddac5b0..caacda76d 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -29,7 +29,6 @@
 #import <Foundation/NSException.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOResponse.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -39,7 +38,6 @@
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalPerson.h>
-#import <NGCards/iCalDateTime.h>
 
 #import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
diff --git a/UI/MailPartViewers/UIxMailPartImageViewer.m b/UI/MailPartViewers/UIxMailPartImageViewer.m
index 33bbfee45..7fd4494bb 100644
--- a/UI/MailPartViewers/UIxMailPartImageViewer.m
+++ b/UI/MailPartViewers/UIxMailPartImageViewer.m
@@ -20,7 +20,6 @@
   02111-1307, USA.
 */
 
-#import <SoObjects/Mailer/SOGoMailBodyPart.h>
 
 #import "UIxMailPartViewer.h"
 
diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index a07c64145..82cb581fe 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -26,11 +26,8 @@
 #include <openssl/x509.h>
 #endif
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
-#import <NGMime/NGPart.h>
-#import <Mailer/SOGoMailObject.h>
 
 #import "UIxMailRenderingContext.h"
 #import "UIxMailPartSignedViewer.h"
diff --git a/UI/MailPartViewers/UIxMailPartTextViewer.m b/UI/MailPartViewers/UIxMailPartTextViewer.m
index e5f84d379..227b8e8bb 100644
--- a/UI/MailPartViewers/UIxMailPartTextViewer.m
+++ b/UI/MailPartViewers/UIxMailPartTextViewer.m
@@ -27,7 +27,6 @@
   TODO: add contained link detection.
 */
 
-#import <Foundation/NSException.h>
 
 #import <NGExtensions/NSString+misc.h>
 
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 52ad5982c..dcc9c4098 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -20,14 +20,10 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 
-#import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
-#import <NGExtensions/NGQuotedPrintableCoding.h>
 #import <NGExtensions/NSString+Encoding.h>
 #import <NGExtensions/NSString+misc.h>
 
@@ -41,7 +37,6 @@
 #import "MailerUI/WOContext+UIxMailer.h"
 #import "UIxMailRenderingContext.h"
 #import "UIxMailSizeFormatter.h"
-#import "SOGoUI/UIxComponent.h"
 
 #import "UIxMailPartViewer.h"
 
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.h b/UI/MailPartViewers/UIxMailRenderingContext.h
index 1ac62538f..967d8669a 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.h
+++ b/UI/MailPartViewers/UIxMailRenderingContext.h
@@ -22,7 +22,6 @@
 #ifndef __Mailer_UIxMailRenderingContext_H__
 #define __Mailer_UIxMailRenderingContext_H__
 
-#import <Foundation/NSObject.h>
 
 #include <NGObjWeb/WOContext.h>
 
diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m
index ca76bc739..b229b01fe 100644
--- a/UI/MailPartViewers/UIxMailRenderingContext.m
+++ b/UI/MailPartViewers/UIxMailRenderingContext.m
@@ -21,7 +21,6 @@
 */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOComponent.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/UI/MailerUI/UIxFilterList.m b/UI/MailerUI/UIxFilterList.m
index 453d9ac41..5691d2b48 100644
--- a/UI/MailerUI/UIxFilterList.m
+++ b/UI/MailerUI/UIxFilterList.m
@@ -19,11 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
-#import <NGObjWeb/SoObject.h>
-#import <SoObjects/Mailer/SOGoMailFolder.h>
-#import <SoObjects/Mailer/SOGoMailObject.h>
-#import <SOGoUI/UIxComponent.h>
 
 /*
   UIxFilterList
diff --git a/UI/MailerUI/UIxMailAccountActions.h b/UI/MailerUI/UIxMailAccountActions.h
index 286b543c5..4dfc9b457 100644
--- a/UI/MailerUI/UIxMailAccountActions.h
+++ b/UI/MailerUI/UIxMailAccountActions.h
@@ -21,7 +21,6 @@
 #ifndef UIXMAILACCOUNTACTIONS_H
 #define UIXMAILACCOUNTACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class WOResponse;
 
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index aa54cead7..ecc739855 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -18,17 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
-#import <NGImap4/NGImap4Connection.h>
-#import <NGImap4/NGImap4Client.h>
 #import <NGImap4/NSString+Imap4.h>
 #import <NGExtensions/NSString+misc.h>
 
@@ -40,7 +33,6 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserManager.h>
 
 #import "../Common/WODirectAction+SOGo.h"
 
diff --git a/UI/MailerUI/UIxMailActions.h b/UI/MailerUI/UIxMailActions.h
index 80292b24a..e2d92cd7a 100644
--- a/UI/MailerUI/UIxMailActions.h
+++ b/UI/MailerUI/UIxMailActions.h
@@ -21,7 +21,6 @@
 #ifndef UIXMAILACTIONS_H
 #define UIXMAILACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @interface UIxMailActions : WODirectAction
 @end
diff --git a/UI/MailerUI/UIxMailActions.m b/UI/MailerUI/UIxMailActions.m
index 0f60f64d8..74f32775b 100644
--- a/UI/MailerUI/UIxMailActions.m
+++ b/UI/MailerUI/UIxMailActions.m
@@ -18,15 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 
 #import <SoObjects/Mailer/SOGoDraftObject.h>
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index ec4260c44..7d42e4d99 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -19,28 +19,17 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSFileManager.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
 
 #import <NGHttp/NGHttpRequest.h>
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoSubContext.h>
 #define COMPILING_NGOBJWEB 1 /* we want httpRequest for parsing multi-part
                                 form data */
 #import <NGObjWeb/WORequest.h>
 #undef COMPILING_NGOBJWEB
-#import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSException+misc.h>
-#import <NGMail/NGMimeMessage.h>
-#import <NGMail/NGMimeMessageGenerator.h>
 #import <NGMime/NGMimeBodyPart.h>
 #import <NGMime/NGMimeHeaderFields.h>
 #import <NGMime/NGMimeMultipartBody.h>
@@ -48,9 +37,7 @@
 
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoSystemDefaults.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
@@ -60,10 +47,6 @@
 #import <Mailer/SOGoMailObject+Draft.h>
 #import <Mailer/SOGoMailFolder.h>
 #import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailAccounts.h>
-#import <Contacts/SOGoContactFolders.h>
-#import <Contacts/SOGoContactFolder.h>
-#import <Contacts/SOGoContactSourceFolder.h>
 
 #import <UI/MailPartViewers/UIxMailSizeFormatter.h>
 
diff --git a/UI/MailerUI/UIxMailFolderActions.h b/UI/MailerUI/UIxMailFolderActions.h
index 06fa82a05..42c0dc84b 100644
--- a/UI/MailerUI/UIxMailFolderActions.h
+++ b/UI/MailerUI/UIxMailFolderActions.h
@@ -21,7 +21,6 @@
 #ifndef UIXMAILFOLDERACTIONS_H
 #define UIXMAILFOLDERACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class WOResponse;
 
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 55a03b319..56fcc7330 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -18,33 +18,24 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WORequest.h>
 
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
 #import <NGImap4/NSString+Imap4.h>
 
-#import <EOControl/EOQualifier.h>
 
 #import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailFolder.h>
-#import <Mailer/SOGoMailObject.h>
 #import <Mailer/SOGoTrashFolder.h>
 
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 
 #import <UI/Common/WODirectAction+SOGo.h>
diff --git a/UI/MailerUI/UIxMailFormatter.m b/UI/MailerUI/UIxMailFormatter.m
index 76bb7c86f..b54a97810 100644
--- a/UI/MailerUI/UIxMailFormatter.m
+++ b/UI/MailerUI/UIxMailFormatter.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/UI/MailerUI/UIxMailListActions.h b/UI/MailerUI/UIxMailListActions.h
index 1d6605006..c85ab9fbd 100644
--- a/UI/MailerUI/UIxMailListActions.h
+++ b/UI/MailerUI/UIxMailListActions.h
@@ -23,7 +23,6 @@
 #ifndef UIXMAILLISTACTIONS_H
 #define UIXMAILLISTACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @class NSDictionary;
 @class EOQualifier;
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index fa0f3511a..2d571815c 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -28,15 +28,12 @@
 
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h> /* for locale string constants */
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/NSException+HTTP.h>
@@ -50,8 +47,6 @@
 #import <Mailer/NSString+Mail.h>
 #import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailFolder.h>
-#import <Mailer/SOGoMailObject.h>
 #import <Mailer/SOGoSentFolder.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
diff --git a/UI/MailerUI/UIxMailMainFrame.h b/UI/MailerUI/UIxMailMainFrame.h
index b51116dc2..256eb218d 100644
--- a/UI/MailerUI/UIxMailMainFrame.h
+++ b/UI/MailerUI/UIxMailMainFrame.h
@@ -21,7 +21,6 @@
 #ifndef UIXMAILMAINFRAME_H
 #define UIXMAILMAINFRAME_H
 
-#import "../SOGoUI/UIxComponent.h"
 
 @class SOGoMailLabel;
 
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 99ce6edc7..782322229 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -19,22 +19,15 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSValue.h>
 
-#import <EOControl/EOQualifier.h>
 
-#import <NGCards/NGVCard.h>
 #import <NGCards/NGVCardReference.h>
 #import <NGCards/NGVList.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
-#import <NGObjWeb/SoComponent.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 
-#import <Contacts/SOGoContactObject.h>
 #import <Contacts/SOGoContactGCSList.h>
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactFolders.h>
@@ -43,9 +36,7 @@
 #import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
-#import <Mailer/SOGoMailFolder.h>
 #import <Mailer/SOGoMailLabel.h>
-#import <Mailer/SOGoMailObject.h>
 #import <Mailer/SOGoSentFolder.h>
 #import <SOGo/NSDictionary+URL.h>
 #import <SOGo/NSArray+Utilities.h>
@@ -53,13 +44,10 @@
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUserSettings.h>
-#import <SOGoUI/UIxComponent.h>
 
 #import "UIxMailMainFrame.h"
-#import "UIxMailListActions.h"
 
 // Avoid compilation warnings
 @interface SOGoUserFolder (private)
diff --git a/UI/MailerUI/UIxMailSearch.m b/UI/MailerUI/UIxMailSearch.m
index 92a1ef427..0459848ef 100644
--- a/UI/MailerUI/UIxMailSearch.m
+++ b/UI/MailerUI/UIxMailSearch.m
@@ -18,13 +18,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailAccounts.h>
-#import <SOGo/SOGoUserFolder.h>
 
 #import <UIxMailSearch.h>
 
diff --git a/UI/MailerUI/UIxMailSourceView.h b/UI/MailerUI/UIxMailSourceView.h
index 1ec6d50cd..0b60fa6e6 100644
--- a/UI/MailerUI/UIxMailSourceView.h
+++ b/UI/MailerUI/UIxMailSourceView.h
@@ -21,7 +21,6 @@
 #ifndef UIXMAILSOURCEVIEW_H
 #define UIXMAILSOURCEVIEW_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @interface UIxMailSourceView : WODirectAction
 
diff --git a/UI/MailerUI/UIxMailSourceView.m b/UI/MailerUI/UIxMailSourceView.m
index 1d36398ca..cadb46140 100644
--- a/UI/MailerUI/UIxMailSourceView.m
+++ b/UI/MailerUI/UIxMailSourceView.m
@@ -18,11 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSString+misc.h>
 
-#import <Foundation/NSString.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
 
 #import <UI/Common/WODirectAction+SOGo.h>
diff --git a/UI/MailerUI/UIxMailToSelection.m b/UI/MailerUI/UIxMailToSelection.m
index 407125505..89db70a2c 100644
--- a/UI/MailerUI/UIxMailToSelection.m
+++ b/UI/MailerUI/UIxMailToSelection.m
@@ -20,12 +20,9 @@
 */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 
 #import <NGObjWeb/WORequest.h>
 #import <NGExtensions/NSNull+misc.h>
-#import <NGMail/NGMailAddress.h>
-#import <NGMail/NGMailAddressParser.h>
 
 #import <SOGoUI/UIxComponent.h>
 
diff --git a/UI/MailerUI/UIxMailUserDelegationEditor.m b/UI/MailerUI/UIxMailUserDelegationEditor.m
index d79e6293c..e781ee0af 100644
--- a/UI/MailerUI/UIxMailUserDelegationEditor.m
+++ b/UI/MailerUI/UIxMailUserDelegationEditor.m
@@ -19,10 +19,7 @@
  */
 
 #import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
-#import <SOGo/SOGoUserManager.h>
-#import <Mailer/SOGoMailAccount.h>
 
 #import <SOGoUI/UIxComponent.h>
 
diff --git a/UI/MailerUI/UIxMailUserRightsEditor.m b/UI/MailerUI/UIxMailUserRightsEditor.m
index e1ed33c38..db5840298 100644
--- a/UI/MailerUI/UIxMailUserRightsEditor.m
+++ b/UI/MailerUI/UIxMailUserRightsEditor.m
@@ -18,13 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSValue.h>
-#import <NGObjWeb/WORequest.h>
 #import <Mailer/SOGoMailAccount.h>
-#import <Mailer/SOGoMailFolder.h>
 #import <SOGo/SOGoPermissions.h>
 
 #import "UIxMailUserRightsEditor.h"
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index f51a0536e..4068f1c8f 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -19,13 +19,10 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSException+misc.h>
 #import <NGExtensions/NGHashMap.h>
 #import <NGExtensions/NSString+misc.h>
@@ -37,9 +34,6 @@
 #import <NGMail/NGMimeMessage.h>
 #import <NGMail/NGMimeMessageGenerator.h>
 
-#import <NGImap4/NGImap4Client.h>
-#import <NGImap4/NGImap4Connection.h>
-#import <NGImap4/NGImap4Envelope.h>
 #import <NGImap4/NGImap4EnvelopeAddress.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
@@ -48,11 +42,7 @@
 #import <SOGo/SOGoMailer.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoUserManager.h>
-#import <SOGoUI/UIxComponent.h>
 #import <Mailer/SOGoMailObject.h>
-#import <Mailer/SOGoDraftObject.h>
-#import <Mailer/SOGoDraftsFolder.h>
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoMailFolder.h>
 #import <MailPartViewers/UIxMailRenderingContext.h> // cyclic
diff --git a/UI/MainUI/SOGoBrowsersPanel.m b/UI/MainUI/SOGoBrowsersPanel.m
index a5285a6fd..19704abaf 100644
--- a/UI/MainUI/SOGoBrowsersPanel.m
+++ b/UI/MainUI/SOGoBrowsersPanel.m
@@ -21,8 +21,6 @@
  */
 
 #import <NGObjWeb/WEClientCapabilities.h>
-#import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WORequest.h>
 
 #import "SOGoBrowsersPanel.h"
 
diff --git a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
index d783e13f5..5761d65ff 100644
--- a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
+++ b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
@@ -19,17 +19,12 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSBundle.h>
 
 #import <SOGo/SOGoCache.h>
 #import <SOGo/NSObject+Utilities.h>
-#import <SOGo/SOGoFolder.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOContext.h>
-#import <NGObjWeb/WODirectAction.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import <Common/WODirectAction+SOGo.h>
 #import <ActiveSync/SOGoActiveSyncDispatcher.h>
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 289e816e6..b1c3ff2d0 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -21,16 +21,9 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSTimeZone.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSValue.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOCookie.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -47,8 +40,6 @@
 #import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoCASSession.h>
-#import <SOGo/SOGoConstants.h>
-#import <SOGo/SOGoDomainDefaults.h>
 #if defined(SAML2_CONFIG)
 #import <SOGo/SOGoSAML2Session.h>
 #endif /* SAML2_ENABLE */
diff --git a/UI/MainUI/SOGoSAML2Actions.m b/UI/MainUI/SOGoSAML2Actions.m
index 09bc3d060..eb7a01d2f 100644
--- a/UI/MainUI/SOGoSAML2Actions.m
+++ b/UI/MainUI/SOGoSAML2Actions.m
@@ -18,15 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSTimeZone.h>
 
 #import <NGObjWeb/SoApplication.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOCookie.h>
-#import <NGObjWeb/WODirectAction.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index ea8f7064f..7770e9e07 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -18,13 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSURL.h>
-#import <Foundation/NSTimeZone.h>
-#import <Foundation/NSValue.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/WOCookie.h>
 #import <NGObjWeb/WORequest.h>
@@ -42,7 +35,6 @@
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoWebAuthenticator.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoSession.h>
 #import <SOGo/SOGoSystemDefaults.h>
diff --git a/UI/MainUI/UIxLoading.m b/UI/MainUI/UIxLoading.m
index 6647658d1..42ff96656 100644
--- a/UI/MainUI/UIxLoading.m
+++ b/UI/MainUI/UIxLoading.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import "UIxLoading.h"
 
diff --git a/UI/PreferencesUI/UIxAccountEditor.m b/UI/PreferencesUI/UIxAccountEditor.m
index 6288abf8c..2b227d2e5 100644
--- a/UI/PreferencesUI/UIxAccountEditor.m
+++ b/UI/PreferencesUI/UIxAccountEditor.m
@@ -19,16 +19,12 @@
  */
 
 #import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoSystemDefaults.h>
 
 #import <SOGoUI/UIxComponent.h>
 
diff --git a/UI/PreferencesUI/UIxFilterEditor.m b/UI/PreferencesUI/UIxFilterEditor.m
index 7ddfcefb4..275111cad 100644
--- a/UI/PreferencesUI/UIxFilterEditor.m
+++ b/UI/PreferencesUI/UIxFilterEditor.m
@@ -19,7 +19,6 @@
  */
 
 #import <Foundation/NSCharacterSet.h>
-#import <Foundation/NSDictionary.h>
 
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
@@ -27,7 +26,6 @@
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoSystemDefaults.h>
 
 #import <SOGoUI/UIxComponent.h>
diff --git a/UI/PreferencesUI/UIxJSONPreferences.h b/UI/PreferencesUI/UIxJSONPreferences.h
index 4e9dfc573..f095254fc 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.h
+++ b/UI/PreferencesUI/UIxJSONPreferences.h
@@ -21,7 +21,6 @@
 #ifndef UIXJSONPREFERENCES_H
 #define UIXJSONPREFERENCES_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @interface UIxJSONPreferences : WODirectAction
 
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 67d405219..74519cacb 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -23,8 +23,6 @@
 
 #import <NGObjWeb/SoObjects.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
-#import <NGObjWeb/WODirectAction.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
@@ -35,7 +33,6 @@
 #import <SOGo/WOResourceManager+SOGo.h>
 #import <Mailer/SOGoMailLabel.h>
 
-#import <SOGoUI/UIxComponent.h>
 #import <UI/Common/WODirectAction+SOGo.h>
 
 #import "UIxJSONPreferences.h"
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index d640fe4f2..7155c4b3d 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -19,31 +19,22 @@
  */
 
 #import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSPropertyList.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h> /* for locale strings */
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
 
-#import <NGImap4/NGSieveClient.h>
 #import <NGImap4/NSString+Imap4.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 
 #import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalTimeZonePeriod.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
-#import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoSieveManager.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUserFolder.h>
diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m
index f65c161c6..001838a04 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -31,7 +31,6 @@
 
 #import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoUser.h>
-#import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoUserManager.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
diff --git a/UI/SOGoUI/SOGoFolderAdvisory.m b/UI/SOGoUI/SOGoFolderAdvisory.m
index 2943b5915..5ede9ee7e 100644
--- a/UI/SOGoUI/SOGoFolderAdvisory.m
+++ b/UI/SOGoUI/SOGoFolderAdvisory.m
@@ -31,7 +31,6 @@
 
 #import <SoObjects/SOGo/SOGoMailer.h>
 #import <SoObjects/SOGo/SOGoUser.h>
-#import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoUserManager.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 75f5b87a6..46b368a46 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -20,18 +20,10 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSPathUtilities.h>
 #import <Foundation/NSUserDefaults.h> /* for locale strings */
-#import <Foundation/NSString.h>
 
-#import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGObjWeb/SoObjects.h>
-#import <NGObjWeb/SoProduct.h>
-#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -43,19 +35,14 @@
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoBuild.h>
-#import <SOGo/SOGoContentObject.h>
-#import <SOGo/SOGoObject.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserFolder.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/WOContext+SOGo.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 
 #import "UIxJSClose.h"
 
-#import "UIxComponent.h"
 
 @interface UIxComponent (PrivateAPI)
 - (void)_parseQueryString:(NSString *)_s;
diff --git a/UI/SOGoUI/UIxJSClose.m b/UI/SOGoUI/UIxJSClose.m
index 936855232..87d4fa45d 100644
--- a/UI/SOGoUI/UIxJSClose.m
+++ b/UI/SOGoUI/UIxJSClose.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
 
 #import "UIxJSClose.h"
 
diff --git a/UI/Scheduler/NSArray+Scheduler.h b/UI/Scheduler/NSArray+Scheduler.h
index c961585c9..19c5d4664 100644
--- a/UI/Scheduler/NSArray+Scheduler.h
+++ b/UI/Scheduler/NSArray+Scheduler.h
@@ -23,7 +23,6 @@
 #ifndef	NSARRAY_SCHEDULER_H
 #define	NSARRAY_SCHEDULER_H
 
-#import <Foundation/NSArray.h>
 
 // See [UIxCalListingActions initialize]
 #define eventNameIndex              0
diff --git a/UI/Scheduler/NSArray+Scheduler.m b/UI/Scheduler/NSArray+Scheduler.m
index fffd390f0..b7a83a291 100644
--- a/UI/Scheduler/NSArray+Scheduler.m
+++ b/UI/Scheduler/NSArray+Scheduler.m
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSNull.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NGCalendarDateRange.h>
diff --git a/UI/Scheduler/UIxAppointmentActions.h b/UI/Scheduler/UIxAppointmentActions.h
index 58657e3d1..c7554918e 100644
--- a/UI/Scheduler/UIxAppointmentActions.h
+++ b/UI/Scheduler/UIxAppointmentActions.h
@@ -23,7 +23,6 @@
 #ifndef UIXAPPOINTMENTACTIONS_H
 #define UIXAPPOINTMENTACTIONS_H
 
-#import <NGObjWeb/WODirectAction.h>
 
 @interface UIxAppointmentActions : WODirectAction
 
diff --git a/UI/Scheduler/UIxAppointmentActions.m b/UI/Scheduler/UIxAppointmentActions.m
index 0ad458e84..0ac9c9c11 100644
--- a/UI/Scheduler/UIxAppointmentActions.m
+++ b/UI/Scheduler/UIxAppointmentActions.m
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSArray.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSObject+Values.h>
@@ -35,7 +31,6 @@
 #import <NGObjWeb/WORequest.h>
 
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEvent.h>
 
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSDictionary+Utilities.h>
diff --git a/UI/Scheduler/UIxAppointmentEditor.h b/UI/Scheduler/UIxAppointmentEditor.h
index ece2c9c6d..5fabc80dd 100644
--- a/UI/Scheduler/UIxAppointmentEditor.h
+++ b/UI/Scheduler/UIxAppointmentEditor.h
@@ -21,7 +21,6 @@
 #ifndef UIXAPPOINTMENTEDITOR_H
 #define UIXAPPOINTMENTEDITOR_H
 
-#import <SOGoUI/UIxComponent.h>
 
 @class iCalEvent;
 
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index be5aa1ddc..68298a97f 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -20,35 +20,24 @@
 
 #include <math.h>
 
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/SoPermissions.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
-#import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 
-#import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
 #import <NGCards/iCalTrigger.h>
 #import <NGCards/iCalRecurrenceRule.h>
-#import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalDateTime.h>
 
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
@@ -61,7 +50,6 @@
 #import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/SOGoAppointmentOccurence.h>
 
-#import <Appointments/SOGoComponentOccurence.h>
 
 #import "UIxComponentEditor.h"
 #import "UIxAppointmentEditor.h"
diff --git a/UI/Scheduler/UIxAttendeesEditor.h b/UI/Scheduler/UIxAttendeesEditor.h
index 4e08ccfa1..a082c015c 100644
--- a/UI/Scheduler/UIxAttendeesEditor.h
+++ b/UI/Scheduler/UIxAttendeesEditor.h
@@ -21,7 +21,6 @@
 #ifndef UIXATTENDEESEDITOR_H
 #define UIXATTENDEESEDITOR_H
 
-#import <SOGoUI/UIxComponent.h>
 
 @interface UIxAttendeesEditor : UIxComponent
 {
diff --git a/UI/Scheduler/UIxAttendeesEditor.m b/UI/Scheduler/UIxAttendeesEditor.m
index ae7de6700..b2cad73da 100644
--- a/UI/Scheduler/UIxAttendeesEditor.m
+++ b/UI/Scheduler/UIxAttendeesEditor.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index b601134d2..2c22f5ae6 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -20,16 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h> /* for locale string constants */
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
-#import <EOControl/EOQualifier.h>
 
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/SOGoDateFormatter.h>
diff --git a/UI/Scheduler/UIxCalDayView.m b/UI/Scheduler/UIxCalDayView.m
index 8f2644370..48d8d4de3 100644
--- a/UI/Scheduler/UIxCalDayView.m
+++ b/UI/Scheduler/UIxCalDayView.m
@@ -19,19 +19,11 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSValue.h>
 
-#import <EOControl/EOQualifier.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
-#import <NGExtensions/NGCalendarDateRange.h>
 
-#import <SoObjects/SOGo/SOGoDateFormatter.h>
 
 #import "UIxCalDayView.h"
 
diff --git a/UI/Scheduler/UIxCalFilterPanel.m b/UI/Scheduler/UIxCalFilterPanel.m
index 21a5b2a57..55ee785ad 100644
--- a/UI/Scheduler/UIxCalFilterPanel.m
+++ b/UI/Scheduler/UIxCalFilterPanel.m
@@ -20,12 +20,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSKeyValueCoding.h>
 
-#import <NGObjWeb/WOContext.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserSettings.h>
diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m
index f8ee346c0..ad90b2aa5 100644
--- a/UI/Scheduler/UIxCalFolderActions.m
+++ b/UI/Scheduler/UIxCalFolderActions.m
@@ -29,7 +29,6 @@
 
 #import <SOGo/NSDictionary+Utilities.h>
 
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoWebAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolderICS.h>
 
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index 69b46cd42..ab96718eb 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -18,28 +18,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSNull.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSUserDefaults.h> /* for locale string constants */
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WOApplication.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import <NGCards/iCalPerson.h>
-#import <NGCards/iCalTimeZone.h>
-#import <NGCards/iCalDateTime.h>
 #import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalObject.h>
 
-#import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
@@ -48,15 +39,12 @@
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/WOResourceManager+SOGo.h>
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
-#import <Appointments/SOGoAppointmentObject.h>
 #import <Appointments/SOGoWebAppointmentFolder.h>
 
 #import <UI/Common/WODirectAction+SOGo.h>
diff --git a/UI/Scheduler/UIxCalMainActions.m b/UI/Scheduler/UIxCalMainActions.m
index 7e659ba78..d76490a82 100644
--- a/UI/Scheduler/UIxCalMainActions.m
+++ b/UI/Scheduler/UIxCalMainActions.m
@@ -18,16 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/Foundation.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index 443fadfa3..b88992ecc 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -18,28 +18,21 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
-#import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WORequest.h>
-#import <NGObjWeb/WOResponse.h>
 
 #import <NGCards/iCalPerson.h>
 
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
 
 #import "UIxCalMainView.h"
diff --git a/UI/Scheduler/UIxCalMonthOverview.m b/UI/Scheduler/UIxCalMonthOverview.m
index ce59b9e08..3c7adf4ac 100644
--- a/UI/Scheduler/UIxCalMonthOverview.m
+++ b/UI/Scheduler/UIxCalMonthOverview.m
@@ -1,5 +1,4 @@
 
-#import <Foundation/NSCalendarDate.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 
 #import <SOGoUI/SOGoAptFormatter.h>
diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m
index 0e0832c22..1cfb7d8c6 100644
--- a/UI/Scheduler/UIxCalMonthView.m
+++ b/UI/Scheduler/UIxCalMonthView.m
@@ -18,18 +18,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSString.h>
 
-#import <NGObjWeb/WOApplication.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <SoObjects/SOGo/NSCalendarDate+SOGo.h>
 
 #import <SOGoUI/SOGoAptFormatter.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 
 #import "UIxCalMonthView.h"
diff --git a/UI/Scheduler/UIxCalMonthViewOld.m b/UI/Scheduler/UIxCalMonthViewOld.m
index d44de015d..058a61f55 100644
--- a/UI/Scheduler/UIxCalMonthViewOld.m
+++ b/UI/Scheduler/UIxCalMonthViewOld.m
@@ -1,4 +1,3 @@
-#import <Foundation/NSCalendarDate.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 
 #import <SOGo/NSCalendarDate+SOGo.h>
diff --git a/UI/Scheduler/UIxCalMulticolumnDayView.m b/UI/Scheduler/UIxCalMulticolumnDayView.m
index b96241686..8571f5fea 100644
--- a/UI/Scheduler/UIxCalMulticolumnDayView.m
+++ b/UI/Scheduler/UIxCalMulticolumnDayView.m
@@ -20,17 +20,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
-#import <SOGo/SOGoDateFormatter.h>
 
 #import "UIxCalMulticolumnDayView.h"
 
diff --git a/UI/Scheduler/UIxCalUserRightsEditor.m b/UI/Scheduler/UIxCalUserRightsEditor.m
index f7265cbee..8682f8ead 100644
--- a/UI/Scheduler/UIxCalUserRightsEditor.m
+++ b/UI/Scheduler/UIxCalUserRightsEditor.m
@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
 #import <Foundation/NSValue.h>
-#import <NGObjWeb/WORequest.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxCalUserRightsEditor.h"
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index 40677b6e9..11e803f83 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -18,13 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/Foundation.h>
 
-#import <NGObjWeb/SoSecurityManager.h>
-#import <NGObjWeb/SoUser.h>
 #import <NGObjWeb/WOResponse.h>
-#import <NGObjWeb/WORequest.h>
-#import <NGExtensions/NGCalendarDateRange.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -33,20 +28,15 @@
 
 #import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
-#import <Appointments/SOGoAppointmentObject.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoObject.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserSettings.h>
 
 #import <SOGoUI/SOGoAptFormatter.h>
 
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalEvent.h>
-#import <GDLContentStore/GCSFolder.h>
 
 #import "UIxCalView.h"
 
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index c49fd8a18..be59cce33 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSString.h>
-#import <Foundation/NSArray.h>
 
 #import <SOGo/SOGoUserSettings.h>
 #import <SOGo/SOGoUser.h>
diff --git a/UI/Scheduler/UIxCalWeekView.m b/UI/Scheduler/UIxCalWeekView.m
index 03b7c27d9..8314e626c 100644
--- a/UI/Scheduler/UIxCalWeekView.m
+++ b/UI/Scheduler/UIxCalWeekView.m
@@ -20,14 +20,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 
-#import <EOControl/EOQualifier.h>
 
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
diff --git a/UI/Scheduler/UIxCalendarFolderLinksTemplate.m b/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
index 89cae71d7..58fbea533 100644
--- a/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
+++ b/UI/Scheduler/UIxCalendarFolderLinksTemplate.m
@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSURL.h>
 
 #import <SOGo/SOGoSystemDefaults.h>
-#import <Appointments/SOGoAppointmentFolder.h>
-#import <Appointments/SOGoWebAppointmentFolder.h>
 
 #import "UIxCalendarFolderLinksTemplate.h"
 
diff --git a/UI/Scheduler/UIxCalendarProperties.m b/UI/Scheduler/UIxCalendarProperties.m
index ee496d1ff..a4dadd947 100644
--- a/UI/Scheduler/UIxCalendarProperties.m
+++ b/UI/Scheduler/UIxCalendarProperties.m
@@ -19,18 +19,12 @@
  */
 
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSURL.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/WORequest.h>
 
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
-#import <SOGo/SOGoSystemDefaults.h>
 
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoWebAppointmentFolder.h>
 
 #import "UIxCalendarProperties.h"
diff --git a/UI/Scheduler/UIxCalendarSelector.m b/UI/Scheduler/UIxCalendarSelector.m
index efbe93071..6194b2769 100644
--- a/UI/Scheduler/UIxCalendarSelector.m
+++ b/UI/Scheduler/UIxCalendarSelector.m
@@ -18,11 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/WOResponse.h>
 
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/SOGoPermissions.h>
@@ -31,7 +28,6 @@
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
 #import <Appointments/SOGoWebAppointmentFolder.h>
 
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 8da53b366..4f6072ac8 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -18,23 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSBundle.h>
-#import <Foundation/NSEnumerator.h>
-#import <Foundation/NSException.h>
-#import <Foundation/NSCalendarDate.h>
-#import <Foundation/NSKeyValueCoding.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
-#import <Foundation/NSURL.h>
 
-#import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalByDayMask.h>
-#import <NGCards/iCalDateTime.h>
-#import <NGCards/iCalEvent.h>
-#import <NGCards/iCalPerson.h>
-#import <NGCards/iCalRepeatableEntityObject.h>
-#import <NGCards/iCalRecurrenceRule.h>
 #import <NGCards/iCalToDo.h>
 #import <NGCards/iCalTrigger.h>
 
@@ -42,7 +27,6 @@
 #import <NGCards/NSCalendarDate+NGCards.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSCalendarDate+misc.h>
@@ -53,27 +37,19 @@
 #import <Appointments/iCalAlarm+SOGo.h>
 #import <Appointments/iCalEntityObject+SOGo.h>
 #import <Appointments/iCalPerson+SOGo.h>
-#import <Appointments/SOGoAppointmentFolder.h>
 #import <Appointments/SOGoWebAppointmentFolder.h>
 #import <Appointments/SOGoAppointmentFolders.h>
-#import <Appointments/SOGoAppointmentObject.h>
-#import <Appointments/SOGoAppointmentOccurence.h>
 #import <Appointments/SOGoTaskObject.h>
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserDefaults.h>
 #import <SOGo/SOGoUserManager.h>
-#import <SOGo/SOGoSource.h>
 #import <SOGo/SOGoPermissions.h>
-#import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/WOResourceManager+SOGo.h>
 
-#import "../../Main/SOGo.h"
 
 #import "UIxComponentEditor.h"
-#import "UIxDatePicker.h"
 
 #define componentReadableWritable  0
 #define componentOwnerIsInvited    1
diff --git a/UI/Scheduler/UIxDatePicker.h b/UI/Scheduler/UIxDatePicker.h
index cc30eae69..e6573ea58 100644
--- a/UI/Scheduler/UIxDatePicker.h
+++ b/UI/Scheduler/UIxDatePicker.h
@@ -21,7 +21,6 @@
 #ifndef UIXDATEPICKER_H
 #define UIXDATEPICKER_H
 
-#import <NGObjWeb/WOComponent.h>
 
 @class NSString;
 
diff --git a/UI/Scheduler/UIxOccurenceDialog.h b/UI/Scheduler/UIxOccurenceDialog.h
index bf945f116..dec43087b 100644
--- a/UI/Scheduler/UIxOccurenceDialog.h
+++ b/UI/Scheduler/UIxOccurenceDialog.h
@@ -23,7 +23,6 @@
 #ifndef UIXRECURRENCEEDITOR_H
 #define UIXRECURRENCEEDITOR_H
 
-#import <SOGoUI/UIxComponent.h>
 
 @class NSString;
 
diff --git a/UI/Scheduler/UIxOccurenceDialog.m b/UI/Scheduler/UIxOccurenceDialog.m
index a3a3096c5..1935c9180 100644
--- a/UI/Scheduler/UIxOccurenceDialog.m
+++ b/UI/Scheduler/UIxOccurenceDialog.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <Common/UIxPageFrame.h>
 
diff --git a/UI/Scheduler/UIxRecurrenceEditor.h b/UI/Scheduler/UIxRecurrenceEditor.h
index 448121d43..90946f67f 100644
--- a/UI/Scheduler/UIxRecurrenceEditor.h
+++ b/UI/Scheduler/UIxRecurrenceEditor.h
@@ -23,7 +23,6 @@
 #ifndef UIXRECURRENCEEDITOR_H
 #define UIXRECURRENCEEDITOR_H
 
-#import <SOGoUI/UIxComponent.h>
 
 @interface UIxRecurrenceEditor : UIxComponent
 {
diff --git a/UI/Scheduler/UIxRecurrenceEditor.m b/UI/Scheduler/UIxRecurrenceEditor.m
index 7184277e8..5a4c4e59c 100644
--- a/UI/Scheduler/UIxRecurrenceEditor.m
+++ b/UI/Scheduler/UIxRecurrenceEditor.m
@@ -18,9 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSUserDefaults.h> /* for locale string constants */
 
 #import <Common/UIxPageFrame.h>
diff --git a/UI/Scheduler/UIxReminderEditor.m b/UI/Scheduler/UIxReminderEditor.m
index 7e7a130eb..a7f707d8e 100644
--- a/UI/Scheduler/UIxReminderEditor.m
+++ b/UI/Scheduler/UIxReminderEditor.m
@@ -18,8 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 
 #import <SOGo/SOGoSystemDefaults.h>
 
diff --git a/UI/Scheduler/UIxTaskEditor.h b/UI/Scheduler/UIxTaskEditor.h
index 2e6935c9c..64c72d3de 100644
--- a/UI/Scheduler/UIxTaskEditor.h
+++ b/UI/Scheduler/UIxTaskEditor.h
@@ -21,7 +21,6 @@
 #ifndef UIXAPPOINTMENTEDITOR_H
 #define UIXAPPOINTMENTEDITOR_H
 
-#import <SOGoUI/UIxComponent.h>
 
 @class iCalToDo;
 @class NSString;
diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m
index 138db2684..3a7300151 100644
--- a/UI/Scheduler/UIxTaskEditor.m
+++ b/UI/Scheduler/UIxTaskEditor.m
@@ -18,10 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#import <Foundation/NSDictionary.h>
 #import <Foundation/NSValue.h>
 
-#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/SoPermissions.h>
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WORequest.h>
@@ -30,17 +28,13 @@
 #import <NGExtensions/NSCalendarDate+misc.h>
 
 #import <NGCards/iCalAlarm.h>
-#import <NGCards/iCalCalendar.h>
-#import <NGCards/iCalPerson.h>
 #import <NGCards/iCalToDo.h>
 #import <NGCards/iCalTrigger.h>
-#import <NGCards/iCalTimeZone.h>
 #import <NGCards/iCalDateTime.h>
 
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
-#import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoDateFormatter.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
diff --git a/UI/Scheduler/UIxTimeDateControl.m b/UI/Scheduler/UIxTimeDateControl.m
index 445cfde19..d7024ee49 100644
--- a/UI/Scheduler/UIxTimeDateControl.m
+++ b/UI/Scheduler/UIxTimeDateControl.m
@@ -19,8 +19,6 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
 #import <Foundation/NSValue.h>
 
 #import <NGObjWeb/SoObjects.h>