diff --git a/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m b/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m
index dca32501d..0eb36facd 100644
--- a/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m
+++ b/SOPE/GDLContentStore/EOAdaptorChannel+GCS.m
@@ -19,8 +19,10 @@
   02111-1307, USA.
 */
 
-#include "EOAdaptorChannel+GCS.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import "EOAdaptorChannel+GCS.h"
 
 @implementation EOAdaptorChannel(GCS)
 
diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m
index 965ea77e6..ec12ae59d 100644
--- a/SOPE/GDLContentStore/EOQualifier+GCS.m
+++ b/SOPE/GDLContentStore/EOQualifier+GCS.m
@@ -19,8 +19,13 @@
   02111-1307, USA.
 */
 
-#include "EOQualifier+GCS.h"
-#include "common.h"
+#import <Foundation/NSValue.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "EOQualifier+GCS.h"
 
 @implementation EOQualifier(GCS)
 
diff --git a/SOPE/GDLContentStore/GCSChannelManager.m b/SOPE/GDLContentStore/GCSChannelManager.m
index 566e8e311..13159677c 100644
--- a/SOPE/GDLContentStore/GCSChannelManager.m
+++ b/SOPE/GDLContentStore/GCSChannelManager.m
@@ -19,13 +19,23 @@
   02111-1307, USA.
 */
 
-#include "GCSChannelManager.h"
-#include "NSURL+GCS.h"
-#include "EOAdaptorChannel+GCS.h"
-#include <GDLAccess/EOAdaptor.h>
-#include <GDLAccess/EOAdaptorContext.h>
-#include <GDLAccess/EOAdaptorChannel.h>
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCalendarDate.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSTimer.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import <GDLAccess/EOAdaptor.h>
+#import <GDLAccess/EOAdaptorContext.h>
+#import <GDLAccess/EOAdaptorChannel.h>
+
+#import "GCSChannelManager.h"
+#import "NSURL+GCS.h"
+#import "EOAdaptorChannel+GCS.h"
 
 /*
   TODO:
diff --git a/SOPE/GDLContentStore/GCSContext.m b/SOPE/GDLContentStore/GCSContext.m
index 17dd48574..191f2aab0 100644
--- a/SOPE/GDLContentStore/GCSContext.m
+++ b/SOPE/GDLContentStore/GCSContext.m
@@ -19,8 +19,7 @@
   02111-1307, USA.
 */
 
-#include "GCSContext.h"
-#include "common.h"
+#import "GCSContext.h"
 
 @implementation GCSContext
 @end /* GCSContext */
diff --git a/SOPE/GDLContentStore/GCSFieldExtractor.m b/SOPE/GDLContentStore/GCSFieldExtractor.m
index 6ec8af66d..134a40343 100644
--- a/SOPE/GDLContentStore/GCSFieldExtractor.m
+++ b/SOPE/GDLContentStore/GCSFieldExtractor.m
@@ -19,8 +19,7 @@
   02111-1307, USA.
 */
 
-#include "GCSFieldExtractor.h"
-#include "common.h"
+#import "GCSFieldExtractor.h"
 
 @implementation GCSFieldExtractor
 
diff --git a/SOPE/GDLContentStore/GCSFieldInfo.m b/SOPE/GDLContentStore/GCSFieldInfo.m
index 96a8578cd..41d476c20 100644
--- a/SOPE/GDLContentStore/GCSFieldInfo.m
+++ b/SOPE/GDLContentStore/GCSFieldInfo.m
@@ -19,8 +19,14 @@
   02111-1307, USA.
 */
 
-#include "GCSFieldInfo.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import "GCSFieldInfo.h"
 
 @implementation GCSFieldInfo
 
diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m
index 6eb8940e6..14873185f 100644
--- a/SOPE/GDLContentStore/GCSFolder.m
+++ b/SOPE/GDLContentStore/GCSFolder.m
@@ -21,6 +21,17 @@
   02111-1307, USA.
 */
 
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+
+#import <EOControl/EOFetchSpecification.h>
+#import <EOControl/EOSortOrdering.h>
+
+#import <GDLAccess/EOEntity.h>
+#import <GDLAccess/EOAttribute.h>
+#import <GDLAccess/EOSQLQualifier.h>
+#import <GDLAccess/EOAdaptorContext.h>
+
 #import "GCSFieldInfo.h"
 #import "GCSFolder.h"
 #import "GCSFolderManager.h"
@@ -31,12 +42,6 @@
 #import "EOAdaptorChannel+GCS.h"
 #import "EOQualifier+GCS.h"
 #import "GCSStringFormatter.h"
