diff --git a/ChangeLog b/ChangeLog
index 063929cec..622bc5cd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2007-11-29  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/GSLocale.m:
+	* Source/NSTimeZone.m:
+	* Source/NSNetServices.m:
+	* Source/NSURLCredential.m:
+	* Source/NSPortCoder.m:
+	* Source/NSURLAuthenticationChallenge.m:
+	* Source/NSKeyValueCoding.m:
+	* Source/NSBundle.m:
+	* Source/NSURLHandle.m:
+	* Source/NSPropertyList.m:
+	* Source/NSAffineTransform.m:
+	* Source/GSRunLoopWatcher.m:
+	* Source/NSUserDefaults.m:
+	* Source/GSArray.m:
+	* Source/GSFFCallInvocation.m:
+	* Source/NSArray.m:
+	* Source/GSStream.m:
+	* Source/NSDebug.m:
+	* Source/unix/NSStream.m:
+	* Source/NSKeyedUnarchiver.m:
+	* Source/GSConcreteValue.m:
+	* Source/NSURLDownload.m:
+	* Source/GSHTTPURLHandle.m:
+	* Source/NSURLCredentialStorage.m:
+	* Source/GSFFIInvocation.m:
+	* Source/GSDictionary.m:
+	* Source/GSCountedSet.m:
+	* Source/NSUnarchiver.m:
+	* Source/win32/NSStreamWin32.m:
+	* Source/NSURLResponse.m:
+	* Source/NSURLProtocol.m:
+	* Source/NSURLCache.m:
+	* Source/GSAttributedString.m:
+	* Source/NSException.m:
+	* Source/NSURL.m:
+	* Source/Additions/GSObjCRuntime.m:
+	* Source/Additions/GSInsensitiveDictionary.m:
+	* Source/GSSet.m:
+	* Source/NSConnection.m:
+	* Source/GSString.m:
+	* Source/NSHost.m:
+	* Source/NSURLProtectionSpace.m:
+	* Source/GSValue.m:
+	* Source/NSDictionary.m:
+	* Source/GSHTTPAuthentication.m:
+	* Source/NSURLRequest.m:
+	* Source/NSCountedSet.m:
+	* Source/GSFormat.m:
+	* Source/GSFileHandle.m:
+	* Source/NSSet.m:
+	* Source/NSArchiver.m:
+	* Source/NSPortNameServer.m:
+	* Source/GSFTPURLHandle.m:
+	* Source/NSEnumerator.m:
+	* Source/GSURLPrivate.h:
+	* Source/NSURLConnection.m:
+	* Headers/Foundation/NSArray.h:
+	* Headers/Foundation/NSFileManager.h:
+	* Headers/Foundation/NSUtilities.h:
+	* Tools/defaults.m:
+	* Tools/make_strings/make_strings.m:
+	* Tools/make_strings/StringsEntry.m:
+	* Testing/nstimezone.m:
+	* Testing/nsarray.m:
+	* Testing/nsprocessinfo.m:
+	* Testing/nsdictionary.m:
+	* Testing/nsset.m:
+	* Testing/nsarchiver.m:
+	* Testing/call.m:
+	* Testing/benchmark.m:
+	* Testing/nsbundle.m:
+	Remove use of deprecated NSUtilities.h header, and add explicit
+	includes of NSDictionary.h, NSEnumerator.h etc.
+
 2007-11-29  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSKeyValueCoding.m: Remove erroneous check for nil argument
diff --git a/Headers/Foundation/NSArray.h b/Headers/Foundation/NSArray.h
index 4e70cc89a..bc64aee15 100644
--- a/Headers/Foundation/NSArray.h
+++ b/Headers/Foundation/NSArray.h
@@ -26,13 +26,14 @@
 #define __NSArray_h_GNUSTEP_BASE_INCLUDE
 #import	<GNUstepBase/GSVersionMacros.h>
 
+#import	<Foundation/NSObject.h>
 #import	<Foundation/NSRange.h>
