diff --git a/OGoContentStore/common.h b/OGoContentStore/common.h
deleted file mode 100644
index 460a88ee8..000000000
--- a/OGoContentStore/common.h
+++ /dev/null
@@ -1,38 +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.
-*/
-// $Id$
-
-#import <Foundation/Foundation.h>
-#import <Foundation/NSURL.h>
-
-#include <NGExtensions/NGExtensions.h>
-
-#warning importing common.h is baaad
-
-#if NeXT_RUNTIME || APPLE_RUNTIME
-#  define objc_free(__mem__)    free(__mem__)
-#  define objc_malloc(__size__) malloc(__size__)
-#  define objc_calloc(__cnt__, __size__) calloc(__cnt__, __size__)
-#  define objc_realloc(__ptr__, __size__) realloc(__ptr__, __size__)
-#  ifndef sel_eq
-#    define sel_eq(sela,selb) (sela==selb?YES:NO)
-#  endif
-#endif
diff --git a/OGoContentStore/iCalEntityObject+OCS.m b/OGoContentStore/iCalEntityObject+OCS.m
index 6ff911c88..e95f8484d 100644
--- a/OGoContentStore/iCalEntityObject+OCS.m
+++ b/OGoContentStore/iCalEntityObject+OCS.m
@@ -19,8 +19,7 @@
  02111-1307, USA.
 */
 
-#include "iCalEntityObject+OCS.h"
-#include "common.h"
+#import "iCalEntityObject+OCS.h"
 
 @implementation iCalEntityObject (OCS)
 
diff --git a/OGoContentStore/iCalRepeatableEntityObject+OCS.m b/OGoContentStore/iCalRepeatableEntityObject+OCS.m
index 5bedb6e2d..191a44035 100644
--- a/OGoContentStore/iCalRepeatableEntityObject+OCS.m
+++ b/OGoContentStore/iCalRepeatableEntityObject+OCS.m
@@ -19,8 +19,10 @@
   02111-1307, USA.
 */
 
-#include "iCalRepeatableEntityObject+OCS.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+
+#import "iCalRepeatableEntityObject+OCS.h"
 
 @implementation iCalRepeatableEntityObject (OCS)
 
diff --git a/OGoContentStore/test_quick_extract.m b/OGoContentStore/test_quick_extract.m
index b2e46796c..eb728f833 100644
--- a/OGoContentStore/test_quick_extract.m
+++ b/OGoContentStore/test_quick_extract.m
@@ -20,9 +20,15 @@
 */
 
 
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSObject.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSString.h>
 
-@class NSArray;
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFieldExtractor.h>
 
 @interface TestQuickExtract : NSObject
 
@@ -30,9 +36,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFieldExtractor.h>
-#include "common.h"
-
 @implementation TestQuickExtract
 
 - (int)usage:(NSArray *)_args {