diff --git a/ActiveSync/NSArray+SyncCache.m b/ActiveSync/NSArray+SyncCache.m
index 3a8fed1ad..764e85441 100644
--- a/ActiveSync/NSArray+SyncCache.m
+++ b/ActiveSync/NSArray+SyncCache.m
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #import "NSArray+SyncCache.h"
 
 
-#include "SOGoSyncCacheObject.h"
 
 @implementation NSMutableArray (SyncCache)
 
diff --git a/ActiveSync/NSData+ActiveSync.m b/ActiveSync/NSData+ActiveSync.m
index ab6ece9e6..58a0ba16d 100644
--- a/ActiveSync/NSData+ActiveSync.m
+++ b/ActiveSync/NSData+ActiveSync.m
@@ -33,9 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #import <NGExtensions/NSObject+Logs.h>
 
-#include <wbxml/wbxml.h>
-#include <wbxml/wbxml_conv.h>
-#include <wbxml/wbxml_errors.h>
 
 #define WBXMLDEBUG 0
 
diff --git a/ActiveSync/NSString+ActiveSync.h b/ActiveSync/NSString+ActiveSync.h
index e48cffd89..d35058f9a 100644
--- a/ActiveSync/NSString+ActiveSync.h
+++ b/ActiveSync/NSString+ActiveSync.h
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define __NSSTRINGACTIVESYNC_H__
 
 
-#include "SOGoActiveSyncConstants.h"
 
 @class NSCalendarDate;
 @class NSData;
diff --git a/ActiveSync/NSString+ActiveSync.m b/ActiveSync/NSString+ActiveSync.m
index e11465859..04a00c58a 100644
--- a/ActiveSync/NSString+ActiveSync.m
+++ b/ActiveSync/NSString+ActiveSync.m
@@ -29,16 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "NSString+ActiveSync.h"
 
-#include <Foundation/NSArray.h>
-#include <Foundation/NSCalendarDate.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSTimeZone.h>
 
 #include <SOGo/NSString+Utilities.h>
 #include <SOGo/NSData+Crypto.h>
 
-#include <NGExtensions/NGBase64Coding.h>
 #include <NGExtensions/NSString+misc.h>
 
 static NSArray *easCommandCodes = nil;
diff --git a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
index c98790ebf..f93098be8 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher+Sync.m
@@ -58,11 +58,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSDate+ActiveSync.h"
 #include "NSData+ActiveSync.h"
 #include "NSString+ActiveSync.h"
-#include "SOGoActiveSyncConstants.h"
 #include "SOGoMailObject+ActiveSync.h"
-#include "SOGoSyncCacheObject.h"
 
-#include <unistd.h>
 
 @implementation SOGoActiveSyncDispatcher (Sync)
 
diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m
index 9a6529b43..4220e4a04 100644
--- a/ActiveSync/SOGoActiveSyncDispatcher.m
+++ b/ActiveSync/SOGoActiveSyncDispatcher.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.
 
 */
-#include "SOGoActiveSyncDispatcher.h"
 
 #if GNUSTEP_BASE_MINOR_VERSION >= 21
 #endif
@@ -68,16 +67,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "NSData+ActiveSync.h"
 #include "NSDate+ActiveSync.h"
 #include "NSString+ActiveSync.h"
-#include "SOGoActiveSyncConstants.h"
 #include "SOGoMailObject+ActiveSync.h"
 
 
-#include <unistd.h>
 
 #ifdef HAVE_OPENSSL
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
 #endif
 
 @interface SOGoActiveSyncDispatcher (Sync)
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
index f46db9119..3228f6487 100644
--- a/ActiveSync/SOGoMailObject+ActiveSync.m
+++ b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -47,8 +47,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <Appointments/iCalEntityObject+SOGo.h>
 #include <Appointments/iCalPerson+SOGo.h>
 #include <Mailer/NSString+Mail.h>
-#include <Mailer/SOGoMailBodyPart.h>
-#include <SOGo/SOGoUser.h>
 #include <SOGo/NSString+Utilities.h>
 
 
diff --git a/ActiveSync/SOGoSyncCacheObject.m b/ActiveSync/SOGoSyncCacheObject.m
index ba8a18636..93b2d471b 100644
--- a/ActiveSync/SOGoSyncCacheObject.m
+++ b/ActiveSync/SOGoSyncCacheObject.m
@@ -28,7 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "SOGoSyncCacheObject.h"
 
 
 static Class NSNullK;
diff --git a/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m b/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
index 5cef1766a..e57f6688b 100644
--- a/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
+++ b/ActiveSync/SoObjectWebDAVDispatcher+ActiveSync.m
@@ -29,10 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <NGObjWeb/SoObject+SoDAV.h>
-#include <NGObjWeb/WEClientCapabilities.h>
-#include <NGObjWeb/WOContext.h>
-#include <NGObjWeb/WORequest.h>
-#include <NGObjWeb/WOResponse.h>
 
 
 @interface SoObjectWebDAVDispatcher (ActiveSync)
diff --git a/ActiveSync/iCalTimeZone+ActiveSync.m b/ActiveSync/iCalTimeZone+ActiveSync.m
index 0c66424f8..1ed0aba3e 100644
--- a/ActiveSync/iCalTimeZone+ActiveSync.m
+++ b/ActiveSync/iCalTimeZone+ActiveSync.m
@@ -29,11 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #import "iCalTimeZone+ActiveSync.h"
 
-#include <Foundation/NSArray.h>
-#include <Foundation/NSCalendarDate.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSString.h>
 
 
 
diff --git a/Main/NSException+Stacktrace.m b/Main/NSException+Stacktrace.m
index 1160aea17..629ac6bb1 100644
--- a/Main/NSException+Stacktrace.m
+++ b/Main/NSException+Stacktrace.m
@@ -19,7 +19,6 @@
  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-#include <execinfo.h>
 
 #import "NSException+Stacktrace.h"
 
