diff --git a/SoObjects/Appointments/SOGoAptMailNotification.h b/SoObjects/Appointments/SOGoAptMailNotification.h
index 99330d746..e7c92be6d 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.h
+++ b/SoObjects/Appointments/SOGoAptMailNotification.h
@@ -25,6 +25,7 @@
 #include <NGObjWeb/SoComponent.h>
 
 @class NSString, NSTimeZone, NSCalendarDate;
+@class iCalEvent;
 
 /*
  * NOTE: We inherit from SoComponent in order to get the correct
@@ -32,20 +33,20 @@
  */
 @interface SOGoAptMailNotification : SoComponent
 {
-  id             oldApt;
-  id             newApt;
-  NSString       *homePageURL;
-  NSTimeZone     *viewTZ;
+  iCalEvent* oldApt;
+  iCalEvent* newApt;
+  NSString *homePageURL;
+  NSTimeZone *viewTZ;
   NSCalendarDate *oldStartDate;
   NSCalendarDate *newStartDate;
-  BOOL           isSubject;
+  BOOL isSubject;
 }
 
-- (id)oldApt;
-- (void)setOldApt:(id)_oldApt;
+- (id) oldApt;
+- (void) setOldApt: (iCalEvent *) _oldApt;
 
-- (id)newApt;
-- (void)setNewApt:(id)_newApt;
+- (id) newApt;
+- (void) setNewApt: (iCalEvent *) _newApt;
 
 - (NSString *)homePageURL;
 - (void)setHomePageURL:(NSString *)_homePageURL;
diff --git a/SoObjects/Appointments/SOGoAptMailNotification.m b/SoObjects/Appointments/SOGoAptMailNotification.m
index c6cc518c1..1ed6b36e1 100644
--- a/SoObjects/Appointments/SOGoAptMailNotification.m
+++ b/SoObjects/Appointments/SOGoAptMailNotification.m
@@ -19,9 +19,10 @@
   02111-1307, USA.
 */
 
-#include "SOGoAptMailNotification.h"
-#include <SOGo/SOGoAppointment.h>
-#include "common.h"
+#import <NGCards/iCalEvent.h>
+
+#import "SOGoAptMailNotification.h"
+#import "common.h"
 
 @interface SOGoAptMailNotification (PrivateAPI)
 - (BOOL)isSubject;
@@ -57,14 +58,16 @@ static NSTimeZone     *EST = nil;
 - (id)oldApt {
   return self->oldApt;
 }
-- (void)setOldApt:(id)_oldApt {
+- (void)setOldApt:(iCalEvent *)_oldApt {
   ASSIGN(self->oldApt, _oldApt);
 }
 
 - (id)newApt {
   return self->newApt;
 }
-- (void)setNewApt:(id)_newApt {
+
+- (void)setNewApt:(iCalEvent *) _newApt
+{
   ASSIGN(self->newApt, _newApt);
 }