diff --git a/Headers/Additions/GNUstepBase/Additions.h b/Headers/Additions/GNUstepBase/Additions.h
index be9e61135..5d5700e77 100644
--- a/Headers/Additions/GNUstepBase/Additions.h
+++ b/Headers/Additions/GNUstepBase/Additions.h
@@ -31,7 +31,6 @@
 #import	<GNUstepBase/GNUstep.h>
 
 #import	<GNUstepBase/GSBlocks.h>
-#import	<GNUstepBase/GSFileHandle.h>
 #import	<GNUstepBase/GSFunctions.h>
 #import	<GNUstepBase/GSLocale.h>
 #import	<GNUstepBase/GSLock.h>
diff --git a/Headers/Additions/GNUstepBase/GSConfig.h.in b/Headers/Additions/GNUstepBase/GSConfig.h.in
index 8af0d3855..69f43dd59 100644
--- a/Headers/Additions/GNUstepBase/GSConfig.h.in
+++ b/Headers/Additions/GNUstepBase/GSConfig.h.in
@@ -4,7 +4,7 @@
    file GSConfig.h.in - changes/fixes need to be made to the original file,
    not to the GSConfig.h generated from it.
 
-   Copyright (C) 1998,1999 Free Software Foundation, Inc.
+   Copyright (C) 1998-2010 Free Software Foundation, Inc.
 
    Written by:  Richard frith-Macdonald <richard@brainstorm.co.uk>
 
@@ -29,6 +29,8 @@
 #ifndef	included_GSConfig_h
 #define	included_GSConfig_h
 
+#if !defined(NeXT_Foundation_LIBRARY)
+
 /* An alternate to GS_FAKE_MAIN which forces the user to call the 
    NSProcessInfo initialization in 'main', GS_FAKE_MAIN must also
    be undefined. */
@@ -81,7 +83,7 @@
 extern int gnustep_base_user_main (/* int argc, char *argv[] */);
 
 #endif	/* GS_FAKE_MAIN */
-
+#endif
 
 /*
  * Definition to specify if your processor stores words with the most
diff --git a/Headers/Additions/GNUstepBase/Unicode.h b/Headers/Additions/GNUstepBase/Unicode.h
index 7b2f31ffd..6478b68b5 100644
--- a/Headers/Additions/GNUstepBase/Unicode.h
+++ b/Headers/Additions/GNUstepBase/Unicode.h
@@ -41,6 +41,52 @@
 extern "C" {
 #endif
 
+#if	defined(NeXT_Foundation_LIBRARY)
+
+/* Taken from base/Headers/Foundation/NSString.h */
+typedef enum _NSGNUstepStringEncoding
+{
+/* NB. Must not have an encoding with value zero - so we can use zero to
+   tell that a variable that should contain an encoding has not yet been
+   initialised */
+  GSUndefinedEncoding = 0,
+
+// GNUstep additions
+  NSKOI8RStringEncoding = 50,		// Russian/Cyrillic
+  NSISOLatin3StringEncoding = 51,	// ISO-8859-3; South European
+  NSISOLatin4StringEncoding = 52,	// ISO-8859-4; North European
+  NSISOCyrillicStringEncoding = 22,	// ISO-8859-5
+  NSISOArabicStringEncoding = 53,	// ISO-8859-6
+  NSISOGreekStringEncoding = 54,	// ISO-8859-7
+  NSISOHebrewStringEncoding = 55,	// ISO-8859-8
+  NSISOLatin5StringEncoding = 57,	// ISO-8859-9; Turkish
+  NSISOLatin6StringEncoding = 58,	// ISO-8859-10; Nordic
+  NSISOThaiStringEncoding = 59,		// ISO-8859-11
+/* Possible future ISO-8859 additions
+					// ISO-8859-12
+*/
+  NSISOLatin7StringEncoding = 61,	// ISO-8859-13
+  NSISOLatin8StringEncoding = 62,	// ISO-8859-14
+  NSISOLatin9StringEncoding = 63,	// ISO-8859-15; Replaces ISOLatin1
+  NSGB2312StringEncoding = 56,
+  NSUTF7StringEncoding = 64,		// RFC 2152
+  NSGSM0338StringEncoding,		// GSM (mobile phone) default alphabet
+  NSBIG5StringEncoding,			// Traditional chinese
+  NSKoreanEUCStringEncoding,
+#if MAC_OS_X_VERSION_10_4 >= MAC_OS_X_VERSION_MAX_ALLOWED
+    NSUTF16BigEndianStringEncoding = 0x90000100,          /* NSUTF16StringEncoding encoding with explicit endianness specified */
+    NSUTF16LittleEndianStringEncoding = 0x94000100,       /* NSUTF16StringEncoding encoding with explicit endianness specified */
+
+    NSUTF32StringEncoding = 0x8c000100,
+    NSUTF32BigEndianStringEncoding = 0x98000100,          /* NSUTF32StringEncoding encoding with explicit endianness specified */
+    NSUTF32LittleEndianStringEncoding = 0x9c000100,        /* NSUTF32StringEncoding encoding with explicit endianness specified */
+#endif
+
+  GSEncodingUnusedLast
+} NSGNUstepStringEncoding;
+
+#endif
+
 #if GS_API_VERSION(GS_API_NONE,011500)
 /* Deprecated functions */
 GS_EXPORT NSStringEncoding GSEncodingFromLocale(const char *clocale);
diff --git a/Tools/AGSParser.h b/Tools/AGSParser.h
index 519d5053f..9db862488 100644
--- a/Tools/AGSParser.h
+++ b/Tools/AGSParser.h
@@ -29,8 +29,8 @@
 
    */
 
-#include "Foundation/NSObject.h"
-#include "Foundation/NSString.h"
+#import "Foundation/NSObject.h"
+#include <stdio.h>
 
 @class	NSArray;
 @class	NSCharacterSet;
diff --git a/Tools/autogsdoc.m b/Tools/autogsdoc.m
index 1ff9c7ec3..0d81c1d0a 100644
--- a/Tools/autogsdoc.m
+++ b/Tools/autogsdoc.m
@@ -613,6 +613,7 @@
 #import "AGSOutput.h"
 #import "AGSIndex.h"
 #import "AGSHtml.h"
+#import "GNUstepBase/GSObjCRuntime.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"