diff --git a/Main/sogod.m b/Main/sogod.m
index 022c43c02..31a84f9f4 100644
--- a/Main/sogod.m
+++ b/Main/sogod.m
@@ -21,7 +21,6 @@
 */
 
 #include <unistd.h>
-#include <sys/types.h>
 
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSTimeZone.h>
diff --git a/OpenChange/MAPIStoreAppointmentWrapper.m b/OpenChange/MAPIStoreAppointmentWrapper.m
index da140a78d..789558c5c 100644
--- a/OpenChange/MAPIStoreAppointmentWrapper.m
+++ b/OpenChange/MAPIStoreAppointmentWrapper.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
 
 #import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -35,15 +34,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <gen_ndr/property.h>
-#include <gen_ndr/ndr_property.h>
-#include <util/attr.h>
-#include <libmapi/libmapi.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 static NSCharacterSet *hexCharacterSet = nil;
 
diff --git a/OpenChange/MAPIStoreAttachment.m b/OpenChange/MAPIStoreAttachment.m
index d8b1c6a57..d2a0be196 100644
--- a/OpenChange/MAPIStoreAttachment.m
+++ b/OpenChange/MAPIStoreAttachment.m
@@ -24,10 +24,6 @@
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreAttachment
 
diff --git a/OpenChange/MAPIStoreCalendarAttachment.m b/OpenChange/MAPIStoreCalendarAttachment.m
index 0e94f0732..7c42d97a5 100644
--- a/OpenChange/MAPIStoreCalendarAttachment.m
+++ b/OpenChange/MAPIStoreCalendarAttachment.m
@@ -32,10 +32,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreCalendarAttachment
 
diff --git a/OpenChange/MAPIStoreCalendarContext.m b/OpenChange/MAPIStoreCalendarContext.m
index 5514a90cb..47db587f5 100644
--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@@ -24,7 +24,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreCalendarFolderK;
 
diff --git a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
index 8fd1df1d2..5c1a8d07f 100644
--- a/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreCalendarEmbeddedMessage.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
 
 
 #import <NGObjWeb/WOContext+SoObjects.h>
@@ -30,7 +29,6 @@
 #import "NSObject+MAPIStore.h"
 
 
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreCalendarEmbeddedMessage
 
diff --git a/OpenChange/MAPIStoreCalendarFolder.m b/OpenChange/MAPIStoreCalendarFolder.m
index 462fd64e1..4c6d7c9ca 100644
--- a/OpenChange/MAPIStoreCalendarFolder.m
+++ b/OpenChange/MAPIStoreCalendarFolder.m
@@ -26,9 +26,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_errors.h>
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
 
 @implementation MAPIStoreCalendarFolder
 
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index bd1a6ad11..c036f06dd 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -24,8 +24,6 @@
    - merge common code with tasks
    - take the tz definitions from Outlook */
 
-#include <talloc.h>
-#include <util/attr.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -41,13 +39,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <gen_ndr/property.h>
-#include <libmapi/libmapi.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 // extern void ndr_print_AppointmentRecurrencePattern(struct ndr_print *ndr, const char *name, const struct AppointmentRecurrencePattern *r);
 
diff --git a/OpenChange/MAPIStoreCalendarMessageTable.m b/OpenChange/MAPIStoreCalendarMessageTable.m
index 82dab1a2d..5cb9bc0ff 100644
--- a/OpenChange/MAPIStoreCalendarMessageTable.m
+++ b/OpenChange/MAPIStoreCalendarMessageTable.m
@@ -27,7 +27,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreCalendarMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreContactsAttachment.m b/OpenChange/MAPIStoreContactsAttachment.m
index d8a8d7488..f6232a8aa 100644
--- a/OpenChange/MAPIStoreContactsAttachment.m
+++ b/OpenChange/MAPIStoreContactsAttachment.m
@@ -27,7 +27,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_errors.h>
 
 /* TODO: handle URL pictures via PidTagAttachMethod = ref ? */
 
diff --git a/OpenChange/MAPIStoreContactsContext.m b/OpenChange/MAPIStoreContactsContext.m
index 3252804d6..12467c33e 100644
--- a/OpenChange/MAPIStoreContactsContext.m
+++ b/OpenChange/MAPIStoreContactsContext.m
@@ -25,7 +25,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreContactsFolderK;
 
diff --git a/OpenChange/MAPIStoreContactsFolder.m b/OpenChange/MAPIStoreContactsFolder.m
index f8cccf035..1eb29ab64 100644
--- a/OpenChange/MAPIStoreContactsFolder.m
+++ b/OpenChange/MAPIStoreContactsFolder.m
@@ -25,9 +25,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreContactsFolder
 
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index a580feda9..d01a5b413 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -34,11 +34,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 @implementation SOGoContactGCSEntry (MAPIStoreExtension)
 
diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m
index 6726a4907..6ca47c9ef 100644
--- a/OpenChange/MAPIStoreContactsMessageTable.m
+++ b/OpenChange/MAPIStoreContactsMessageTable.m
@@ -30,7 +30,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreContactsMessageK, NGMailAddressK, NSDataK, NSStringK;
 
diff --git a/OpenChange/MAPIStoreContext.h b/OpenChange/MAPIStoreContext.h
index 58fd771e9..07b4e72ea 100644
--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTEXT_H
 #define MAPISTORECONTEXT_H
 
-#include <talloc.h>
 
 
 @class NSArray;
diff --git a/OpenChange/MAPIStoreContext.m b/OpenChange/MAPIStoreContext.m
index 3cb80b520..8e79a279a 100644
--- a/OpenChange/MAPIStoreContext.m
+++ b/OpenChange/MAPIStoreContext.m
@@ -32,15 +32,6 @@
 
 
 #undef DEBUG
