diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index e917d40cc..f8a7b4a24 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -26,6 +26,7 @@
 #import <NGObjWeb/SoObject+SoDAV.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSString+misc.h>
 #import <EOControl/EOQualifier.h>
diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m
index dd1bfd3c2..d47883f15 100644
--- a/SoObjects/Contacts/SOGoContactLDAPFolder.m
+++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m
@@ -25,10 +25,11 @@
 #import <Foundation/NSString.h>
 
 #import <NGObjWeb/NSException+HTTP.h>
-#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOContext.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/SoObject.h>
 #import <NGObjWeb/SoUser.h>
 #import <EOControl/EOSortOrdering.h>
 #import <SaxObjC/XMLNamespaces.h>
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 3b406d1b6..91f3a17a9 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 
 #import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index e5b541ea5..156b4ffeb 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSPropertyList.h>
 #import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
diff --git a/SoObjects/SOGo/SOGoDateFormatter.m b/SoObjects/SOGo/SOGoDateFormatter.m
index 9bddd7626..97eb90b56 100644
--- a/SoObjects/SOGo/SOGoDateFormatter.m
+++ b/SoObjects/SOGo/SOGoDateFormatter.m
@@ -19,6 +19,7 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSCalendarDate.h>
 #import <Foundation/NSUserDefaults.h>
 
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 45cf06636..cf6f1296e 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -61,10 +61,10 @@ static NSString *defaultUserID = @"<default>";
 {
   id newFolder;
   NSArray *elements, *pathElements;
-  NSString *ocsPath, *objectPath, *owner, *ocsName, *folderName;
+  NSString *ocsPath, *objectPath, *login, *ocsName, *folderName;
 
   elements = [reference componentsSeparatedByString: @":"];
-  owner = [elements objectAtIndex: 0];
+  login = [elements objectAtIndex: 0];
   objectPath = [elements objectAtIndex: 1];
   pathElements = [objectPath componentsSeparatedByString: @"/"];
   if ([pathElements count] > 1)
@@ -73,12 +73,12 @@ static NSString *defaultUserID = @"<default>";
     ocsName = @"personal";
 
   ocsPath = [NSString stringWithFormat: @"/Users/%@/%@/%@",
-		      owner, [pathElements objectAtIndex: 0], ocsName];
-  folderName = [NSString stringWithFormat: @"%@_%@", owner, ocsName];
+		      login, [pathElements objectAtIndex: 0], ocsName];
+  folderName = [NSString stringWithFormat: @"%@_%@", login, ocsName];
   newFolder = [[self alloc] initWithName: folderName
 			    inContainer: aContainer];
   [newFolder setOCSPath: ocsPath];
-  [newFolder setOwner: owner];
+  [newFolder setOwner: login];
 
   return newFolder;
 }
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 64671657c..9ffdfc6ec 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -108,17 +108,17 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   NSArray *bLanguages;
   WOContext *context;
-  NSString *language;
+  NSString *lng;
 
   context = [[WOApplication application] context];
   bLanguages = [[context request] browserLanguages];
   if ([bLanguages count] > 0)
-    language = [bLanguages objectAtIndex: 0];
+    lng = [bLanguages objectAtIndex: 0];
 
-  if (![language length])
-    language = defaultLanguage;
+  if (![lng length])
+    lng = defaultLanguage;
 
-  return language;
+  return lng;
 }
 
 + (SOGoUser *) userWithLogin: (NSString *) newLogin
diff --git a/UI/Common/common.h b/UI/Common/common.h
index 9c2549483..2a816fbb1 100644
--- a/UI/Common/common.h
+++ b/UI/Common/common.h
@@ -23,6 +23,7 @@
 #import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WODynamicElement.h>
 #import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/WOResourceManager.h>
 #import <NGObjWeb/WOSession.h>
 #import <NGExtensions/NSObject+Logs.h>