diff --git a/Headers/Additions/GNUstepBase/Additions.h b/Headers/Additions/GNUstepBase/Additions.h
index bf425ee2f..be9e61135 100644
--- a/Headers/Additions/GNUstepBase/Additions.h
+++ b/Headers/Additions/GNUstepBase/Additions.h
@@ -28,6 +28,7 @@
 #define __Additions_h_GNUSTEP_BASE_INCLUDE
 
 #import	<GNUstepBase/GSVersionMacros.h>
+#import	<GNUstepBase/GNUstep.h>
 
 #import	<GNUstepBase/GSBlocks.h>
 #import	<GNUstepBase/GSFileHandle.h>
diff --git a/Source/Additions/GCArray.m b/Source/Additions/GCArray.m
index 970d29d8e..b3b93e089 100644
--- a/Source/Additions/GCArray.m
+++ b/Source/Additions/GCArray.m
@@ -35,7 +35,6 @@
 
 #import "GNUstepBase/GSObjCRuntime.h"
 #import "GNUstepBase/GCObject.h"
-#import "GNUstepBase/GNUstep.h"
 
 @implementation GCArray
 
diff --git a/Source/Additions/GCObject.m b/Source/Additions/GCObject.m
index cb4b341fe..b8cb21916 100644
--- a/Source/Additions/GCObject.m
+++ b/Source/Additions/GCObject.m
@@ -450,7 +450,7 @@ static pthread_mutex_t *allocationLock = NULL;
 /**
  * Returns the receivers reference count.
  */
-- (unsigned int) retainCount
+- (NSUInteger) retainCount
 {
   return gc.flags.refCount;
 }
diff --git a/Source/Additions/GSLock.m b/Source/Additions/GSLock.m
index 12f2d75c8..86cc2e4ae 100644
--- a/Source/Additions/GSLock.m
+++ b/Source/Additions/GSLock.m
@@ -32,7 +32,6 @@
 #import "Foundation/NSNotification.h"
 #import "Foundation/NSThread.h"
 #import "GNUstepBase/GSLock.h"
-#import "GNUstepBase/GNUstep.h"
 
 /**
  * This implements a class which, when used in single-threaded mode,
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index 548f9fe50..8323b86c3 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -47,7 +47,6 @@
 #import <Foundation/Foundation.h>
 #endif
 #import "GNUstepBase/GSObjCRuntime.h"
-#import "GNUstepBase/GNUstep.h"
 
 #import "../GSPrivate.h"
 
diff --git a/Source/NSObject.m b/Source/NSObject.m
index d2d5a6c0d..f964f06db 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -34,7 +34,6 @@
 #endif
 
 #import "common.h"
-#import "GNUstepBase/GNUstep.h"
 #include <objc/Protocol.h>
 #import "Foundation/NSMethodSignature.h"
 #import "Foundation/NSInvocation.h"
diff --git a/Source/common.h b/Source/common.h
index 8b4337125..48f7f07ec 100644
--- a/Source/common.h
+++ b/Source/common.h
@@ -12,6 +12,8 @@
 #import	"GNUstepBase/preface.h"
 #import	"GNUstepBase/GSConfig.h"
 
+#import	"GNUstepBase/GNUstep.h"
+
 /* Foundation/NSObject.h imports <Foundation/NSZone.h> and
  * <Foundation/NSObjCRuntime.h> so we import local versions first.
  */
diff --git a/Tools/AGSHtml.m b/Tools/AGSHtml.m
index b85f95e19..2df2edda2 100644
--- a/Tools/AGSHtml.m
+++ b/Tools/AGSHtml.m
@@ -28,7 +28,6 @@
 #import "Foundation/NSSet.h"
 #import "Foundation/NSUserDefaults.h"
 #import "AGSHtml.h"
-#import "GNUstepBase/GNUstep.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 
diff --git a/Tools/AGSIndex.m b/Tools/AGSIndex.m
index 0b41a31ea..767755a65 100644
--- a/Tools/AGSIndex.m
+++ b/Tools/AGSIndex.m
@@ -26,7 +26,6 @@
 #import	"Foundation/NSAutoreleasePool.h"
 #import	"Foundation/NSDictionary.h"
 #import "AGSIndex.h"
-#import "GNUstepBase/GNUstep.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 
diff --git a/Tools/AGSOutput.m b/Tools/AGSOutput.m
index f50a5b7b4..6ad2428ab 100644
--- a/Tools/AGSOutput.m
+++ b/Tools/AGSOutput.m
@@ -32,7 +32,6 @@
 #import "Foundation/NSPathUtilities.h"
 #import "Foundation/NSUserDefaults.h"
 #import "AGSOutput.h"
-#import "GNUstepBase/GNUstep.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 
diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m
index d2304f14b..5a2229a85 100644
--- a/Tools/AGSParser.m
+++ b/Tools/AGSParser.m
@@ -32,7 +32,6 @@
 #import "Foundation/NSUserDefaults.h"
 #import "Foundation/NSValue.h"
 #import "AGSParser.h"
-#import "GNUstepBase/GNUstep.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index ee4dc6fd4..258ddb0a2 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -615,7 +615,6 @@
 #import "AGSOutput.h"
 #import "AGSIndex.h"
 #import "AGSHtml.h"
-#import "GNUstepBase/GNUstep.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"