-#include <dlinklist.h>
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <util/attr.h>
-#include <libmapiproxy.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
-#include <talloc.h>
 
 /* TODO: homogenize method names and order of parameters */
 
diff --git a/OpenChange/MAPIStoreDBBaseContext.m b/OpenChange/MAPIStoreDBBaseContext.m
index 23f7d4362..2f0d1eabe 100644
--- a/OpenChange/MAPIStoreDBBaseContext.m
+++ b/OpenChange/MAPIStoreDBBaseContext.m
@@ -27,7 +27,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreDBFolderK;
 
diff --git a/OpenChange/MAPIStoreDBFolder.m b/OpenChange/MAPIStoreDBFolder.m
index 8910e6312..10be380ba 100644
--- a/OpenChange/MAPIStoreDBFolder.m
+++ b/OpenChange/MAPIStoreDBFolder.m
@@ -20,15 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <inttypes.h>
 
 #import <NGExtensions/NSObject+Logs.h>
 #import <SOGo/EOQualifier+SOGoCacheObject.h>
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 static Class EOKeyValueQualifierK, SOGoCacheGCSFolderK, MAPIStoreDBFolderK;
 
diff --git a/OpenChange/MAPIStoreDBMessage.m b/OpenChange/MAPIStoreDBMessage.m
index 44806d35a..4516677e1 100644
--- a/OpenChange/MAPIStoreDBMessage.m
+++ b/OpenChange/MAPIStoreDBMessage.m
@@ -28,8 +28,6 @@
 #import "NSString+MAPIStore.h"
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreDBMessage
 
diff --git a/OpenChange/MAPIStoreDBMessageTable.m b/OpenChange/MAPIStoreDBMessageTable.m
index 295a2f335..465c9064e 100644
--- a/OpenChange/MAPIStoreDBMessageTable.m
+++ b/OpenChange/MAPIStoreDBMessageTable.m
@@ -25,7 +25,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreDBMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreEmbeddedMessage.m b/OpenChange/MAPIStoreEmbeddedMessage.m
index 1ba6f0d0d..edab4e949 100644
--- a/OpenChange/MAPIStoreEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreEmbeddedMessage.m
@@ -24,7 +24,6 @@
 #import "NSObject+MAPIStore.h"
 
 
-#include <mapistore/mapistore_errors.h>
 
 static Class MAPIStoreAttachmentK;
 
diff --git a/OpenChange/MAPIStoreFAIMessage.m b/OpenChange/MAPIStoreFAIMessage.m
index 60c103772..38eae3894 100644
--- a/OpenChange/MAPIStoreFAIMessage.m
+++ b/OpenChange/MAPIStoreFAIMessage.m
@@ -25,11 +25,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreFAIMessage
 
diff --git a/OpenChange/MAPIStoreFAIMessageTable.m b/OpenChange/MAPIStoreFAIMessageTable.m
index 25ef4b8de..575f0fdd8 100644
--- a/OpenChange/MAPIStoreFAIMessageTable.m
+++ b/OpenChange/MAPIStoreFAIMessageTable.m
@@ -24,9 +24,6 @@
 
 
 #undef DEBUG
-#include <talloc.h>
-#include <util/time.h>
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreFAIMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreFallbackContext.m b/OpenChange/MAPIStoreFallbackContext.m
index 6c756b84f..ab08bd1b8 100644
--- a/OpenChange/MAPIStoreFallbackContext.m
+++ b/OpenChange/MAPIStoreFallbackContext.m
@@ -23,9 +23,6 @@
 
 
 #undef DEBUG
-#include <inttypes.h>
-#include <dlinklist.h>
-#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreFallbackContext
 
diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m
index 07e3ae13b..398b35516 100644
--- a/OpenChange/MAPIStoreFolder.m
+++ b/OpenChange/MAPIStoreFolder.m
@@ -29,13 +29,8 @@
 #import "NSObject+MAPIStore.h"
 #import "SOGoCacheGCSObject+MAPIStore.h"
 
-#include <gen_ndr/exchange.h>
 
 #undef DEBUG
-#include <util/attr.h>
-#include <libmapiproxy.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMessageTableK, MAPIStoreFolderTableK;
 
diff --git a/OpenChange/MAPIStoreFolderTable.m b/OpenChange/MAPIStoreFolderTable.m
index 23b24988b..a5606de05 100644
--- a/OpenChange/MAPIStoreFolderTable.m
+++ b/OpenChange/MAPIStoreFolderTable.m
@@ -26,9 +26,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_nameid.h>
-#include <libmapiproxy.h>
 
 @implementation MAPIStoreFolderTable
 
diff --git a/OpenChange/MAPIStoreGCSBaseContext.m b/OpenChange/MAPIStoreGCSBaseContext.m
index f18eecda0..ba05df3ec 100644
--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@@ -26,8 +26,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <dlinklist.h>
 
 @implementation MAPIStoreGCSBaseContext
 
diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m
index e6b443f0e..72fd4205a 100644
--- a/OpenChange/MAPIStoreGCSFolder.m
+++ b/OpenChange/MAPIStoreGCSFolder.m
@@ -30,8 +30,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 static Class NSNumberK;
 
diff --git a/OpenChange/MAPIStoreGCSMessage.m b/OpenChange/MAPIStoreGCSMessage.m
index 42b8eabc1..dbf7aa0dd 100644
--- a/OpenChange/MAPIStoreGCSMessage.m
+++ b/OpenChange/MAPIStoreGCSMessage.m
@@ -27,8 +27,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreGCSMessage
 
diff --git a/OpenChange/MAPIStoreGCSMessageTable.m b/OpenChange/MAPIStoreGCSMessageTable.m
index 26c3c71c1..1f547d2e4 100644
--- a/OpenChange/MAPIStoreGCSMessageTable.m
+++ b/OpenChange/MAPIStoreGCSMessageTable.m
@@ -29,7 +29,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreGCSMessageTable
 
diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index 4d19298ee..fe3a83f13 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -30,10 +30,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreMailAttachment
 
diff --git a/OpenChange/MAPIStoreMailContext.m b/OpenChange/MAPIStoreMailContext.m
index 2248f6d11..14afa53ed 100644
--- a/OpenChange/MAPIStoreMailContext.m
+++ b/OpenChange/MAPIStoreMailContext.m
@@ -27,9 +27,7 @@
 
 #import <SOGo/NSString+Utilities.h>
 
-#include <dlinklist.h>
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
 
diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m
index 2b0dbcfe4..148f1776d 100644
--- a/OpenChange/MAPIStoreMailFolder.m
+++ b/OpenChange/MAPIStoreMailFolder.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -35,15 +34,8 @@
 
 static Class SOGoMailFolderK, MAPIStoreMailFolderK, MAPIStoreOutboxFolderK;
 
-#include <gen_ndr/exchange.h>
 
 #undef DEBUG
-#include <util/attr.h>
-#include <libmapi/libmapi.h>
-#include <libmapiproxy.h>
-#include <limits.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreMailFolder
 
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 111bd6bfa..95b260bdd 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -34,10 +34,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @class iCalCalendar, iCalEvent;
 
diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m
index 4e2bb976f..bec4db472 100644
--- a/OpenChange/MAPIStoreMailMessageTable.m
+++ b/OpenChange/MAPIStoreMailMessageTable.m
@@ -30,8 +30,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_nameid.h>
 
 @implementation MAPIStoreMailMessageTable
 
diff --git a/OpenChange/MAPIStoreMailVolatileMessage.m b/OpenChange/MAPIStoreMailVolatileMessage.m
index 490c4de0e..b1e05ec33 100644
--- a/OpenChange/MAPIStoreMailVolatileMessage.m
+++ b/OpenChange/MAPIStoreMailVolatileMessage.m
@@ -39,9 +39,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 static Class NSNumberK = Nil;
 
diff --git a/OpenChange/MAPIStoreMapping.m b/OpenChange/MAPIStoreMapping.m
index 5db5e8e94..afda79459 100644
--- a/OpenChange/MAPIStoreMapping.m
+++ b/OpenChange/MAPIStoreMapping.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <inttypes.h>
 
 
 #import <NGExtensions/NSObject+Logs.h>
@@ -29,12 +28,9 @@
 #import <SOGo/NSString+Utilities.h>
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 
 
-#include <talloc.h>
 
 static NSMutableDictionary *mappingRegistry = nil;
 
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index 0bf819c92..9ad2b2b75 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -28,10 +28,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 static Class MAPIStoreFolderK, MAPIStoreEmbeddedMessageK;
 
diff --git a/OpenChange/MAPIStoreNotesContext.m b/OpenChange/MAPIStoreNotesContext.m
index febb79bb5..a6662595b 100644
--- a/OpenChange/MAPIStoreNotesContext.m
+++ b/OpenChange/MAPIStoreNotesContext.m
@@ -24,7 +24,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 @implementation MAPIStoreNotesContext
 
diff --git a/OpenChange/MAPIStoreNotesFolder.m b/OpenChange/MAPIStoreNotesFolder.m
index edc4a7258..9250f8a7d 100644
--- a/OpenChange/MAPIStoreNotesFolder.m
+++ b/OpenChange/MAPIStoreNotesFolder.m
@@ -22,7 +22,6 @@
 
 #import "NSString+MAPIStore.h"
 
-#include <mapistore/mapistore_errors.h>
 
 
 @implementation MAPIStoreNotesFolder
diff --git a/OpenChange/MAPIStoreNotesMessage.m b/OpenChange/MAPIStoreNotesMessage.m
index 5b67b2dea..0fa3cb270 100644
--- a/OpenChange/MAPIStoreNotesMessage.m
+++ b/OpenChange/MAPIStoreNotesMessage.m
@@ -25,7 +25,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreNotesMessage
 
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index 74125a88d..0c7165fb5 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREOBJECT_H
 #define MAPISTOREOBJECT_H
 
-#include <talloc.h>
 
 
 @class NSDate;
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index 59982389d..4365d4a2d 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -29,11 +29,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreObject
 
diff --git a/OpenChange/MAPIStoreObjectProxy.h b/OpenChange/MAPIStoreObjectProxy.h
index 3626ee9d3..fc227aa8b 100644
--- a/OpenChange/MAPIStoreObjectProxy.h
+++ b/OpenChange/MAPIStoreObjectProxy.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTOREOBJECTPROXY_H
 #define MAPISTOREOBJECTPROXY_H
 
-#include <talloc.h>
 
 
 @interface MAPIStoreObjectProxy : NSObject
diff --git a/OpenChange/MAPIStoreObjectProxy.m b/OpenChange/MAPIStoreObjectProxy.m
index 9fabe7f44..e417730bc 100644
--- a/OpenChange/MAPIStoreObjectProxy.m
+++ b/OpenChange/MAPIStoreObjectProxy.m
@@ -24,11 +24,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreObjectProxy
 
diff --git a/OpenChange/MAPIStorePermissionsTable.m b/OpenChange/MAPIStorePermissionsTable.m
index 738881a60..46785b464 100644
--- a/OpenChange/MAPIStorePermissionsTable.m
+++ b/OpenChange/MAPIStorePermissionsTable.m
@@ -26,8 +26,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStorePermissionEntry
 
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.h b/OpenChange/MAPIStoreRecurrenceUtils.h
index 082b05a79..3be8bc34c 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.h
+++ b/OpenChange/MAPIStoreRecurrenceUtils.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORERECURRENCEUTILS_H
 #define MAPISTORERECURRENCEUTILS_H
 
