Improve MacOS-X compatibility of headers.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25638 72102866-910b-0410-8b05-ffd578937521
2025-05-30 16:30:41 +00:00 · 2007-11-29 20:53:26 +00:00 · 2007-11-29 20:53:26 +00:00 · d6cfc0e91c
commit d6cfc0e91c
parent 444b1723e0
72 changed files with 537 additions and 429 deletions
--- 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"
--- 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$
--- 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;
--- 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

--- 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"
--- 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)	
--- 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
--- 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
--- 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
--- 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;
--- 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>
--- 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>
--- 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;
--- 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
--- 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
--- 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

--- 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
--- 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";
--- 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)
 {
--- 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
--- 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
 {
--- 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"
--- 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;
--- 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)
 {
--- 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"
--- 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.
--- 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
--- 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;
--- 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"
--- 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
--- 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);
--- 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>
--- 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"
--- 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.
--- 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"
--- 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"

--- 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"


 /**
--- 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

--- 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"
--- 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"
--- 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";
--- 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
--- 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 {
--- 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>
--- 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 {
--- 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";
--- a/Source/NSURLDownload.m
+++ b/Source/NSURLDownload.m
@ -23,7 +23,7 @@
   */ 


-#include "GSURLPrivate.h"
+#import "GSURLPrivate.h"

@interface	GSURLDownload : NSObject <NSURLProtocolClient>
 {
--- 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;
--- 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";
--- 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
--- 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
--- 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
--- 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"

--- 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"
--- 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>
--- 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>