diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index d904acbc0..5a53c78b7 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -26,7 +26,6 @@
 #import <GDLAccess/EOAdaptorContext.h>
 #import <GDLAccess/EOAttribute.h>
 
-#import "common.h"
 #import "AgenorUserDefaults.h"
 
 @implementation AgenorUserDefaults
diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m
index ca0ec34e6..3fc0684e9 100644
--- a/SoObjects/SOGo/SOGoUserFolder.m
+++ b/SoObjects/SOGo/SOGoUserFolder.m
@@ -19,15 +19,19 @@
   02111-1307, USA.
 */
 
-#import "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
 
-#import "SOGoUser.h"
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoFreeBusyObject.h>
+#import <Contacts/SOGoContactFolders.h>
+#import <Mailer/SOGoMailAccounts.h>
 
-#import "Appointments/SOGoAppointmentFolder.h"
-#import "Appointments/SOGoFreeBusyObject.h"
-#import "Contacts/SOGoContactFolders.h"
-#import "Mailer/SOGoMailAccounts.h"
 #import "SOGoPermissions.h"
+#import "SOGoUser.h"
 
 #import "SOGoUserFolder.h"