-#include <talloc.h>
 
 
 @class iCalEvent;
diff --git a/OpenChange/MAPIStoreRecurrenceUtils.m b/OpenChange/MAPIStoreRecurrenceUtils.m
index 9fed0062f..1675192eb 100644
--- a/OpenChange/MAPIStoreRecurrenceUtils.m
+++ b/OpenChange/MAPIStoreRecurrenceUtils.m
@@ -27,10 +27,6 @@
 
 #import "NSDate+MAPIStore.h"
 
-#include <stdbool.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <gen_ndr/property.h>
 
 @implementation iCalCalendar (MAPIStoreRecurrence)
 
diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m
index 72427a407..01b40baff 100644
--- a/OpenChange/MAPIStoreSOGo.m
+++ b/OpenChange/MAPIStoreSOGo.m
@@ -27,10 +27,6 @@
 #import "NSObject+MAPIStore.h"
 #import "NSString+MAPIStore.h"
 
-#include <libmapi/libmapi.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <execinfo.h>
 
 static Class MAPIStoreContextK = Nil;
 static BOOL leakDebugging = NO;
diff --git a/OpenChange/MAPIStoreSOGoObject.h b/OpenChange/MAPIStoreSOGoObject.h
index 54301ce12..e8c5770db 100644
--- a/OpenChange/MAPIStoreSOGoObject.h
+++ b/OpenChange/MAPIStoreSOGoObject.h
@@ -23,7 +23,6 @@
 #ifndef MAPISTORESOGOOBJECT_H
 #define MAPISTORESOGOOBJECT_H
 
-#include <talloc.h>
 
 
 @class NSDate;
diff --git a/OpenChange/MAPIStoreSOGoObject.m b/OpenChange/MAPIStoreSOGoObject.m
index c66233be1..8a58a1876 100644
--- a/OpenChange/MAPIStoreSOGoObject.m
+++ b/OpenChange/MAPIStoreSOGoObject.m
@@ -29,11 +29,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreSOGoObject
 
diff --git a/OpenChange/MAPIStoreSamDBUtils.h b/OpenChange/MAPIStoreSamDBUtils.h
index 84825332b..63b67504a 100644
--- a/OpenChange/MAPIStoreSamDBUtils.h
+++ b/OpenChange/MAPIStoreSamDBUtils.h
@@ -25,7 +25,6 @@
 
 @class NSString;
 
