diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 94c328df7..56aab2fe8 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -976,7 +976,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   NSCalendarDate *recurrenceId, *masterEndDate, *endDate;
   NSMutableDictionary *newRecord;
   NGCalendarDateRange *newRecordRange;
-  NSComparisonResult compare;
   NSNumber *dateSecs;
   id master;
 
diff --git a/SoObjects/Appointments/SOGoEMailAlarmsManager.h b/SoObjects/Appointments/SOGoEMailAlarmsManager.h
index f6050a9ca..353fcffc3 100644
--- a/SoObjects/Appointments/SOGoEMailAlarmsManager.h
+++ b/SoObjects/Appointments/SOGoEMailAlarmsManager.h
@@ -32,10 +32,6 @@
 
 + (id) sharedEMailAlarmsManager;
 
-/* PUT */
-- (void) handleAlarmsInCalendar: (iCalCalendar *) calendar
-                  fromComponent: (SOGoCalendarComponent *) component;
-
 /* DELETE */
 - (void) deleteAlarmsFromComponent: (SOGoCalendarComponent *) component;
 
diff --git a/SoObjects/Appointments/SOGoEMailAlarmsManager.m b/SoObjects/Appointments/SOGoEMailAlarmsManager.m
index 7a743f942..bc79fd8b5 100644
--- a/SoObjects/Appointments/SOGoEMailAlarmsManager.m
+++ b/SoObjects/Appointments/SOGoEMailAlarmsManager.m
@@ -25,6 +25,8 @@
 
 #import <NGExtensions/NSObject+Logs.h>
 
+#import <NGObjWeb/WOContext+SoObjects.h>
+
 #import <NGCards/iCalAlarm.h>
 #import <NGCards/iCalCalendar.h>
 #import <NGCards/iCalEvent.h>
@@ -34,6 +36,9 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/GCSFolderManager.h>
 
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserFolder.h>
+
 #import "SOGoAppointmentFolder.h"
 #import "SOGoAppointmentFolders.h"
 #import "SOGoCalendarComponent.h"
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
index cd15fa38a..8bb4b500e 100644
--- a/SoObjects/Appointments/SOGoTaskObject.m
+++ b/SoObjects/Appointments/SOGoTaskObject.m
@@ -21,6 +21,7 @@
 
 #import <Foundation/NSCalendarDate.h>
 
+#import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>