diff --git a/SOPE/NGCards/IcalElements.m b/SOPE/NGCards/IcalElements.m
index f66952b69..1ff018f3a 100644
--- a/SOPE/NGCards/IcalElements.m
+++ b/SOPE/NGCards/IcalElements.m
@@ -19,7 +19,14 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/WODynamicElement.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WODynamicElement.h>
+#import <NGObjWeb/WOResponse.h>
 
 @interface IcalComponent : WODynamicElement
 {
diff --git a/SOPE/NGCards/IcalResponse.m b/SOPE/NGCards/IcalResponse.m
index 1e90c2b2c..843fe43e1 100644
--- a/SOPE/NGCards/IcalResponse.m
+++ b/SOPE/NGCards/IcalResponse.m
@@ -19,8 +19,7 @@
   02111-1307, USA.
 */
 
-#include "IcalResponse.h"
-#import <Foundation/Foundation.h>
+#import "IcalResponse.h"
 
 @implementation IcalResponse
 
diff --git a/SOPE/NGCards/NGCardsSaxHandler.m b/SOPE/NGCards/NGCardsSaxHandler.m
index d961c9564..e91cb36c9 100644
--- a/SOPE/NGCards/NGCardsSaxHandler.m
+++ b/SOPE/NGCards/NGCardsSaxHandler.m
@@ -21,6 +21,7 @@
 
 #import <string.h>
 #import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
 
 #import "NGCardsSaxHandler.h"
 
@@ -44,10 +45,9 @@
 - (void) dealloc
 {
   if (content)
-    free(content);
+    free (content);
   [cards release];
-  if (currentGroup)
-    [currentGroup release];
+  [currentGroup release];
   [super dealloc];
 }
 
@@ -64,7 +64,7 @@
 {
   if (content)
     {
-      free(content);
+      free (content);
       content = NULL;
     }
 
@@ -227,7 +227,7 @@
 - (void) startCollectingContent
 {
   if (content) {
-    free(content);
+    free (content);
     content = NULL;
   }
   vcs.collectContent = 1;
diff --git a/SOPE/NGCards/iCalRepeatableEntityObject.m b/SOPE/NGCards/iCalRepeatableEntityObject.m
index 2b36288c6..90d1183bf 100644
--- a/SOPE/NGCards/iCalRepeatableEntityObject.m
+++ b/SOPE/NGCards/iCalRepeatableEntityObject.m
@@ -19,10 +19,16 @@
   02111-1307, USA.
 */
 
-#include "iCalRepeatableEntityObject.h"
-#include <NGExtensions/NGCalendarDateRange.h>
-#include "iCalRecurrenceRule.h"
-#include "iCalRecurrenceCalculator.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NGCalendarDateRange.h>
+
+#import "iCalRecurrenceRule.h"
+#import "iCalRecurrenceCalculator.h"
+#import "iCalRepeatableEntityObject.h"
 
 @implementation iCalRepeatableEntityObject