diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 4d0b33578..7e0c0e6dc 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -19,11 +19,28 @@
   02111-1307, USA.
 */
 
-#import <GDLContentStore/GCSFolder.h>
-#import <NGCards/NGCards.h>
-#import <NGObjWeb/WOContext.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSValue.h>
+
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoObject+SoDAV.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WOMessage.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGExtensions/NGLoggerManager.h>
+#import <NGExtensions/NSString+misc.h>
+#import <GDLContentStore/GCSFolder.h>
+#import <DOM/DOMProtocols.h>
+#import <EOControl/EOQualifier.h>
+#import <NGCards/iCalDateTime.h>
+#import <NGCards/iCalPerson.h>
+#import <NGCards/iCalRecurrenceCalculator.h>
+#import <NGCards/NSString+NGCards.h>
 #import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <SaxObjC/SaxObjC.h>
 #import <SaxObjC/XMLNamespaces.h>
 
@@ -34,8 +51,6 @@
 #import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoUser.h>
 
-#import "common.h"
-
 #import "SOGoAppointmentObject.h"
 #import "SOGoTaskObject.h"
 
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 1b7a673ea..9b1b334fe 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#import "SOGoAppointmentObject.h"
-
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEvent.h>
 #import <NGCards/iCalEventChanges.h>
@@ -30,9 +31,8 @@
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
-#import "common.h"
-
 #import "NSArray+Appointments.h"
+#import "SOGoAppointmentObject.h"
 
 @implementation SOGoAppointmentObject
 
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index 98a9d74b8..788669afd 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -19,10 +19,16 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCharacterSet.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGObjWeb/WOActionResults.h>
+#import <NGObjWeb/WOMessage.h>
+#import <NGExtensions/NSObject+Logs.h>
 #import <NGCards/iCalEntityObject.h>
 
 #import "SOGoAptMailNotification.h"
-#import "common.h"
 
 @interface SOGoAptMailNotification (PrivateAPI)
 - (BOOL)isSubject;
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index 5f987aa5b..c77601288 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -22,6 +22,10 @@
 
 #import <Foundation/NSString.h>
 
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/SoSecurityManager.h>
+#import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalPerson.h>
 #import <NGCards/iCalRepeatableEntityObject.h>
@@ -34,8 +38,6 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/Appointments/SOGoAppointmentFolder.h>
 
-#import "common.h"
-
 #import "SOGoAptMailNotification.h"
 #import "iCalEntityObject+SOGo.h"
 #import "SOGoCalendarComponent.h"
diff --git a/SoObjects/Appointments/SOGoFreeBusyObject.m b/SoObjects/Appointments/SOGoFreeBusyObject.m
index b892914c3..d8559111a 100644
--- a/SoObjects/Appointments/SOGoFreeBusyObject.m
+++ b/SoObjects/Appointments/SOGoFreeBusyObject.m
@@ -19,13 +19,20 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSValue.h>
+
+#import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalFreeBusy.h>
 #import <NGCards/iCalPerson.h>
 
-#import "common.h"
-
 #import <SOGo/LDAPUserManager.h>
+#import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoPermissions.h>
 
 #import "SOGoFreeBusyObject.h"
diff --git a/SoObjects/Appointments/SOGoGroupAppointmentFolder.m b/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
index 80985e7f7..ad33f26d6 100644
--- a/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoGroupAppointmentFolder.m
@@ -19,11 +19,19 @@
   02111-1307, USA.
 */
 
-#import <NGCards/iCalEntityObject.h>
-#import <SOGo/SOGoGroupFolder.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
 
-#include "SOGoGroupAppointmentFolder.h"
-#include "common.h"
+#import <NGObjWeb/SoSecurityManager.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGCards/iCalEntityObject.h>
+
+#import <SOGo/SOGoGroupFolder.h>
+#import <SOGo/SOGoPermissions.h>
+
+#import "SOGoGroupAppointmentFolder.h"
 
 @implementation SOGoGroupAppointmentFolder
 
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index cc15067f5..5fc7b15aa 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -30,7 +30,6 @@
 #import <NGMail/NGMail.h>
 #import <NGMail/NGSendMail.h>
 #import "SOGoAptMailNotification.h"
-#import "common.h"
 
 #import "NSArray+Appointments.h"
 
diff --git a/SoObjects/Appointments/common.h b/SoObjects/Appointments/common.h
deleted file mode 100644
index c3c5c3aef..000000000
--- a/SoObjects/Appointments/common.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-  Copyright (C) 2002-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/Foundation.h>
-
-#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  include <NGExtensions/NGObjectMacros.h>
-#  include <NGExtensions/NSString+Ext.h>
-#endif
-
-#include <NGExtensions/NGExtensions.h>
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObjects.h>
-
-#warning importing common.h is baaad