Remove pointless #include from .m and .h files

This was done with a brute-force approach, ensuring no additional warnings from GCC 4.9 under x86_64.
2016-02-13 17:41:54 -05:00 · 2016-02-13 17:41:54 -05:00 · bd56f4cf9f
parent 7c25b53fdf
commit bd56f4cf9f
109 changed files with 0 additions and 307 deletions
--- 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)

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

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

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


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



--- 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"

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

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

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

--- a/OpenChange/MAPIStoreCalendarContext.m
+++ b/OpenChange/MAPIStoreCalendarContext.m
@ -24,7 +24,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

 static Class MAPIStoreCalendarFolderK;

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

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

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

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

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

--- a/OpenChange/MAPIStoreContactsContext.m
+++ b/OpenChange/MAPIStoreContactsContext.m
@ -25,7 +25,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

 static Class MAPIStoreContactsFolderK;

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

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

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

--- a/OpenChange/MAPIStoreContext.h
+++ b/OpenChange/MAPIStoreContext.h
@ -23,7 +23,6 @@
 #ifndef MAPISTORECONTEXT_H
 #define MAPISTORECONTEXT_H

-#include <talloc.h>


@class NSArray;
--- 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 */

--- a/OpenChange/MAPIStoreDBBaseContext.m
+++ b/OpenChange/MAPIStoreDBBaseContext.m
@ -27,7 +27,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

 static Class MAPIStoreDBFolderK;

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

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

--- a/OpenChange/MAPIStoreDBMessageTable.m
+++ b/OpenChange/MAPIStoreDBMessageTable.m
@ -25,7 +25,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

 static Class MAPIStoreDBMessageK = Nil;

--- a/OpenChange/MAPIStoreEmbeddedMessage.m
+++ b/OpenChange/MAPIStoreEmbeddedMessage.m
@ -24,7 +24,6 @@
 #import "NSObject+MAPIStore.h"


-#include <mapistore/mapistore_errors.h>

 static Class MAPIStoreAttachmentK;

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

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

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

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

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

--- a/OpenChange/MAPIStoreGCSBaseContext.m
+++ b/OpenChange/MAPIStoreGCSBaseContext.m
@ -26,8 +26,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>
-#include <dlinklist.h>

@implementation MAPIStoreGCSBaseContext

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

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

--- a/OpenChange/MAPIStoreGCSMessageTable.m
+++ b/OpenChange/MAPIStoreGCSMessageTable.m
@ -29,7 +29,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

@implementation MAPIStoreGCSMessageTable

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

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

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

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

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

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

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

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

--- a/OpenChange/MAPIStoreNotesContext.m
+++ b/OpenChange/MAPIStoreNotesContext.m
@ -24,7 +24,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

@implementation MAPIStoreNotesContext

--- a/OpenChange/MAPIStoreNotesFolder.m
+++ b/OpenChange/MAPIStoreNotesFolder.m
@ -22,7 +22,6 @@

 #import "NSString+MAPIStore.h"

-#include <mapistore/mapistore_errors.h>


@implementation MAPIStoreNotesFolder
--- a/OpenChange/MAPIStoreNotesMessage.m
+++ b/OpenChange/MAPIStoreNotesMessage.m
@ -25,7 +25,6 @@
 #import "NSString+MAPIStore.h"


-#include <mapistore/mapistore_errors.h>

@implementation MAPIStoreNotesMessage

--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@ -23,7 +23,6 @@
 #ifndef MAPISTOREOBJECT_H
 #define MAPISTOREOBJECT_H

-#include <talloc.h>


@class NSDate;
--- 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

--- a/OpenChange/MAPIStoreObjectProxy.h
+++ b/OpenChange/MAPIStoreObjectProxy.h
@ -23,7 +23,6 @@
 #ifndef MAPISTOREOBJECTPROXY_H
 #define MAPISTOREOBJECTPROXY_H

-#include <talloc.h>


@interface MAPIStoreObjectProxy : NSObject
--- 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

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

--- a/OpenChange/MAPIStoreRecurrenceUtils.h
+++ b/OpenChange/MAPIStoreRecurrenceUtils.h
@ -23,7 +23,6 @@
 #ifndef MAPISTORERECURRENCEUTILS_H
 #define MAPISTORERECURRENCEUTILS_H

-#include <talloc.h>


@class iCalEvent;
--- 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)

--- 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;
--- a/OpenChange/MAPIStoreSOGoObject.h
+++ b/OpenChange/MAPIStoreSOGoObject.h
@ -23,7 +23,6 @@
 #ifndef MAPISTORESOGOOBJECT_H
 #define MAPISTORESOGOOBJECT_H

-#include <talloc.h>


@class NSDate;
--- 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

--- 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,
--- 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"

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

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

--- a/OpenChange/MAPIStoreTasksContext.m
+++ b/OpenChange/MAPIStoreTasksContext.m
@ -24,7 +24,6 @@


 #undef DEBUG
-#include <mapistore/mapistore.h>

 static Class MAPIStoreTasksFolderK;

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

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

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

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

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

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

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

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

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

--- 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"

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

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

--- a/OpenChange/SOGoCacheGCSObject+MAPIStore.m
+++ b/OpenChange/SOGoCacheGCSObject+MAPIStore.m
@ -19,7 +19,6 @@
 */


-#include "MAPIStoreTypes.h"

 #include "SOGoCacheGCSObject+MAPIStore.h"

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

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

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

--- a/SOPE/NGCards/versitCardsSaxDriver/common.h
+++ b/SOPE/NGCards/versitCardsSaxDriver/common.h
@ -22,4 +22,3 @@

 #import <Foundation/Foundation.h>

-#include <NGExtensions/NGObjectMacros.h>
--- a/SoObjects/SOGo/LDAPSource.h
+++ b/SoObjects/SOGo/LDAPSource.h
@ -23,7 +23,6 @@


 #include "SOGoSource.h"
-#include "SOGoConstants.h"

@class LDAPSourceSchema;
@class NGLdapEntry;
--- 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>
--- 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
--- 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)

--- a/Show More
+++ b/Show More