-#import "common.h"
-
-#import <GDLAccess/EOEntity.h>
-#import <GDLAccess/EOAttribute.h>
-#import <GDLAccess/EOSQLQualifier.h>
-#import <GDLAccess/EOAdaptorContext.h>
 
 typedef enum {
   noTableRequired = 0,
diff --git a/SOPE/GDLContentStore/GCSFolderType.m b/SOPE/GDLContentStore/GCSFolderType.m
index 5a59a1f42..ac29d10d0 100644
--- a/SOPE/GDLContentStore/GCSFolderType.m
+++ b/SOPE/GDLContentStore/GCSFolderType.m
@@ -19,13 +19,23 @@
   02111-1307, USA.
 */
 
-#include "GCSFolderType.h"
-#include "GCSFolder.h"
-#include "GCSFieldInfo.h"
-#include "GCSFieldExtractor.h"
-#include "common.h"
-#include <EOControl/EOKeyValueCoding.h>
-#include <NGExtensions/NGResourceLocator.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSSet.h>
+#import <Foundation/NSString.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
+
+#import <EOControl/EOQualifier.h>
+
+#import <EOControl/EOKeyValueCoding.h>
+#import <NGExtensions/NGResourceLocator.h>
+
+#import "GCSFolderType.h"
+#import "GCSFolder.h"
+#import "GCSFieldInfo.h"
+#import "GCSFieldExtractor.h"
 
 @implementation GCSFolderType
 
diff --git a/SOPE/GDLContentStore/GCSStringFormatter.m b/SOPE/GDLContentStore/GCSStringFormatter.m
index b08bab5e9..ff3a8258d 100644
--- a/SOPE/GDLContentStore/GCSStringFormatter.m
+++ b/SOPE/GDLContentStore/GCSStringFormatter.m
@@ -19,8 +19,9 @@
   02111-1307, USA.
 */
 
-#include "GCSStringFormatter.h"
-#include "common.h"
+#import <Foundation/NSCharacterSet.h>
+
+#import "GCSStringFormatter.h"
 
 @implementation GCSStringFormatter
 
diff --git a/SOPE/GDLContentStore/NSURL+GCS.m b/SOPE/GDLContentStore/NSURL+GCS.m
index 285aad651..4d3f9ed15 100644
--- a/SOPE/GDLContentStore/NSURL+GCS.m
+++ b/SOPE/GDLContentStore/NSURL+GCS.m
@@ -19,8 +19,10 @@
   02111-1307, USA.
 */
 
-#include "NSURL+GCS.h"
-#include "common.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+
+#import "NSURL+GCS.h"
 
 @implementation NSURL(GCS)
 
diff --git a/SOPE/GDLContentStore/gcs_cat.m b/SOPE/GDLContentStore/gcs_cat.m
index 7cf768c2e..0145769e1 100644
--- a/SOPE/GDLContentStore/gcs_cat.m
+++ b/SOPE/GDLContentStore/gcs_cat.m
@@ -19,7 +19,17 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFolder.h>
+#import <GDLContentStore/GCSFolderManager.h>
 
 @class NSUserDefaults, NSArray;
 @class GCSFolderManager;
@@ -35,10 +45,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFolder.h>
-#include <GDLContentStore/GCSFolderManager.h>
-#include "common.h"
-
 @implementation Tool
 
 - (id)init {
diff --git a/SOPE/GDLContentStore/gcs_gensql.m b/SOPE/GDLContentStore/gcs_gensql.m
index 13e0caeae..d518cef0a 100644
--- a/SOPE/GDLContentStore/gcs_gensql.m
+++ b/SOPE/GDLContentStore/gcs_gensql.m
@@ -19,7 +19,17 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFolderType.h>
+
 
 @class NSUserDefaults, NSArray;
 @class GCSFolderManager;
@@ -34,9 +44,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFolderType.h>
-#include "common.h"
-
 @implementation Tool
 
 - (id)init {
diff --git a/SOPE/GDLContentStore/gcs_ls.m b/SOPE/GDLContentStore/gcs_ls.m
index 20de58e94..49045abaf 100644
--- a/SOPE/GDLContentStore/gcs_ls.m
+++ b/SOPE/GDLContentStore/gcs_ls.m
@@ -19,7 +19,20 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSURL.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFolder.h>
+#import <GDLContentStore/GCSFolderManager.h>
 
 @class NSUserDefaults, NSArray;
 @class GCSFolderManager;
@@ -35,10 +48,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFolder.h>
-#include <GDLContentStore/GCSFolderManager.h>
-#include "common.h"
-
 @implementation Tool
 
 - (id)init {
diff --git a/SOPE/GDLContentStore/gcs_mkdir.m b/SOPE/GDLContentStore/gcs_mkdir.m
index 9e62ee878..dc2a82aff 100644
--- a/SOPE/GDLContentStore/gcs_mkdir.m
+++ b/SOPE/GDLContentStore/gcs_mkdir.m
@@ -19,7 +19,17 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFolder.h>
+#import <GDLContentStore/GCSFolderManager.h>
 
 @class NSUserDefaults, NSArray;
 @class GCSFolderManager;
@@ -35,10 +45,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFolder.h>
-#include <GDLContentStore/GCSFolderManager.h>
-#include "common.h"
-
 @implementation Tool
 
 - (id)init {
diff --git a/SOPE/GDLContentStore/gcs_recreatequick.m b/SOPE/GDLContentStore/gcs_recreatequick.m
index d68355359..2dcaedff0 100644
--- a/SOPE/GDLContentStore/gcs_recreatequick.m
+++ b/SOPE/GDLContentStore/gcs_recreatequick.m
@@ -19,7 +19,17 @@
   02111-1307, USA.
 */
 
-#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSAutoreleasePool.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSProcessInfo+misc.h>
+
+#import <GDLContentStore/GCSFolder.h>
+#import <GDLContentStore/GCSFolderManager.h>
 
 @class NSUserDefaults, NSArray;
 @class GCSFolderManager;
@@ -35,10 +45,6 @@
 
 @end
 
-#include <GDLContentStore/GCSFolder.h>
-#include <GDLContentStore/GCSFolderManager.h>
-#include "common.h"
-
 @implementation Tool
 
 - (id)init {