diff --git a/UI/SOGoUI/SOGoAptFormatter.m b/UI/SOGoUI/SOGoAptFormatter.m
index 0568cc2e8..4824f4b4a 100644
--- a/UI/SOGoUI/SOGoAptFormatter.m
+++ b/UI/SOGoUI/SOGoAptFormatter.m
@@ -19,8 +19,11 @@
   02111-1307, USA.
 */
 
-#include "SOGoAptFormatter.h"
-#include "common.h"
+#import <NGExtensions/NSCalendarDate+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSNull+misc.h>
+
+#import "SOGoAptFormatter.h"
 
 @interface SOGoAptFormatter(PrivateAPI)
 - (NSString *)titleForApt:(id)_apt :(NSCalendarDate *)_refDate;
diff --git a/UI/SOGoUI/SOGoJSStringFormatter.m b/UI/SOGoUI/SOGoJSStringFormatter.m
index 86b5abb53..654d67f7b 100644
--- a/UI/SOGoUI/SOGoJSStringFormatter.m
+++ b/UI/SOGoUI/SOGoJSStringFormatter.m
@@ -21,8 +21,7 @@
 // $Id: SOGoJSStringFormatter.m 415 2004-10-20 15:47:45Z znek $
 
 
-#include "SOGoJSStringFormatter.h"
-#include "common.h"
+#import "SOGoJSStringFormatter.h"
 
 @implementation SOGoJSStringFormatter
 
diff --git a/UI/SOGoUI/WOContext+UIx.m b/UI/SOGoUI/WOContext+UIx.m
index 3ebf7a1f5..36c2f9f43 100644
--- a/UI/SOGoUI/WOContext+UIx.m
+++ b/UI/SOGoUI/WOContext+UIx.m
@@ -19,8 +19,10 @@
   02111-1307, USA.
 */
 
-#include "WOContext+UIx.h"
-#include "common.h"
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSValue.h>
+
+#import "WOContext+UIx.h"
 
 @implementation WOContext (UIx)
 
diff --git a/UI/SOGoUI/common.h b/UI/SOGoUI/common.h
deleted file mode 100644
index 56a455ce6..000000000
--- a/UI/SOGoUI/common.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Copyright (C) 2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-
-#import <Foundation/Foundation.h>
-#include <NGExtensions/NGExtensions.h>
-
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObjects.h>
-
-#warning importing common.h is baaad