-#import	<Foundation/NSUtilities.h>
 
 #if	defined(__cplusplus)
 extern "C" {
 #endif
 
+@class NSEnumerator;
 @class NSString;
 @class NSURL;
 @class NSIndexSet;
diff --git a/Headers/Foundation/NSFileManager.h b/Headers/Foundation/NSFileManager.h
index a146d5ad9..49ef175a8 100644
--- a/Headers/Foundation/NSFileManager.h
+++ b/Headers/Foundation/NSFileManager.h
@@ -173,8 +173,8 @@
 #import	<Foundation/NSObject.h>
 
 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
-#import	<Foundation/NSUtilities.h>
 #import	<Foundation/NSDictionary.h>
+#import	<Foundation/NSEnumerator.h>
 
 #if	defined(__cplusplus)
 extern "C" {
@@ -186,7 +186,7 @@ extern "C" {
 @class NSDate;
 @class NSArray;
 @class NSMutableArray;
-
+@class NSEnumerator;
 @class NSDirectoryEnumerator;
 
 @interface NSFileManager : NSObject
diff --git a/Headers/Foundation/NSUtilities.h b/Headers/Foundation/NSUtilities.h
index 1b941cae6..4bf2d5907 100644
--- a/Headers/Foundation/NSUtilities.h
+++ b/Headers/Foundation/NSUtilities.h
@@ -25,6 +25,8 @@
 #ifndef __NSUtilties_h_GNUSTEP_BASE_INCLUDE
 #define __NSUtilties_h_GNUSTEP_BASE_INCLUDE
 
+#warning        The use of NSUtilities.h is deprecated
+
 #import	<Foundation/NSObjCRuntime.h>
 #import	<Foundation/NSString.h>
 #import	<Foundation/NSDictionary.h>
diff --git a/Source/Additions/GSInsensitiveDictionary.m b/Source/Additions/GSInsensitiveDictionary.m
index 5b221abce..5d64163f4 100644
--- a/Source/Additions/GSInsensitiveDictionary.m
+++ b/Source/Additions/GSInsensitiveDictionary.m
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "Foundation/NSDictionary.h"
 #include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSUtilities.h"
+#include "Foundation/NSEnumerator.h"
 #include "Foundation/NSString.h"
 #include "Foundation/NSException.h"
 #include "Foundation/NSPortCoder.h"
diff --git a/Source/Additions/GSObjCRuntime.m b/Source/Additions/GSObjCRuntime.m
index 5d43d1580..bbe8f4a87 100644
--- a/Source/Additions/GSObjCRuntime.m
+++ b/Source/Additions/GSObjCRuntime.m
@@ -22,7 +22,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
 
    <title>GSObjCRuntime function and macro reference</title>
    $Date$ $Revision$
diff --git a/Source/GSArray.m b/Source/GSArray.m
index 13b557db1..eae12e2f9 100644
--- a/Source/GSArray.m
+++ b/Source/GSArray.m
@@ -25,18 +25,20 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSArray.h"
-#include "GNUstepBase/GSObjCRuntime.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSValue.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSArray.h"
+#import "GNUstepBase/GSObjCRuntime.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSValue.h"
 // For private method _decodeArrayOfObjectsForKey:
-#include "Foundation/NSKeyedArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 static SEL	eqSel;
 static SEL	oaiSel;
diff --git a/Source/GSAttributedString.m b/Source/GSAttributedString.m
index bf8c31ad6..ddda2b2e3 100644
--- a/Source/GSAttributedString.m
+++ b/Source/GSAttributedString.m
@@ -44,18 +44,18 @@
  *		attributes argument and use the values from the string.
  */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "GNUstepBase/GSLock.h"
-#include "Foundation/NSAttributedString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSRange.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSZone.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "GNUstepBase/GSLock.h"
+#import "Foundation/NSAttributedString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSRange.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSZone.h"
 
 #define		SANITY_CHECKS	0
 
diff --git a/Source/GSConcreteValue.m b/Source/GSConcreteValue.m
index 09135bff5..abe597763 100644
--- a/Source/GSConcreteValue.m
+++ b/Source/GSConcreteValue.m
@@ -22,13 +22,13 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "GNUstepBase/preface.h"
+#import "config.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "GNUstepBase/preface.h"
 
 #define TYPE_ORDER 0
 #include "GSConcreteValueTemplate.m"
diff --git a/Source/GSCountedSet.m b/Source/GSCountedSet.m
index f8a92a685..8c39d5cd4 100644
--- a/Source/GSCountedSet.m
+++ b/Source/GSCountedSet.m
@@ -22,14 +22,14 @@
    Boston, MA 02111 USA.
    */
 
-#include "config.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSDebug.h"
+#import "config.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSDebug.h"
 
 
 #define	GSI_MAP_RETAIN_VAL(M, X)	
diff --git a/Source/GSDictionary.m b/Source/GSDictionary.m
index 4dafd5f58..e6b4398fe 100644
--- a/Source/GSDictionary.m
+++ b/Source/GSDictionary.m
@@ -23,18 +23,18 @@
    */
 
 
-#include "config.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSDebug.h"
+#import "config.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSDebug.h"
 // For private method _decodeArrayOfObjectsForKey:
-#include "Foundation/NSKeyedArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 
-#include "GNUstepBase/GSObjCRuntime.h"
+#import "GNUstepBase/GSObjCRuntime.h"
 
 /*
  *	The 'Fastmap' stuff provides an inline implementation of a mapping
diff --git a/Source/GSFFCallInvocation.m b/Source/GSFFCallInvocation.m
index 9a4d18072..9e8c74d1e 100644
--- a/Source/GSFFCallInvocation.m
+++ b/Source/GSFFCallInvocation.m
@@ -21,16 +21,16 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111 USA.
    */
-#include "Foundation/NSException.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSDistantObject.h"
-#include "Foundation/NSDebug.h"
-#include "GSInvocation.h"
-#include <config.h>
-#include <objc/objc-api.h>
-#include <avcall.h>
-#include <callback.h>
-#include "callframe.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSDistantObject.h"
+#import "Foundation/NSDebug.h"
+#import "GSInvocation.h"
+#import <config.h>
+#import <objc/objc-api.h>
+#import <avcall.h>
+#import <callback.h>
+#import "callframe.h"
 
 #ifndef INLINE
 #define INLINE inline
diff --git a/Source/GSFFIInvocation.m b/Source/GSFFIInvocation.m
index 7fded4e2d..d8cbf9230 100644
--- a/Source/GSFFIInvocation.m
+++ b/Source/GSFFIInvocation.m
@@ -21,16 +21,16 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111 USA.
    */
-#include "Foundation/NSException.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSDistantObject.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDebug.h"
-#include "GSInvocation.h"
-#include <config.h>
-#include <objc/objc-api.h>
-#include "cifframe.h"
-#include "mframe.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSDistantObject.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDebug.h"
+#import "GSInvocation.h"
+#import <config.h>
+#import <objc/objc-api.h>
+#import "cifframe.h"
+#import "mframe.h"
 
 #ifndef INLINE
 #define INLINE inline
diff --git a/Source/GSFTPURLHandle.m b/Source/GSFTPURLHandle.m
index 6ae8188ed..f3d822304 100644
--- a/Source/GSFTPURLHandle.m
+++ b/Source/GSFTPURLHandle.m
@@ -22,22 +22,26 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSURL.h"
-#include "Foundation/NSURLHandle.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSByteOrder.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSFileHandle.h"
-#include "Foundation/NSDebug.h"
-#include "GNUstepBase/GSMime.h"
-#include "GSPrivate.h"
+#import "config.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSURLHandle.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSByteOrder.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSFileHandle.h"
+#import "Foundation/NSDebug.h"
+#import "GNUstepBase/GSMime.h"
+#import "GSPrivate.h"
 
 GS_EXPORT NSString * const GSTelnetNotification;
 GS_EXPORT NSString * const GSTelnetErrorKey;
diff --git a/Source/GSFileHandle.m b/Source/GSFileHandle.m
index 1c82251b5..00f921a0c 100644
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@@ -24,27 +24,27 @@
 
 #define	_FILE_OFFSET_BITS 64
 
-#include "config.h"
+#import "config.h"
 
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObject.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSFileHandle.h"
-#include "GNUstepBase/GSFileHandle.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSNotificationQueue.h"
-#include "Foundation/NSHost.h"
-#include "Foundation/NSByteOrder.h"
-#include "Foundation/NSProcessInfo.h"
-#include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSDebug.h"
-#include "GSPrivate.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObject.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSFileHandle.h"
+#import "GNUstepBase/GSFileHandle.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSNotificationQueue.h"
+#import "Foundation/NSHost.h"
+#import "Foundation/NSByteOrder.h"
+#import "Foundation/NSProcessInfo.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSDebug.h"
+#import "GSPrivate.h"
 
-#include "../Tools/gdomap.h"
+#import "../Tools/gdomap.h"
 
 #include <time.h>
 #include <sys/time.h>
diff --git a/Source/GSFormat.m b/Source/GSFormat.m
index 60d76dd70..f07f27839 100644
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@@ -52,29 +52,30 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSCharacterSet.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSFileManager.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSPathUtilities.h"
-#include "Foundation/NSRange.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSBundle.h"
-#include "Foundation/NSURL.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSZone.h"
-#include "Foundation/NSDebug.h"
-#include "GNUstepBase/GSLocale.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSCharacterSet.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSFileManager.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSPathUtilities.h"
+#import "Foundation/NSRange.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSBundle.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSZone.h"
+#import "Foundation/NSDebug.h"
+#import "GNUstepBase/GSLocale.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 #include <string.h>		// for strstr()
 #include <sys/stat.h>
diff --git a/Source/GSHTTPAuthentication.m b/Source/GSHTTPAuthentication.m
index ef78705dd..13f5651e5 100644
--- a/Source/GSHTTPAuthentication.m
+++ b/Source/GSHTTPAuthentication.m
@@ -22,14 +22,15 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSScanner.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSValue.h"
-#include "GNUstepBase/GSLock.h"
-#include "GNUstepBase/GSMime.h"
+#import "GSURLPrivate.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSScanner.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSValue.h"
+#import "GNUstepBase/GSLock.h"
+#import "GNUstepBase/GSMime.h"
 
 
 static NSMutableDictionary	*domainMap = nil;
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 37c0a0c85..d496d4d63 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -23,29 +23,31 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSByteOrder.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSFileHandle.h"
-#include "Foundation/NSHost.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSPathUtilities.h"
-#include "Foundation/NSProcessInfo.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSURL.h"
-#include "Foundation/NSURLHandle.h"
-#include "Foundation/NSValue.h"
-#include "GNUstepBase/GSMime.h"
-#include "GNUstepBase/GSLock.h"
-#include "NSCallBacks.h"
-#include "GSURLPrivate.h"
-#include "GSPrivate.h"
+#import "config.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSByteOrder.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSFileHandle.h"
+#import "Foundation/NSHost.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSPathUtilities.h"
+#import "Foundation/NSProcessInfo.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSURLHandle.h"
+#import "Foundation/NSValue.h"
+#import "GNUstepBase/GSMime.h"
+#import "GNUstepBase/GSLock.h"
+#import "NSCallBacks.h"
+#import "GSURLPrivate.h"
+#import "GSPrivate.h"
 
 #include <string.h>
 #ifdef HAVE_UNISTD_H
diff --git a/Source/GSLocale.m b/Source/GSLocale.m
index 987bb8c76..6d0e1b3b6 100644
--- a/Source/GSLocale.m
+++ b/Source/GSLocale.m
@@ -22,11 +22,11 @@
    Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02111 USA.
 */
-#include "config.h"
-#include "GNUstepBase/GSLocale.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSLock.h"
+#import "config.h"
+#import "GNUstepBase/GSLocale.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSLock.h"
 
 #ifdef HAVE_LOCALE_H
 
@@ -34,10 +34,10 @@
 #ifdef HAVE_LANGINFO_H
 #include <langinfo.h>
 #endif
-#include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSBundle.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSBundle.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /*
  * Function called by [NSObject +initialize] to setup locale information
diff --git a/Source/GSRunLoopWatcher.m b/Source/GSRunLoopWatcher.m
index 6de7a2747..6dd3b043b 100644
--- a/Source/GSRunLoopWatcher.m
+++ b/Source/GSRunLoopWatcher.m
@@ -1,9 +1,9 @@
-#include "config.h"
+#import "config.h"
 
-#include "GNUstepBase/preface.h"
-#include "GSRunLoopWatcher.h"
-#include <Foundation/NSException.h>
-#include <Foundation/NSPort.h>
+#import "GNUstepBase/preface.h"
+#import "GSRunLoopWatcher.h"
+#import <Foundation/NSException.h>
+#import <Foundation/NSPort.h>
 
 @implementation	GSRunLoopWatcher
 
diff --git a/Source/GSSet.m b/Source/GSSet.m
index a9b2d6774..198a736fa 100644
--- a/Source/GSSet.m
+++ b/Source/GSSet.m
@@ -23,20 +23,20 @@
    Boston, MA 02111 USA.
    */
 
-#include "config.h"
-#include "Foundation/NSSet.h"
-#include "GNUstepBase/GSObjCRuntime.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSObjCRuntime.h"
+#import "config.h"
+#import "Foundation/NSSet.h"
+#import "GNUstepBase/GSObjCRuntime.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSObjCRuntime.h"
 // For private method _decodeArrayOfObjectsForKey:
-#include "Foundation/NSKeyedArchiver.h"
-#include "GSPrivate.h"
+#import "Foundation/NSKeyedArchiver.h"
+#import "GSPrivate.h"
 
 #define	GSI_MAP_HAS_VALUE	0
 #define	GSI_MAP_KTYPES		GSUNION_OBJ
diff --git a/Source/GSStream.m b/Source/GSStream.m
index 83244b87b..9108faf23 100644
--- a/Source/GSStream.m
+++ b/Source/GSStream.m
@@ -24,16 +24,18 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <Foundation/NSData.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSRunLoop.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSHost.h>
-#include <Foundation/NSDebug.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSValue.h>
+#import <Foundation/NSHost.h>
+#import <Foundation/NSDebug.h>
 
-#include "GSStream.h"
-#include "GSPrivate.h"
+#import "GSStream.h"
+#import "GSPrivate.h"
 
 NSString * const NSStreamDataWrittenToMemoryStreamKey
   = @"NSStreamDataWrittenToMemoryStreamKey";
diff --git a/Source/GSString.m b/Source/GSString.m
index de2630a99..62cebecd5 100644
--- a/Source/GSString.m
+++ b/Source/GSString.m
@@ -33,28 +33,28 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSCharacterSet.h"
-#include "Foundation/NSRange.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSKeyedArchiver.h"
-#include "GNUstepBase/GSObjCRuntime.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSCharacterSet.h"
+#import "Foundation/NSRange.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSKeyedArchiver.h"
+#import "GNUstepBase/GSObjCRuntime.h"
 #include <limits.h>
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /* memcpy(), strlen(), strcmp() are gcc builtin's */
 
-#include "GNUstepBase/Unicode.h"
+#import "GNUstepBase/Unicode.h"
 
 static BOOL isByteEncoding(NSStringEncoding enc)
 {
diff --git a/Source/GSURLPrivate.h b/Source/GSURLPrivate.h
index 38d874bba..8ce1fdb3d 100644
--- a/Source/GSURLPrivate.h
+++ b/Source/GSURLPrivate.h
@@ -27,30 +27,31 @@
 /*
  * Headers needed by many URL loading classes
  */
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSHTTPCookie.h"
-#include "Foundation/NSHTTPCookieStorage.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSStream.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSURL.h"
-#include "Foundation/NSURLAuthenticationChallenge.h"
-#include "Foundation/NSURLCache.h"
-#include "Foundation/NSURLConnection.h"
-#include "Foundation/NSURLCredential.h"
-#include "Foundation/NSURLCredentialStorage.h"
-#include "Foundation/NSURLDownload.h"
-#include "Foundation/NSURLError.h"
-#include "Foundation/NSURLProtectionSpace.h"
-#include "Foundation/NSURLProtocol.h"
-#include "Foundation/NSURLRequest.h"
-#include "Foundation/NSURLResponse.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSHTTPCookie.h"
+#import "Foundation/NSHTTPCookieStorage.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSStream.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSURLAuthenticationChallenge.h"
+#import "Foundation/NSURLCache.h"
+#import "Foundation/NSURLConnection.h"
+#import "Foundation/NSURLCredential.h"
+#import "Foundation/NSURLCredentialStorage.h"
+#import "Foundation/NSURLDownload.h"
+#import "Foundation/NSURLError.h"
+#import "Foundation/NSURLProtectionSpace.h"
+#import "Foundation/NSURLProtocol.h"
+#import "Foundation/NSURLRequest.h"
+#import "Foundation/NSURLResponse.h"
 
 /*
  * Private accessors for URL loading classes
diff --git a/Source/GSValue.m b/Source/GSValue.m
index 785654282..2aee29f07 100644
--- a/Source/GSValue.m
+++ b/Source/GSValue.m
@@ -22,15 +22,15 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSZone.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "GNUstepBase/preface.h"
+#import "config.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSZone.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "GNUstepBase/preface.h"
 
 @interface GSValue : NSValue
 {
diff --git a/Source/NSAffineTransform.m b/Source/NSAffineTransform.m
index 2a13f6a1e..b40ee0620 100644
--- a/Source/NSAffineTransform.m
+++ b/Source/NSAffineTransform.m
@@ -29,7 +29,7 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
+#import "config.h"
 #include <math.h>
 
 #import "Foundation/NSArray.h"
diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m
index 1ce2076de..a31f5fc91 100644
--- a/Source/NSArchiver.m
+++ b/Source/NSArchiver.m
@@ -25,7 +25,7 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 /*
  *	Setup for inline operation of pointer map tables.
  */
@@ -47,7 +47,6 @@
 #include "Foundation/NSCoder.h"
 #include "Foundation/NSData.h"
 #include "Foundation/NSException.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSString.h"
 
 typedef	unsigned char	uchar;
diff --git a/Source/NSArray.m b/Source/NSArray.m
index d15063f53..074130c5d 100644
--- a/Source/NSArray.m
+++ b/Source/NSArray.m
@@ -30,28 +30,28 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSRange.h"
+#import "config.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSRange.h"
 #include <limits.h>
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSNull.h"
-#include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSIndexSet.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSIndexSet.h"
 // For private method _decodeArrayOfObjectsForKey:
-#include "Foundation/NSKeyedArchiver.h"
-#include "GNUstepBase/GSCategories.h"
-#include "GSPrivate.h"
+#import "Foundation/NSKeyedArchiver.h"
+#import "GNUstepBase/GSCategories.h"
+#import "GSPrivate.h"
 
 static BOOL GSMacOSXCompatiblePropertyLists(void)
 {
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index b8db10317..7be34ec98 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -40,6 +40,7 @@
 #include "Foundation/NSArray.h"
 #include "Foundation/NSDebug.h"
 #include "Foundation/NSDictionary.h"
+#include "Foundation/NSEnumerator.h"
 #include "Foundation/NSProcessInfo.h"
 #include "Foundation/NSObjCRuntime.h"
 #include "Foundation/NSUserDefaults.h"
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 8ca9913fc..02152ae74 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -29,9 +29,10 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "GNUstepBase/GSLock.h"
+#import "config.h"
+#import "Foundation/NSEnumerator.h"
+#import "GNUstepBase/preface.h"
+#import "GNUstepBase/GSLock.h"
 
 /*
  *	Setup for inline operation of pointer map tables.
diff --git a/Source/NSCountedSet.m b/Source/NSCountedSet.m
index 556c8493c..b8323a931 100644
--- a/Source/NSCountedSet.m
+++ b/Source/NSCountedSet.m
@@ -25,17 +25,17 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/GSLock.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSObjCRuntime.h"
+#import "config.h"
+#import "GNUstepBase/GSLock.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSObjCRuntime.h"
 
 @class	GSCountedSet;
 @interface GSCountedSet : NSObject	// Help the compiler
diff --git a/Source/NSDebug.m b/Source/NSDebug.m
index 2ebca6a0a..d7e35e05a 100644
--- a/Source/NSDebug.m
+++ b/Source/NSDebug.m
@@ -856,11 +856,11 @@ GSDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt)
 
 unsigned NSCountFrames(void)
 {
-   unsigned    x = 0;
+  unsigned    x = 0;
 
-   while (NSFrameAddress(x + 1)) x++;
+  while (NSFrameAddress(x + 1)) x++;
 
-   return x;
+  return x;
 }
 
 #define _NS_FRAME_HACK(a) case a: val = __builtin_frame_address(a + 1); break;
diff --git a/Source/NSDictionary.m b/Source/NSDictionary.m
index ec9d16c80..4eb65fab6 100644
--- a/Source/NSDictionary.m
+++ b/Source/NSDictionary.m
@@ -30,7 +30,6 @@
 #include "Foundation/NSDictionary.h"
 #include "Foundation/NSArray.h"
 #include "Foundation/NSData.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSString.h"
 #include "Foundation/NSException.h"
 #include "Foundation/NSAutoreleasePool.h"
diff --git a/Source/NSEnumerator.m b/Source/NSEnumerator.m
index 4bdc75bdc..e14d4e7ec 100644
--- a/Source/NSEnumerator.m
+++ b/Source/NSEnumerator.m
@@ -25,10 +25,10 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSUtilities.h"
-#include "Foundation/NSArray.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSEnumerator.h"
 
 /**
  *  Simple class for iterating over a collection of objects, usually returned
diff --git a/Source/NSException.m b/Source/NSException.m
index a387c6a9d..5b9637e33 100644
--- a/Source/NSException.m
+++ b/Source/NSException.m
@@ -24,19 +24,20 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSBundle.h>
-#include "Foundation/NSException.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSNull.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSValue.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSBundle.h>
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSValue.h"
 #include <stdio.h>
 
 typedef struct { @defs(NSThread) } *TInfo;
@@ -175,12 +176,9 @@ GSPrivateBaseAddress(void *addr, void **base)
 
 - (oneway void) dealloc
 {
-  [_module release];
-  _module = nil;
-  [_fileName release];
-  _fileName = nil;
-  [_functionName release];
-  _functionName = nil;
+  DESTROY(_module);
+  DESTROY(_fileName);
+  DESTROY(_functionName);
   [super dealloc];
 }
 
@@ -212,10 +210,10 @@ GSPrivateBaseAddress(void *addr, void **base)
 	     function: (NSString*)function 
 		 line: (int)lineNo
 {
-  _module = [module retain];
+  _module = RETAIN(_module);
   _address = address;
-  _fileName = [file retain];
-  _functionName = [function retain];
+  _fileName = [file copy];
+  _functionName = [function copy];
   _lineNo = lineNo;
 
   return self;
@@ -256,8 +254,7 @@ GSPrivateBaseAddress(void *addr, void **base)
 
 - (oneway void) dealloc
 {
-  [_fileName release];
-  _fileName = nil;
+  DESTROY(_fileName);
   if (_abfd)
     {
       bfd_close (_abfd);
@@ -564,13 +561,13 @@ GSListModules()
 // grab the current stack 
 - (id) init
 {
-#if	defined(STACKSYMBOLS)
   int i;
   int n;
 
   frames = [[NSMutableArray alloc] init];
   n = NSCountFrames();
 
+#if	defined(STACKSYMBOLS)
   for (i = 0; i < n; i++)
     {
       GSFunctionInfo	*aFrame = nil;
@@ -631,12 +628,6 @@ GSListModules()
       [frames addObject: aFrame];
     }
 #else
-  int i;
-  int n;
-
-  frames = [[NSMutableArray alloc] init];
-  n = NSCountFrames();
-
   for (i = 0; i < n; i++)
     {
       void		*address = NSReturnAddress(i);
diff --git a/Source/NSHost.m b/Source/NSHost.m
index 6b6efff02..241d7df4d 100644
--- a/Source/NSHost.m
+++ b/Source/NSHost.m
@@ -27,16 +27,17 @@
    $Date$ $Revision$
   */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSHost.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSDebug.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSHost.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSDebug.h"
 
 #if defined(__MINGW32__)
 #include <winsock2.h>
diff --git a/Source/NSKeyValueCoding.m b/Source/NSKeyValueCoding.m
index 339912259..b8bfaa3d0 100644
--- a/Source/NSKeyValueCoding.m
+++ b/Source/NSKeyValueCoding.m
@@ -31,6 +31,8 @@
 #include "Foundation/NSString.h"
 #include "Foundation/NSArray.h"
 #include "Foundation/NSSet.h"
+#include "Foundation/NSDictionary.h"
+#include "Foundation/NSEnumerator.h"
 #include "Foundation/NSException.h"
 #include "Foundation/NSZone.h"
 #include "Foundation/NSDebug.h"
diff --git a/Source/NSKeyedUnarchiver.m b/Source/NSKeyedUnarchiver.m
index 3953623fa..42b33310b 100644
--- a/Source/NSKeyedUnarchiver.m
+++ b/Source/NSKeyedUnarchiver.m
@@ -23,15 +23,16 @@
 
    */
 
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSMapTable.h>
-#include <Foundation/NSNull.h>
-#include <Foundation/NSValue.h>
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSValue.h"
 
-#include "GSPrivate.h"
-#include "config.h"
+#import "GSPrivate.h"
+#import "config.h"
 
 /*
  *      Setup for inline operation of arrays.
diff --git a/Source/NSNetServices.m b/Source/NSNetServices.m
index 7f56fc15c..696108a48 100644
--- a/Source/NSNetServices.m
+++ b/Source/NSNetServices.m
@@ -23,6 +23,8 @@
    */ 
 
 #import "Foundation/NSNetServices.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
 #import "Foundation/NSData.h"
 #import "Foundation/NSDebug.h"
 #import "Foundation/NSNull.h"
diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m
index d0d7f04d4..16b5a8d26 100644
--- a/Source/NSPortCoder.m
+++ b/Source/NSPortCoder.m
@@ -43,7 +43,6 @@
 #include "Foundation/NSCoder.h"
 #include "Foundation/NSAutoreleasePool.h"
 #include "Foundation/NSData.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSPort.h"
 #include "Foundation/NSString.h"
 
diff --git a/Source/NSPortNameServer.m b/Source/NSPortNameServer.m
index 9cd27adff..fa3c4e088 100644
--- a/Source/NSPortNameServer.m
+++ b/Source/NSPortNameServer.m
@@ -25,15 +25,16 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSPort.h"
-#include "Foundation/NSPortNameServer.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSUserDefaults.h"
-#include "GSPortPrivate.h"
+#import "config.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSPort.h"
+#import "Foundation/NSPortNameServer.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSUserDefaults.h"
+#import "GSPortPrivate.h"
 
 
 /**
diff --git a/Source/NSPropertyList.m b/Source/NSPropertyList.m
index 2fa467cea..93b84d96f 100644
--- a/Source/NSPropertyList.m
+++ b/Source/NSPropertyList.m
@@ -23,32 +23,33 @@
 
    */
 
-#include "config.h"
+#import "config.h"
 #include <string.h>
 #include <limits.h>
-#include "GNUstepBase/preface.h"
-#include "GNUstepBase/GSMime.h"
+#import "GNUstepBase/preface.h"
+#import "GNUstepBase/GSMime.h"
 
-#include "Foundation/NSArray.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSByteOrder.h"
-#include "Foundation/NSCalendarDate.h"
-#include "Foundation/NSCharacterSet.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSPropertyList.h"
-#include "Foundation/NSSerialization.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSTimeZone.h"
-#include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSNull.h"
-#include "Foundation/NSXMLParser.h"
-#include "GNUstepBase/Unicode.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSByteOrder.h"
+#import "Foundation/NSCalendarDate.h"
+#import "Foundation/NSCharacterSet.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSPropertyList.h"
+#import "Foundation/NSSerialization.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSTimeZone.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSXMLParser.h"
+#import "GNUstepBase/Unicode.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 @class  GSSloppyXMLParser;
 
@@ -489,7 +490,7 @@ static void setupWhitespace(void)
 }
 
 #ifdef	HAVE_LIBXML
-#include	"GNUstepBase/GSXML.h"
+#import	"GNUstepBase/GSXML.h"
 static int      XML_ELEMENT_NODE;
 #endif
 
diff --git a/Source/NSSet.m b/Source/NSSet.m
index 90eaddc6b..fe7b04748 100644
--- a/Source/NSSet.m
+++ b/Source/NSSet.m
@@ -29,7 +29,7 @@
 #include "Foundation/NSSet.h"
 #include "Foundation/NSCoder.h"
 #include "Foundation/NSArray.h"
-#include "Foundation/NSUtilities.h"
+#include "Foundation/NSEnumerator.h"
 #include "Foundation/NSString.h"
 #include "Foundation/NSException.h"
 #include "Foundation/NSObjCRuntime.h"
diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m
index 7609fc1e4..0eec9976c 100644
--- a/Source/NSTimeZone.m
+++ b/Source/NSTimeZone.m
@@ -96,7 +96,6 @@
 #include "Foundation/NSProcessInfo.h"
 #include "Foundation/NSString.h"
 #include "Foundation/NSUserDefaults.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSZone.h"
 #include "Foundation/NSBundle.h"
 #include "Foundation/NSMapTable.h"
diff --git a/Source/NSURL.m b/Source/NSURL.m
index 7fbfbfdc3..dc1ef6d08 100644
--- a/Source/NSURL.m
+++ b/Source/NSURL.m
@@ -36,21 +36,21 @@ function may be incorrect
 * I've put 2 functions to make tests. You can add your own tests
 * Some functions are not implemented
 */
-#include "config.h"
-#include "Foundation/NSObject.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSFileManager.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSURLHandle.h"
-#include "Foundation/NSURL.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSZone.h"
+#import "config.h"
+#import "Foundation/NSObject.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSFileManager.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSURLHandle.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSZone.h"
 
 NSString * const NSURLErrorDomain = @"NSURLErrorDomain";
 NSString * const NSErrorFailingURLStringKey = @"NSErrorFailingURLStringKey";
diff --git a/Source/NSURLAuthenticationChallenge.m b/Source/NSURLAuthenticationChallenge.m
index f2b56de95..f06fac5a6 100644
--- a/Source/NSURLAuthenticationChallenge.m
+++ b/Source/NSURLAuthenticationChallenge.m
@@ -22,8 +22,8 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
-#include "Foundation/NSError.h"
+#import "GSURLPrivate.h"
+#import "Foundation/NSError.h"
 
 
 // Internal data storage
diff --git a/Source/NSURLCache.m b/Source/NSURLCache.m
index 26e186e98..5a666a14c 100644
--- a/Source/NSURLCache.m
+++ b/Source/NSURLCache.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
 // FIXME ... locking and disk storage needed
 typedef struct {
diff --git a/Source/NSURLConnection.m b/Source/NSURLConnection.m
index 38076df9f..6f631d1ce 100644
--- a/Source/NSURLConnection.m
+++ b/Source/NSURLConnection.m
@@ -22,8 +22,8 @@
    Boston, MA 02111 USA.
    */ 
 
-#include <Foundation/NSRunLoop.h>
-#include "GSURLPrivate.h"
+#import <Foundation/NSRunLoop.h>
+#import "GSURLPrivate.h"
 
 
 @interface _NSURLConnectionDataCollector : NSObject <NSURLProtocolClient>
diff --git a/Source/NSURLCredential.m b/Source/NSURLCredential.m
index c5b4d28b6..50563bfe1 100644
--- a/Source/NSURLCredential.m
+++ b/Source/NSURLCredential.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
 // Internal data storage
 typedef struct {
diff --git a/Source/NSURLCredentialStorage.m b/Source/NSURLCredentialStorage.m
index 62bc3d631..f53956985 100644
--- a/Source/NSURLCredentialStorage.m
+++ b/Source/NSURLCredentialStorage.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
 NSString *const NSURLCredentialStorageChangedNotification
   = @"NSURLCredentialStorageChangedNotification";
diff --git a/Source/NSURLDownload.m b/Source/NSURLDownload.m
index d9b267276..2b8540995 100644
--- a/Source/NSURLDownload.m
+++ b/Source/NSURLDownload.m
@@ -23,7 +23,7 @@
    */ 
 
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
 @interface	GSURLDownload : NSObject <NSURLProtocolClient>
 {
diff --git a/Source/NSURLHandle.m b/Source/NSURLHandle.m
index 1a917fbd9..f1f124226 100644
--- a/Source/NSURLHandle.m
+++ b/Source/NSURLHandle.m
@@ -27,12 +27,11 @@
    $Date$ $Revision$
 */
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
-#include "Foundation/NSEnumerator.h"
-#include "Foundation/NSURLHandle.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSFileManager.h"
+#import "Foundation/NSURLHandle.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSFileManager.h"
 
 
 @class	GSFTPURLHandle;
diff --git a/Source/NSURLProtectionSpace.m b/Source/NSURLProtectionSpace.m
index 7e7b712e1..83c45a44e 100644
--- a/Source/NSURLProtectionSpace.m
+++ b/Source/NSURLProtectionSpace.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"
 
 NSString * const NSURLProtectionSpaceFTPProxy = @"ftp";	
 NSString * const NSURLProtectionSpaceHTTPProxy = @"http";
diff --git a/Source/NSURLProtocol.m b/Source/NSURLProtocol.m
index cb4963077..cd76f8a33 100644
--- a/Source/NSURLProtocol.m
+++ b/Source/NSURLProtocol.m
@@ -22,14 +22,14 @@
    Boston, MA 02111 USA.
    */ 
 
-#include <Foundation/NSError.h>
-#include <Foundation/NSHost.h>
-#include <Foundation/NSRunLoop.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSHost.h>
+#import <Foundation/NSRunLoop.h>
 
-#include "GNUstepBase/GSMime.h"
+#import "GNUstepBase/GSMime.h"
 
-#include "GSPrivate.h"
-#include "GSURLPrivate.h"
+#import "GSPrivate.h"
+#import "GSURLPrivate.h"
 
 
 @interface _NSAboutURLProtocol : NSURLProtocol
diff --git a/Source/NSURLRequest.m b/Source/NSURLRequest.m
index ca6bf58c5..fcce7814f 100644
--- a/Source/NSURLRequest.m
+++ b/Source/NSURLRequest.m
@@ -22,10 +22,10 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
-#include "GSPrivate.h"
+#import "GSURLPrivate.h"
+#import "GSPrivate.h"
 
-#include "Foundation/NSCoder.h"
+#import "Foundation/NSCoder.h"
 
 
 // Internal data storage
diff --git a/Source/NSURLResponse.m b/Source/NSURLResponse.m
index 5a0ee4611..e486dd995 100644
--- a/Source/NSURLResponse.m
+++ b/Source/NSURLResponse.m
@@ -22,13 +22,13 @@
    Boston, MA 02111 USA.
    */ 
 
-#include "GSURLPrivate.h"
-#include "GSPrivate.h"
+#import "GSURLPrivate.h"
+#import "GSPrivate.h"
 
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSScanner.h"
-#include "NSCallBacks.h"
-#include "GNUstepBase/GSMime.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSScanner.h"
+#import "NSCallBacks.h"
+#import "GNUstepBase/GSMime.h"
 
 
 // Internal data storage
diff --git a/Source/NSUnarchiver.m b/Source/NSUnarchiver.m
index 3545aa631..763c3dd54 100644
--- a/Source/NSUnarchiver.m
+++ b/Source/NSUnarchiver.m
@@ -25,12 +25,13 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #include <string.h>
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSZone.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSByteOrder.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSZone.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSByteOrder.h"
 
 /*
  *	Setup for inline operation of arrays.
@@ -48,7 +49,6 @@
 #include "Foundation/NSAutoreleasePool.h"
 #include "Foundation/NSCoder.h"
 #include "Foundation/NSData.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSString.h"
 #include "Foundation/NSArray.h"
 
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index 5f021e8db..a20dc3fe3 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -50,7 +50,6 @@
 #include "Foundation/NSSet.h"
 #include "Foundation/NSThread.h"
 #include "Foundation/NSTimer.h"
-#include "Foundation/NSUtilities.h"
 #include "Foundation/NSValue.h"
 #include "Foundation/NSDebug.h"
 #include "GNUstepBase/GSLocale.h"
diff --git a/Source/unix/NSStream.m b/Source/unix/NSStream.m
index ed4530482..24c9af030 100644
--- a/Source/unix/NSStream.m
+++ b/Source/unix/NSStream.m
@@ -26,6 +26,8 @@
 
 #include <Foundation/NSData.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSError.h>
diff --git a/Source/win32/NSStreamWin32.m b/Source/win32/NSStreamWin32.m
index 687c46f7a..b7311003c 100644
--- a/Source/win32/NSStreamWin32.m
+++ b/Source/win32/NSStreamWin32.m
@@ -35,6 +35,8 @@
 
 #include <Foundation/NSData.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSError.h>
diff --git a/Testing/benchmark.m b/Testing/benchmark.m
index 2332dd66c..7dbbe4330 100755
--- a/Testing/benchmark.m
+++ b/Testing/benchmark.m
@@ -370,7 +370,6 @@ void
 bench_number()
 {
   int i;
-  int j;
   NSMutableDictionary *dict;
   NSNumber	*n[MAX_COUNT*10];
 
diff --git a/Testing/call.m b/Testing/call.m
index 01df80206..e938dab60 100644
--- a/Testing/call.m
+++ b/Testing/call.m
@@ -72,11 +72,15 @@ GS_EXPORT NSString * const GSTelnetTextKey;
 
 	      if (i > 0 && ptr[i-1] == '\r')
 		{
-		  s = [NSString stringWithUTF8String: ptr length: i-1];
+		  s = [[NSString alloc] initWithBytes: ptr
+                                               length: i-1
+                                             encoding: NSUTF8StringEncoding];
 		}
 	      else
 		{
-		  s = [NSString stringWithUTF8String: ptr length: i];
+		  s = [[NSString alloc] initWithBytes: ptr
+                                               length: i
+                                             encoding: NSUTF8StringEncoding];
 		}
 	      len -= (i + 1);
 	      if (len > 0)
@@ -87,6 +91,7 @@ GS_EXPORT NSString * const GSTelnetTextKey;
 	      ptr = [buf mutableBytes];
 	      i = -1;
 	      [remote putTelnetLine: s];
+              [s release];
 	    }
 	}
       [ichan readInBackgroundAndNotify];
diff --git a/Testing/nsarchiver.m b/Testing/nsarchiver.m
index a63407b00..c97ee768a 100644
--- a/Testing/nsarchiver.m
+++ b/Testing/nsarchiver.m
@@ -16,7 +16,9 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSSet.h>
-#include <Foundation/NSUtilities.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSDate.h>
 
diff --git a/Testing/nsarray.m b/Testing/nsarray.m
index dfeab2765..684b27501 100644
--- a/Testing/nsarray.m
+++ b/Testing/nsarray.m
@@ -10,6 +10,7 @@
 */
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
diff --git a/Testing/nsbundle.m b/Testing/nsbundle.m
index b704dabcf..85af6655c 100644
--- a/Testing/nsbundle.m
+++ b/Testing/nsbundle.m
@@ -16,6 +16,7 @@
 #endif
 #include "Foundation/NSArray.h"
 #include "Foundation/NSBundle.h"
+#include "Foundation/NSDictionary.h"
 #include "Foundation/NSException.h"
 #include "Foundation/NSString.h"
 #include <Foundation/NSAutoreleasePool.h>
diff --git a/Testing/nsdictionary.m b/Testing/nsdictionary.m
index 73e5a0ca0..378964171 100644
--- a/Testing/nsdictionary.m
+++ b/Testing/nsdictionary.m
@@ -9,6 +9,7 @@
    This file is part of the GNUstep Base Library.
 */
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSValue.h>
diff --git a/Testing/nsprocessinfo.m b/Testing/nsprocessinfo.m
index e3aeac72f..b620a2932 100644
--- a/Testing/nsprocessinfo.m
+++ b/Testing/nsprocessinfo.m
@@ -12,6 +12,7 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSDate.h>
 #include    <Foundation/NSAutoreleasePool.h>
 
diff --git a/Testing/nsset.m b/Testing/nsset.m
index 3fcdaa52c..314454253 100644
--- a/Testing/nsset.m
+++ b/Testing/nsset.m
@@ -10,6 +10,7 @@
 */
 #include <Foundation/NSSet.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSString.h>
 #include    <Foundation/NSAutoreleasePool.h>
 #include <assert.h>
diff --git a/Testing/nstimezone.m b/Testing/nstimezone.m
index 8f76a6328..139f5b528 100644
--- a/Testing/nstimezone.m
+++ b/Testing/nstimezone.m
@@ -15,6 +15,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDate.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSString.h>
 #include <Foundation/NSTimeZone.h>
 #include <Foundation/NSCalendarDate.h>
 
diff --git a/Tools/defaults.m b/Tools/defaults.m
index 0f0f3cbbe..3dbbe1728 100644
--- a/Tools/defaults.m
+++ b/Tools/defaults.m
@@ -24,6 +24,7 @@
 #include	<Foundation/NSObject.h>
 #include	<Foundation/NSArray.h>
 #include	<Foundation/NSDictionary.h>
+#include	<Foundation/NSEnumerator.h>
 #include	<Foundation/NSException.h>
 #include	<Foundation/NSString.h>
 #include	<Foundation/NSProcessInfo.h>
diff --git a/Tools/make_strings/StringsEntry.m b/Tools/make_strings/StringsEntry.m
index cb22ada0c..b3bba1ee0 100644
--- a/Tools/make_strings/StringsEntry.m
+++ b/Tools/make_strings/StringsEntry.m
@@ -20,6 +20,8 @@
 
 #include <Foundation/NSObject.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSString.h>
 
 #include "StringsEntry.h"
 
diff --git a/Tools/make_strings/make_strings.m b/Tools/make_strings/make_strings.m
index 831d4ec4a..99f1f8821 100644
--- a/Tools/make_strings/make_strings.m
+++ b/Tools/make_strings/make_strings.m
@@ -22,6 +22,7 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSArray.h>
 
 #include "make_strings.h"