diff --git a/SoObjects/SOGo/AgenorUserDefaults.m b/SoObjects/SOGo/AgenorUserDefaults.m
index 5a53c78b7..07bb5d0d6 100644
--- a/SoObjects/SOGo/AgenorUserDefaults.m
+++ b/SoObjects/SOGo/AgenorUserDefaults.m
@@ -19,7 +19,13 @@
   02111-1307, USA.
 */
 
+#import <Foundation/NSPropertyList.h>
+#import <Foundation/NSUserDefaults.h>
 #import <Foundation/NSValue.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
 #import <GDLContentStore/GCSChannelManager.h>
 #import <GDLContentStore/NSURL+GCS.h>
 #import <GDLAccess/EOAdaptorChannel.h>
diff --git a/SoObjects/SOGo/SOGoCustomGroupFolder.m b/SoObjects/SOGo/SOGoCustomGroupFolder.m
index 3e39df8d6..3ad33b950 100644
--- a/SoObjects/SOGo/SOGoCustomGroupFolder.m
+++ b/SoObjects/SOGo/SOGoCustomGroupFolder.m
@@ -18,10 +18,13 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: SOGoCustomGroupFolder.m 115 2004-06-30 11:57:37Z helge $
 
-#include "SOGoCustomGroupFolder.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "SOGoCustomGroupFolder.h"
 
 @implementation SOGoCustomGroupFolder