diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index c03fc476b..fdf8417f8 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -25,7 +25,6 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalMulticolumnDayView.m	\
 	UIxCalWeekView.m		\
 	UIxCalMonthView.m		\
-	UIxCalMonthViewOld.m		\
 	UIxAptTableView.m		\
 					\
 	UIxCalListingActions.m		\
@@ -40,8 +39,7 @@ SchedulerUI_OBJC_FILES =		\
 	UIxCalDateLabel.m		\
 	UIxDatePicker.m			\
 	UIxTimeDateControl.m		\
-	UIxCalParticipationStatusView.m	\
-	UIxCalMonthOverview.m
+	UIxCalParticipationStatusView.m
 
 SchedulerUI_RESOURCE_FILES += \
 	Version		\
diff --git a/UI/Scheduler/SchedulerUIProduct.m b/UI/Scheduler/SchedulerUIProduct.m
index c2936c2b7..bc34f84ed 100644
--- a/UI/Scheduler/SchedulerUIProduct.m
+++ b/UI/Scheduler/SchedulerUIProduct.m
@@ -18,17 +18,11 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: SchedulerUIProduct.m 904 2005-07-22 15:00:36Z helge $
 
 #import <Foundation/NSObject.h>
 
 @interface SchedulerUIProduct : NSObject
-{
-}
-
 @end
 
-#include "common.h"
-
 @implementation SchedulerUIProduct
 @end /* SchedulerUIProduct */