-#include <mapistore/mapistore.h>
 
 NSString *MAPIStoreSamDBUserAttribute (struct mapistore_connection_info *connInfo,
                                        NSString *userKey,
diff --git a/OpenChange/MAPIStoreSamDBUtils.m b/OpenChange/MAPIStoreSamDBUtils.m
index 67b8010c4..7beb19591 100644
--- a/OpenChange/MAPIStoreSamDBUtils.m
+++ b/OpenChange/MAPIStoreSamDBUtils.m
@@ -20,10 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
-#include <ldb.h>
-#include <libmapiproxy.h>
-#include <samba/version.h>
 
 #import "NSData+MAPIStore.h"
 
diff --git a/OpenChange/MAPIStoreSharingMessage.m b/OpenChange/MAPIStoreSharingMessage.m
index 668fcc8f2..15cd2d61f 100644
--- a/OpenChange/MAPIStoreSharingMessage.m
+++ b/OpenChange/MAPIStoreSharingMessage.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
 
 
 
@@ -30,9 +29,6 @@
 #import "NSValue+MAPIStore.h"
 
 
-#include <gen_ndr/property.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 @implementation MAPIStoreSharingMessage
 
diff --git a/OpenChange/MAPIStoreTable.h b/OpenChange/MAPIStoreTable.h
index 8c4b4718a..c40635b57 100644
--- a/OpenChange/MAPIStoreTable.h
+++ b/OpenChange/MAPIStoreTable.h
@@ -23,12 +23,10 @@
 #ifndef MAPISTORETABLE_H
 #define MAPISTORETABLE_H
 
-#include <talloc.h>
 
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 #define SENSITIVITY_NONE 0
 #define SENSITIVITY_PERSONAL 1
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index ae2771e63..49cbb9d5f 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -29,9 +29,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <libmapiproxy.h>
 
 @interface MAPIStoreTable (Private)
 
diff --git a/OpenChange/MAPIStoreTasksContext.m b/OpenChange/MAPIStoreTasksContext.m
index aff84eba6..47889971d 100644
--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@@ -24,7 +24,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 static Class MAPIStoreTasksFolderK;
 
diff --git a/OpenChange/MAPIStoreTasksFolder.m b/OpenChange/MAPIStoreTasksFolder.m
index 92900e62d..85dc08d91 100644
--- a/OpenChange/MAPIStoreTasksFolder.m
+++ b/OpenChange/MAPIStoreTasksFolder.m
@@ -25,9 +25,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation MAPIStoreTasksFolder
 
diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m
index f9ce63b21..3c8e0e7ae 100644
--- a/OpenChange/MAPIStoreTasksMessage.m
+++ b/OpenChange/MAPIStoreTasksMessage.m
@@ -32,11 +32,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 @implementation SOGoTaskObject (MAPIStoreExtension)
 
diff --git a/OpenChange/MAPIStoreTasksMessageTable.m b/OpenChange/MAPIStoreTasksMessageTable.m
index 24be037af..bbb607631 100644
--- a/OpenChange/MAPIStoreTasksMessageTable.m
+++ b/OpenChange/MAPIStoreTasksMessageTable.m
@@ -29,7 +29,6 @@
 #import "NSString+MAPIStore.h"
 
 
-#include <mapistore/mapistore_nameid.h>
 
 static Class MAPIStoreTasksMessageK = Nil;
 
diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h
index 511d92e88..7e5fa859d 100644
--- a/OpenChange/MAPIStoreTypes.h
+++ b/OpenChange/MAPIStoreTypes.h
@@ -24,10 +24,6 @@
 #define MAPISTORETYPES_H
 
 
-#include <stdbool.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
 
 @class NSData;
 @class NSDictionary;
diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m
index 6815dc89e..4c9a8a6cb 100644
--- a/OpenChange/MAPIStoreTypes.m
+++ b/OpenChange/MAPIStoreTypes.m
@@ -27,8 +27,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 NSTimeZone *utcTZ;
 
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index a43f7fc7d..c637a9ace 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -28,11 +28,6 @@
 #import "NSArray+MAPIStore.h"
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
-#include <mapistore/mapistore.h>
 
 @implementation NSArray (MAPIStoreFolders)
 
diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m
index 5d8760888..9549b9030 100644
--- a/OpenChange/NSData+MAPIStore.m
+++ b/OpenChange/NSData+MAPIStore.m
@@ -28,11 +28,6 @@
 #import "NSData+MAPIStore.h"
 
 #undef DEBUG
-#include <stdbool.h>
-#include <libmapi/libmapi.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <gen_ndr/exchange.h>
 
 @implementation NSData (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSDate+MAPIStore.m b/OpenChange/NSDate+MAPIStore.m
index 7b05234cc..7023881e9 100644
--- a/OpenChange/NSDate+MAPIStore.m
+++ b/OpenChange/NSDate+MAPIStore.m
@@ -24,10 +24,6 @@
 #import "NSDate+MAPIStore.h"
 
 #undef DEBUG
-#include <stdbool.h>
-#include <talloc.h>
-#include <util/time.h>
-#include <mapistore/mapistore.h>
 
 static NSCalendarDate *refDate = nil;
 
diff --git a/OpenChange/NSObject+MAPIStore.h b/OpenChange/NSObject+MAPIStore.h
index 9d4fa0cd4..d5c0df01c 100644
--- a/OpenChange/NSObject+MAPIStore.h
+++ b/OpenChange/NSObject+MAPIStore.h
@@ -24,8 +24,6 @@
 #define NSOBJECT_MAPISTORE_H
 
 
-#include <talloc.h>
-#include <mapistore/mapistore_errors.h>
 
 struct MAPIStoreTallocWrapper
 {
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index 496455fc0..9098c5057 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -31,8 +31,6 @@
 #import "NSObject+MAPIStore.h"
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
 
 @implementation NSObject (MAPIStoreTallocHelpers)
 
diff --git a/OpenChange/NSString+MAPIStore.m b/OpenChange/NSString+MAPIStore.m
index 0b815b2f6..ace832723 100644
--- a/OpenChange/NSString+MAPIStore.m
+++ b/OpenChange/NSString+MAPIStore.m
@@ -20,16 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
-#include <stdbool.h>
 
 
 #import "NSString+MAPIStore.h"
 
 #undef DEBUG
-#include <talloc.h>
-#include <util/time.h>
-#include <mapistore/mapistore.h>
 
 @implementation NSString (MAPIStoreDataTypes)
 
diff --git a/OpenChange/NSValue+MAPIStore.m b/OpenChange/NSValue+MAPIStore.m
index a3301ce00..733e1337e 100644
--- a/OpenChange/NSValue+MAPIStore.m
+++ b/OpenChange/NSValue+MAPIStore.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <talloc.h>
 
 #import "NSValue+MAPIStore.h"
 
diff --git a/OpenChange/RTFHandler.h b/OpenChange/RTFHandler.h
index ec776a8d3..4198cf7b1 100644
--- a/OpenChange/RTFHandler.h
+++ b/OpenChange/RTFHandler.h
@@ -19,11 +19,8 @@
   02111-1307, USA.
 */
 
-#include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSMapTable.h>
-#include <Foundation/NSObject.h>
-#include <Foundation/NSString.h>
 
 //
 //
diff --git a/OpenChange/RTFHandler.m b/OpenChange/RTFHandler.m
index d4f775b5d..16885e3eb 100644
--- a/OpenChange/RTFHandler.m
+++ b/OpenChange/RTFHandler.m
@@ -21,7 +21,6 @@
 
 #include "RTFHandler.h"
 #include <Foundation/NSValue.h>
-#include <Foundation/NSException.h>
 
 //
 // Useful macros
diff --git a/OpenChange/SOGoCacheGCSObject+MAPIStore.h b/OpenChange/SOGoCacheGCSObject+MAPIStore.h
index da8452e3d..fcf1ac544 100644
--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.h
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.h
@@ -21,7 +21,6 @@
 #ifndef SOGOCACHEGCSOBJECTMAPISTORE
 #define SOGOCACHEGCSOBJECTMAPISTORE
 
-#include <SOGo/SOGoCacheGCSObject.h>
 
 @interface SOGoCacheGCSObject (MAPIStore)
 
diff --git a/OpenChange/SOGoCacheGCSObject+MAPIStore.m b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
index 935abfc14..a577b49fc 100644
--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.m
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
@@ -19,7 +19,6 @@
  */
 
 
-#include "MAPIStoreTypes.h"
 
 #include "SOGoCacheGCSObject+MAPIStore.h"
 
diff --git a/OpenChange/code-MAPIStorePropertySelectors.m b/OpenChange/code-MAPIStorePropertySelectors.m
index 11c85fa7f..39b28de52 100644
--- a/OpenChange/code-MAPIStorePropertySelectors.m
+++ b/OpenChange/code-MAPIStorePropertySelectors.m
@@ -22,7 +22,6 @@
 
 
 #undef DEBUG
-#include <mapistore/mapistore.h>
 
 const MAPIStorePropertyGetter *
 MAPIStorePropertyGettersForClass (Class klass)
diff --git a/OpenChange/iCalEvent+MAPIStore.h b/OpenChange/iCalEvent+MAPIStore.h
index 252badbac..e135bb2ed 100644
--- a/OpenChange/iCalEvent+MAPIStore.h
+++ b/OpenChange/iCalEvent+MAPIStore.h
@@ -23,7 +23,6 @@
 #ifndef ICALEVENT_MAPISTORE_H
 #define ICALEVENT_MAPISTORE_H
 
-#include <talloc.h>
 
 
 @class MAPIStoreUserContext;
diff --git a/OpenChange/iCalEvent+MAPIStore.m b/OpenChange/iCalEvent+MAPIStore.m
index f8cca8f33..8cbf73e85 100644
--- a/OpenChange/iCalEvent+MAPIStore.m
+++ b/OpenChange/iCalEvent+MAPIStore.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <util/attr.h>
 
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
@@ -35,13 +34,6 @@
 
 
 #undef DEBUG
-#include <stdbool.h>
-#include <gen_ndr/exchange.h>
-#include <gen_ndr/property.h>
-#include <libmapi/libmapi.h>
-#include <mapistore/mapistore.h>
-#include <mapistore/mapistore_errors.h>
-#include <mapistore/mapistore_nameid.h>
 
 #import "iCalEvent+MAPIStore.h"
 #import "iCalTimeZone+MAPIStore.h"
diff --git a/OpenChange/iCalTimeZone+MAPIStore.m b/OpenChange/iCalTimeZone+MAPIStore.m
index c13b017dc..f3494e4ad 100644
--- a/OpenChange/iCalTimeZone+MAPIStore.m
+++ b/OpenChange/iCalTimeZone+MAPIStore.m
@@ -25,11 +25,7 @@
 #import "NSData+MAPIStore.h"
 #import "NSDate+MAPIStore.h"
 
-#include <stdbool.h>
-#include <stdint.h>
-#include <talloc.h>
 #undef DEBUG
-#include <libmapi/libmapi.h>
 
 #import "iCalTimeZone+MAPIStore.h"
 
diff --git a/SOPE/NGCards/samples/common.h b/SOPE/NGCards/samples/common.h
index f6c9fdd05..09b8fb7b9 100644
--- a/SOPE/NGCards/samples/common.h
+++ b/SOPE/NGCards/samples/common.h
@@ -27,4 +27,3 @@
 #  include <NGExtensions/NSString+Ext.h>
 #endif
 
-#include <NGExtensions/NGExtensions.h>
diff --git a/SOPE/NGCards/samples/icalds.m b/SOPE/NGCards/samples/icalds.m
index 05fc9b48c..f030f3151 100644
--- a/SOPE/NGCards/samples/icalds.m
+++ b/SOPE/NGCards/samples/icalds.m
@@ -33,11 +33,6 @@
 
 @end
 
-#include <NGCards/iCalDataSource.h>
-#include <NGCards/iCalObject.h>
-#include <EOControl/EOQualifier.h>
-#include <EOControl/EOSortOrdering.h>
-#include "common.h"
 
 @implementation iCal3Tool
 
diff --git a/SOPE/NGCards/samples/icalparsetest.m b/SOPE/NGCards/samples/icalparsetest.m
index 984f14dbc..6128e788d 100644
--- a/SOPE/NGCards/samples/icalparsetest.m
+++ b/SOPE/NGCards/samples/icalparsetest.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#include <SaxObjC/SaxObjC.h>
 
 @interface iCal2Tool : NSObject
 {
diff --git a/SOPE/NGCards/samples/ievalrrule.m b/SOPE/NGCards/samples/ievalrrule.m
index 38e8c864c..9c05f9890 100644
--- a/SOPE/NGCards/samples/ievalrrule.m
+++ b/SOPE/NGCards/samples/ievalrrule.m
@@ -19,10 +19,6 @@
   02111-1307, USA.
 */
 
-#include <NGCards/iCalRecurrenceRule.h>
-#include <NGCards/iCalRecurrenceCalculator.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "common.h"
 
 static NSCalendarDate *dateForString(NSString *_s) {
   // copied from ogo-chkaptconflicts, maybe move to NGExtensions?
diff --git a/SOPE/NGCards/samples/vcf2xml.m b/SOPE/NGCards/samples/vcf2xml.m
index 9c341c44e..f96f9f4f5 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
 
-#include <SaxObjC/SaxObjC.h>
 
 @interface vcf2xml : NSObject
 {
@@ -33,7 +32,6 @@
 
 @end
 
-#include "common.h"
 
 @interface MySAXHandler : SaxDefaultHandler
 {
diff --git a/SOPE/NGCards/tests/common.h b/SOPE/NGCards/tests/common.h
index c76064b51..465651e34 100644
--- a/SOPE/NGCards/tests/common.h
+++ b/SOPE/NGCards/tests/common.h
@@ -22,7 +22,5 @@
 #ifndef __NGiCalTests_common_H__
 #define __NGiCalTests_common_H__
 
-#include <NGExtensions/NGExtensions.h>
-#include <NGExtensions/NGCalendarDateRange.h>
 
 #endif /* __NGiCalTests_common_H__ */
diff --git a/SOPE/NGCards/tests/iCalRecurrenceCalculatorTests.m b/SOPE/NGCards/tests/iCalRecurrenceCalculatorTests.m
index eb6719b43..37effbc8b 100644
--- a/SOPE/NGCards/tests/iCalRecurrenceCalculatorTests.m
+++ b/SOPE/NGCards/tests/iCalRecurrenceCalculatorTests.m
@@ -19,7 +19,6 @@
   02111-1307, USA.
 */
 
-#include "common.h"
 
 @class NGCalendarDateRange;
 @class iCalRecurrenceRule;
@@ -36,8 +35,6 @@
 
 @end
 
-#include "iCalRecurrenceRule.h"
-#include "iCalRecurrenceCalculator.h"
 
 @implementation iCalRecurrenceCalculatorTests
 
diff --git a/SOPE/NGCards/versitCardsSaxDriver/common.h b/SOPE/NGCards/versitCardsSaxDriver/common.h
index 1df591536..6b1777a64 100644
--- a/SOPE/NGCards/versitCardsSaxDriver/common.h
+++ b/SOPE/NGCards/versitCardsSaxDriver/common.h
@@ -22,4 +22,3 @@
 
 #import <Foundation/Foundation.h>
 
-#include <NGExtensions/NGObjectMacros.h>
diff --git a/SoObjects/SOGo/LDAPSource.h b/SoObjects/SOGo/LDAPSource.h
index c19bf1b96..7fe7d7ccf 100644
--- a/SoObjects/SOGo/LDAPSource.h
+++ b/SoObjects/SOGo/LDAPSource.h
@@ -23,7 +23,6 @@
 
 
 #include "SOGoSource.h"
-#include "SOGoConstants.h"
 
 @class LDAPSourceSchema;
 @class NGLdapEntry;
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index 34a26c4ca..3f6ab035a 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <ldap.h>
 
 
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/NSData+Crypto.m b/SoObjects/SOGo/NSData+Crypto.m
index ad0affc2f..c1d1558ba 100644
--- a/SoObjects/SOGo/NSData+Crypto.m
+++ b/SoObjects/SOGo/NSData+Crypto.m
@@ -27,8 +27,6 @@
 #include <crypt.h>
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -36,7 +34,6 @@
 #include <unistd.h>
 
 #if defined(HAVE_GNUTLS)
-#include <stdint.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include "md4.h"
@@ -46,10 +43,6 @@
 #define SHA256_DIGEST_LENGTH 32
 #define SHA512_DIGEST_LENGTH 64
 #elif defined(HAVE_OPENSSL)
-#include <openssl/evp.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-#include <openssl/sha.h>
 #else
 #error this module requires either gnutls or openssl
 #endif
diff --git a/SoObjects/SOGo/NSString+Crypto.m b/SoObjects/SOGo/NSString+Crypto.m
index bd0fa17ba..411b24907 100644
--- a/SoObjects/SOGo/NSString+Crypto.m
+++ b/SoObjects/SOGo/NSString+Crypto.m
@@ -29,7 +29,6 @@
 #import "NSData+Crypto.h"
 #import <NGExtensions/NGBase64Coding.h>
 
-#include "lmhash.h"
 
 @implementation NSString (SOGoCryptoExtension)
 
diff --git a/SoObjects/SOGo/SOGoLDAPUserDefaults.m b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
index ffad7de05..d5268f944 100644
--- a/SoObjects/SOGo/SOGoLDAPUserDefaults.m
+++ b/SoObjects/SOGo/SOGoLDAPUserDefaults.m
@@ -20,9 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <ldap.h>
 
 
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/SOGoSAML2Session.m b/SoObjects/SOGo/SOGoSAML2Session.m
index 69728f616..782bc1f2c 100644
--- a/SoObjects/SOGo/SOGoSAML2Session.m
+++ b/SoObjects/SOGo/SOGoSAML2Session.m
@@ -18,13 +18,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <lasso/lasso.h>
 #include <lasso/xml/misc_text_node.h>
 #include <lasso/xml/saml-2.0/saml2_attribute.h>
 #include <lasso/xml/saml-2.0/saml2_attribute_statement.h>
 #include <lasso/xml/saml-2.0/saml2_attribute_value.h>
 #include <lasso/xml/saml-2.0/samlp2_authn_request.h>
-#include <lasso/xml/saml-2.0/samlp2_response.h>
 
 
 #import <NGObjWeb/WOApplication.h>
diff --git a/SoObjects/SOGo/SOGoSession.m b/SoObjects/SOGo/SOGoSession.m
index c929cd549..301b93db2 100644
--- a/SoObjects/SOGo/SOGoSession.m
+++ b/SoObjects/SOGo/SOGoSession.m
@@ -29,8 +29,6 @@
 
 #import <NGExtensions/NGBase64Coding.h>
 
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/SoObjects/SOGo/md4.c b/SoObjects/SOGo/md4.c
index a2198dcf5..ee50891ea 100644
--- a/SoObjects/SOGo/md4.c
+++ b/SoObjects/SOGo/md4.c
@@ -23,10 +23,8 @@
 #include "md4.h"
 
 #include <stdalign.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
diff --git a/Tests/Unit/TestRTFHandler.m b/Tests/Unit/TestRTFHandler.m
index 35c713c2f..744abaa1b 100644
--- a/Tests/Unit/TestRTFHandler.m
+++ b/Tests/Unit/TestRTFHandler.m
@@ -28,7 +28,6 @@
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSException.h>
 
-#include <string.h>
 
 
 @interface TestRTFHandler : SOGoTest
diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m
index 5ee3a11ff..d71a3ea53 100644
--- a/Tools/SOGoToolRemoveDoubles.m
+++ b/Tools/SOGoToolRemoveDoubles.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
 
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSDictionary.h>
diff --git a/Tools/SOGoToolRenameUser.m b/Tools/SOGoToolRenameUser.m
index 69fd01310..07b471695 100644
--- a/Tools/SOGoToolRenameUser.m
+++ b/Tools/SOGoToolRenameUser.m
@@ -20,7 +20,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
 
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSDictionary.h>
diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index 82cb581fe..3db088396 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -18,12 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <stdio.h>
 #ifdef HAVE_OPENSSL
-#include <openssl/bio.h>
-#include <openssl/err.h>
-#include <openssl/pkcs7.h>
-#include <openssl/x509.h>
 #endif
 
 #import <Foundation/NSDictionary.h>
diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 68298a97f..ce0125e80 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -18,7 +18,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <math.h>
 
 #import <Foundation/NSTimeZone.h>
 #import <Foundation/NSValue.h>