diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m
index c5002dc0e..f66952b69 100644
--- a/SOPE/NGCards/IcalElements.m
+++ b/SOPE/NGCards/IcalElements.m
@@ -38,7 +38,6 @@
 }
 @end
 
-#include "common.h"
 
 static inline NSDictionary *ExtractParameters(NSDictionary *_set) {
   /* extracts ? parameters */
diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index 8c77b5574..d961c9564 100644
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@@ -19,9 +19,10 @@
   02111-1307, USA.
 */
 
-#import "NGCardsSaxHandler.h"
-#import "common.h"
 #import <string.h>
+#import <Foundation/NSArray.h>
+
+#import "NGCardsSaxHandler.h"
 
 #import "CardGroup.h"
 
diff --git a/SOPE/NGCards/NSCalendarDate+ICal.m b/SOPE/NGCards/NSCalendarDate+ICal.m
index 7e4201987..bca9721f6 100644
--- a/SOPE/NGCards/NSCalendarDate+ICal.m
+++ b/SOPE/NGCards/NSCalendarDate+ICal.m
@@ -19,9 +19,13 @@
   02111-1307, USA.
 */
 
-#include "NSCalendarDate+ICal.h"
-#include "iCalDateHolder.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "NSCalendarDate+ICal.h"
+#import "iCalDateHolder.h"
 
 static NSTimeZone *gmt = nil;
 static inline void _setupGMT(void) {
diff --git a/SOPE/NGCards/iCalAlarm.m b/SOPE/NGCards/iCalAlarm.m
index 2d6a95b72..a4218fa84 100644
--- a/SOPE/NGCards/iCalAlarm.m
+++ b/SOPE/NGCards/iCalAlarm.m
@@ -19,12 +19,13 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSString.h>
+
 #import "iCalAttachment.h"
 #import "iCalRecurrenceRule.h"
 #import "iCalTrigger.h"
 
 #import "iCalAlarm.h"
-#import "common.h"
 
 @implementation iCalAlarm
 
diff --git a/SOPE/NGCards/iCalAttachment.m b/SOPE/NGCards/iCalAttachment.m
index b115e0994..6963abd69 100644
--- a/SOPE/NGCards/iCalAttachment.m
+++ b/SOPE/NGCards/iCalAttachment.m
@@ -19,8 +19,8 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSString.h>
 #import "iCalAttachment.h"
-#import "common.h"
 
 @implementation iCalAttachment
 
diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
index 6ba00f168..17a1d483e 100644
--- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m
@@ -19,15 +19,19 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <Foundation/NSDate.h>
+#import <Foundation/NSArray.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalDailyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;
diff --git a/SOPE/NGCards/iCalDataSource.m b/SOPE/NGCards/iCalDataSource.m
index b84c39402..2bf9891c2 100644
--- a/SOPE/NGCards/iCalDataSource.m
+++ b/SOPE/NGCards/iCalDataSource.m
@@ -19,11 +19,25 @@
   02111-1307, USA.
 */
 
-#include "iCalDataSource.h"
-#include "iCalObject.h"
-#include "iCalCalendar.h"
-#include <SaxObjC/SaxObjC.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSURL.h>
+
+#import <EOControl/EOClassDescription.h>
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOQualifier.h>
+#import <EOControl/EOSortOrdering.h>
+#import <NGExtensions/EODataSource+NGExtensions.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <SaxObjC/SaxObjectDecoder.h>
+#import <SaxObjC/SaxXMLReaderFactory.h>
+
+#import "iCalObject.h"
+#import "iCalCalendar.h"
+
+#import "iCalDataSource.h"
 
 @interface NSObject(suppressCapitalizedKeyWarning)
 + (void)suppressCapitalizedKeyWarning;
diff --git a/SOPE/NGCards/iCalDateHolder.m b/SOPE/NGCards/iCalDateHolder.m
index 91c4e0a8c..c6e73890a 100644
--- a/SOPE/NGCards/iCalDateHolder.m
+++ b/SOPE/NGCards/iCalDateHolder.m
@@ -19,9 +19,17 @@
   02111-1307, USA.
 */
 
-#include "iCalDateHolder.h"
-#include "iCalObject.h"
-#include "common.h"
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimeZone.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalDateHolder.h"
+#import "iCalObject.h"
 
 @interface NSTimeZone(iCalTimeZone)
 
diff --git a/SOPE/NGCards/iCalEventChanges.m b/SOPE/NGCards/iCalEventChanges.m
index 6a7401c13..ccc4ab17f 100644
--- a/SOPE/NGCards/iCalEventChanges.m
+++ b/SOPE/NGCards/iCalEventChanges.m
@@ -19,11 +19,11 @@
  02111-1307, USA.
  */
 
+#import <Foundation/NSArray.h>
 
-#include "iCalEventChanges.h"
-#include "iCalEvent.h"
-#include "iCalPerson.h"
-#include "common.h"
+#import "iCalEventChanges.h"
+#import "iCalEvent.h"
+#import "iCalPerson.h"
 
 @interface iCalEventChanges (PrivateAPI)
 - (void)_trackAttendeeChanges:(iCalEvent *)_from :(iCalEvent *)_to;
diff --git a/SOPE/NGCards/iCalJournal.m b/SOPE/NGCards/iCalJournal.m
index 3c158772f..a2ac9cb51 100644
--- a/SOPE/NGCards/iCalJournal.m
+++ b/SOPE/NGCards/iCalJournal.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalJournal.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalJournal.h"
 
 @implementation iCalJournal
 
diff --git a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
index b2809edad..a71125404 100644
--- a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
@@ -19,16 +19,17 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalMonthlyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
-#include <string.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
+#import <string.h>
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;
diff --git a/SOPE/NGCards/iCalObject.m b/SOPE/NGCards/iCalObject.m
index 71f4597cd..ad1573546 100644
--- a/SOPE/NGCards/iCalObject.m
+++ b/SOPE/NGCards/iCalObject.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalObject.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalObject.h"
 
 @implementation iCalObject
 
diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m
index e22a81aba..68e3deef5 100644
--- a/SOPE/NGCards/iCalPerson.m
+++ b/SOPE/NGCards/iCalPerson.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalPerson.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalPerson.h"
 
 @implementation iCalPerson
 
diff --git a/SOPE/NGCards/iCalRecurrenceCalculator.m b/SOPE/NGCards/iCalRecurrenceCalculator.m
index d144efead..a56eaef38 100644
--- a/SOPE/NGCards/iCalRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalRecurrenceCalculator.m
@@ -19,11 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NGCalendarDateRange.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
+
+
+#import "iCalRecurrenceCalculator.h"
 
 /* class cluster */
 
diff --git a/SOPE/NGCards/iCalRepeatableEntityObject.m b/SOPE/NGCards/iCalRepeatableEntityObject.m
index 1a772d026..2b36288c6 100644
--- a/SOPE/NGCards/iCalRepeatableEntityObject.m
+++ b/SOPE/NGCards/iCalRepeatableEntityObject.m
@@ -23,7 +23,6 @@
 #include <NGExtensions/NGCalendarDateRange.h>
 #include "iCalRecurrenceRule.h"
 #include "iCalRecurrenceCalculator.h"
-#include "common.h"
 
 @implementation iCalRepeatableEntityObject
 
diff --git a/SOPE/NGCards/iCalTrigger.m b/SOPE/NGCards/iCalTrigger.m
index ac26958f1..d48e8b1c6 100644
--- a/SOPE/NGCards/iCalTrigger.m
+++ b/SOPE/NGCards/iCalTrigger.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "iCalTrigger.h"
-#include "common.h"
+#import <Foundation/NSString.h>
+
+#import "iCalTrigger.h"
 
 @implementation iCalTrigger
 
diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
index 1db42c843..eade01969 100644
--- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
@@ -19,15 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalWeeklyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator (PrivateAPI)
 
diff --git a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
index b940b26ac..53603d5e4 100644
--- a/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalYearlyRecurrenceCalculator.m
@@ -19,15 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRecurrenceCalculator.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+
+#import "iCalRecurrenceCalculator.h"
 
 @interface iCalYearlyRecurrenceCalculator : iCalRecurrenceCalculator
 @end
 
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "NSCalendarDate+ICal.h"
-#include "common.h"
+#import <NGExtensions/NGCalendarDateRange.h>
+#import "iCalRecurrenceRule.h"
+#import "NSCalendarDate+ICal.h"
 
 @interface iCalRecurrenceCalculator(PrivateAPI)
 - (NSCalendarDate *)lastInstanceStartDate;