diff --git a/UI/Scheduler/UIxAppointmentProposal.m b/UI/Scheduler/UIxAppointmentProposal.m
index f81d87eba..c8b65ac8e 100644
--- a/UI/Scheduler/UIxAppointmentProposal.m
+++ b/UI/Scheduler/UIxAppointmentProposal.m
@@ -18,9 +18,18 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxAppointmentEditor.m 181 2004-08-11 15:13:25Z helge $
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSValue.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxAppointmentProposal : UIxComponent
 {
@@ -54,12 +63,6 @@
 - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
 @end
 
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <NGCards/NGCards.h>
-#include "common.h"
-
 @implementation UIxAppointmentProposal
 
 - (void)dealloc {
diff --git a/UI/Scheduler/UIxAptTableView.m b/UI/Scheduler/UIxAptTableView.m
index bb0fbd729..a634f9257 100644
--- a/UI/Scheduler/UIxAptTableView.m
+++ b/UI/Scheduler/UIxAptTableView.m
@@ -18,9 +18,8 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxAptTableView.m 59 2004-06-22 13:40:19Z znek $
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
 
 @class NSArray, NSCalendarDate;
 
@@ -37,8 +36,6 @@
 
 @end
 
-#include "common.h"
-
 @implementation UIxAptTableView
 
 - (void)dealloc {
diff --git a/UI/Scheduler/UIxCalDateLabel.m b/UI/Scheduler/UIxCalDateLabel.m
index c75ba5ba5..9931a5c85 100644
--- a/UI/Scheduler/UIxCalDateLabel.m
+++ b/UI/Scheduler/UIxCalDateLabel.m
@@ -18,9 +18,13 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxCalDateLabel.m 619 2005-03-02 15:16:32Z znek $
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+
+#import <NGCards/NSCalendarDate+ICal.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxCalDateLabel : UIxComponent
 {
@@ -36,9 +40,6 @@
 
 @end
 
-#include "common.h"
-#include <NGCards/NGCards.h>
-
 @implementation UIxCalDateLabel
 
 - (void)dealloc {
diff --git a/UI/Scheduler/UIxCalParticipationStatusView.m b/UI/Scheduler/UIxCalParticipationStatusView.m
index 63dd22f2a..fc1c1ec43 100644
--- a/UI/Scheduler/UIxCalParticipationStatusView.m
+++ b/UI/Scheduler/UIxCalParticipationStatusView.m
@@ -18,9 +18,9 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxCalParticipationStatusView.m 759 2005-07-14 16:26:32Z znek $
 
-#include <NGObjWeb/NGObjWeb.h>
+#import <NGCards/iCalPerson.h>
+#import <NGObjWeb/WOComponent.h>
 
 @interface UIxCalParticipationStatusView : WOComponent
 {
@@ -31,9 +31,6 @@
 
 @end
 
-#include <NGCards/NGCards.h> /* for iCalPersonPartStat */
-#include "common.h"
-
 @implementation UIxCalParticipationStatusView
 
 - (void)setPartStat:(id)_partStat {
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index b808e61c7..fd5b0f244 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -1,20 +1,23 @@
-// $Id: UIxCalView.m 1080 2007-06-12 22:15:47Z wolfgang $
 
-#import "common.h"
 //#import <OGoContentStore/OCSFolder.h>
 
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
 #import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
 #import <NGCards/NGCards.h>
 
-#import <SOGoUI/SOGoAptFormatter.h>
-#import "UIxComponent+Scheduler.h"
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/SOGo/NSArray+Utilities.h>
+#import <SoObjects/SOGo/SOGoUser.h>
+#import <SoObjects/SOGo/SOGoObject.h>
 
-#import "SoObjects/Appointments/SOGoAppointmentFolder.h"
-#import <SOGo/NSArray+Utilities.h>
-#import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoObject.h>
+#import <SOGoUI/SOGoAptFormatter.h>
+
+#import "UIxComponent+Scheduler.h"
 
 #import "UIxCalView.h"
 
diff --git a/UI/Scheduler/UIxDatePicker.m b/UI/Scheduler/UIxDatePicker.m
index dbcc15a8f..82893b4c5 100644
--- a/UI/Scheduler/UIxDatePicker.m
+++ b/UI/Scheduler/UIxDatePicker.m
@@ -19,7 +19,13 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/WOComponent.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSCalendarDate.h>
+
+#import <NGObjWeb/WOComponent.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGExtensions/NSObject+Logs.h>
 
 @class NSString;
 
@@ -33,14 +39,12 @@
   BOOL isDisabled;
 }
 
-- (NSString *)dateID;
-- (NSString *)dateFormat;
-- (NSString *)jsDateFormat;
-- (BOOL)useISOFormats;
+- (NSString *) dateID;
+- (NSString *) dateFormat;
+- (NSString *) jsDateFormat;
+- (BOOL) useISOFormats;
 @end
 
-#include "common.h"
-
 @implementation UIxDatePicker
 
 - (id) init
diff --git a/UI/Scheduler/UIxTaskProposal.m b/UI/Scheduler/UIxTaskProposal.m
index bdd092d02..c472684b8 100644
--- a/UI/Scheduler/UIxTaskProposal.m
+++ b/UI/Scheduler/UIxTaskProposal.m
@@ -20,7 +20,17 @@
 */
 // $Id: UIxTaskEditor.m 181 2004-08-11 15:13:25Z helge $
 
-#include <SOGoUI/UIxComponent.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSValue.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGCards/iCalPerson.h>
+
+#import <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#import <SoObjects/Appointments/SOGoFreeBusyObject.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxTaskProposal : UIxComponent
 {
@@ -54,12 +64,6 @@
 - (void)setICalPersons:(NSArray *)_ps asQueryParameter:(NSString *)_qp;
 @end
 
-#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SoObjects/Appointments/SOGoFreeBusyObject.h>
-#include <NGExtensions/NGCalendarDateRange.h>
-#include <NGCards/NGCards.h>
-#include "common.h"
-
 @implementation UIxTaskProposal
 
 - (void)dealloc {
diff --git a/UI/Scheduler/common.h b/UI/Scheduler/common.h
deleted file mode 100644
index 80c19bf13..000000000
--- a/UI/Scheduler/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Copyright (C) 2004 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.
-*/
-// $Id: common.h 1101 2007-07-10 19:27:48Z wolfgang $
-
-#import <Foundation/Foundation.h>
-
-#if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
-#elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <NGExtensions/NGObjectMacros.h>
-#  import <NGExtensions/NSString+Ext.h>
-#endif
-
-#import <NGExtensions/NGExtensions.h>
-#import <NGObjWeb/NGObjWeb.h>
-#import <NGObjWeb/SoObjects.h>
-
-#warning importing common.h is baaad