From 9edbe1a4fc2bc0f3a788643680b43a9c498813a5 Mon Sep 17 00:00:00 2001
From: rfm <rfm@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 17 Feb 2010 11:47:06 +0000
Subject: [PATCH] cosmetic tweaks

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29657 72102866-910b-0410-8b05-ffd578937521
---
 Source/GSFormat.m              |  2 +-
 Source/GSSocketStream.m        |  2 +-
 Source/GSStream.m              |  2 +-
 Source/NSArchiver.m            | 12 ++++-----
 Source/NSAssertionHandler.m    | 14 +++++------
 Source/NSAttributedString.m    |  2 +-
 Source/NSAutoreleasePool.m     | 14 +++++------
 Source/NSBundle.m              | 42 +++++++++++++++----------------
 Source/NSCachedURLResponse.m   |  4 +--
 Source/NSCallBacks.m           | 10 ++++----
 Source/NSCharacterSet.m        |  4 +--
 Source/NSConnection.m          | 46 +++++++++++++++++-----------------
 Source/NSCopyObject.m          |  6 ++---
 Source/NSData.m                |  2 +-
 Source/NSDateFormatter.m       |  2 +-
 Source/NSDebug.m               | 24 +++++++++---------
 Source/NSDictionary.m          |  2 +-
 Source/NSGeometry.m            | 14 +++++------
 Source/NSKeyValueCoding.m      | 30 +++++++++++-----------
 Source/NSKeyValueObserving.m   |  2 +-
 Source/NSKeyedArchiver.m       |  2 +-
 Source/NSKeyedUnarchiver.m     |  2 +-
 Source/NSLog.m                 | 26 +++++++++----------
 Source/NSNull.m                |  4 +--
 Source/NSObjCRuntime.m         | 10 ++++----
 Source/NSObject.m              | 42 +++++++++++++++----------------
 Source/NSPage.m                |  8 +++---
 Source/NSPathUtilities.m       | 32 +++++++++++------------
 Source/NSPipe.m                | 12 ++++-----
 Source/NSPortCoder.m           |  4 +--
 Source/NSProcessInfo.m         |  6 ++---
 Source/NSProtocolChecker.m     | 12 ++++-----
 Source/NSProxy.m               | 20 +++++++--------
 Source/NSRange.m               | 10 ++++----
 Source/NSScanner.m             |  2 +-
 Source/NSSerializer.m          | 34 ++++++++++++-------------
 Source/NSString.m              |  4 +--
 Source/NSThread.m              | 28 ++++++++++-----------
 Source/NSUserDefaults.m        |  6 ++---
 Source/NSXMLDTD.m              |  2 +-
 Source/NSXMLDocument.m         |  2 +-
 Source/NSXMLNode.m             |  2 +-
 Source/NSZone.m                | 18 ++++++-------
 Source/callframe.m             | 11 ++++----
 Source/cifframe.m              | 11 ++++----
 Source/externs.m               | 10 ++++----
 Source/libgnustep-base-entry.m |  8 +++---
 Source/objc-load.m             | 10 ++++----
 Source/preface.m               |  2 +-
 Source/synchronization.m       |  2 +-
 50 files changed, 290 insertions(+), 288 deletions(-)

diff --git a/Source/GSFormat.m b/Source/GSFormat.m
index d3219a0e2..47309cfb4 100644
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@@ -125,7 +125,7 @@ typedef unsigned long long uintmax_t;
 #endif
 
 
-#include "GNUstepBase/Unicode.h"
+#import "GNUstepBase/Unicode.h"
 
 struct printf_info
 {
diff --git a/Source/GSSocketStream.m b/Source/GSSocketStream.m
index 4cc11185a..1e69958a5 100644
--- a/Source/GSSocketStream.m
+++ b/Source/GSSocketStream.m
@@ -22,7 +22,7 @@
 
    */
 
-#include "config.h"
+#import "config.h"
 
 #import "Foundation/NSArray.h"
 #import "Foundation/NSByteOrder.h"
diff --git a/Source/GSStream.m b/Source/GSStream.m
index c2383c401..1bc4f3d79 100644
--- a/Source/GSStream.m
+++ b/Source/GSStream.m
@@ -22,7 +22,7 @@
 
    */
 
-#include "config.h"
+#import "config.h"
 
 #import "Foundation/NSArray.h"
 #import "Foundation/NSByteOrder.h"
diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m
index 4104d44a9..8f0a6ab8f 100644
--- a/Source/NSArchiver.m
+++ b/Source/NSArchiver.m
@@ -49,14 +49,14 @@
 #include "GNUstepBase/GSIMap.h"
 
 #define	_IN_NSARCHIVER_M
-#include "Foundation/NSArchiver.h"
+#import "Foundation/NSArchiver.h"
 #undef	_IN_NSARCHIVER_M
 
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSCoder.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSString.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSCoder.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
 
 typedef	unsigned char	uchar;
 
diff --git a/Source/NSAssertionHandler.m b/Source/NSAssertionHandler.m
index 5a1162d8d..97533a25e 100644
--- a/Source/NSAssertionHandler.m
+++ b/Source/NSAssertionHandler.m
@@ -25,13 +25,13 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSThread.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSThread.h"
 
 /**
  * <p>NSAssertionHandler objects are used to raise exceptions on behalf of
diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index 1837aef0c..1ff4fc6b7 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -47,7 +47,7 @@
  *		attributes argument and use the values from the string.
  */
 
-#include "config.h"
+#import "config.h"
 #import "GNUstepBase/preface.h"
 #import "GNUstepBase/Unicode.h"
 
diff --git a/Source/NSAutoreleasePool.m b/Source/NSAutoreleasePool.m
index 9435b0b07..d3e6cf45c 100644
--- a/Source/NSAutoreleasePool.m
+++ b/Source/NSAutoreleasePool.m
@@ -26,15 +26,15 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSAutoreleasePool_IVARS	1
 #define	EXPOSE_NSThread_IVARS	1
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSGarbageCollector.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSZone.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSGarbageCollector.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSZone.h"
 #include <limits.h>
 
 /* When this is `NO', autoreleased objects are never actually recorded
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 4467f0605..fb638ee00 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -31,31 +31,31 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSBundle_IVARS	1
-#include "GNUstepBase/preface.h"
+#import "GNUstepBase/preface.h"
 #include "objc-load.h"
-#include "Foundation/NSBundle.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSString.h"
-#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"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSFileManager.h"
-#include "Foundation/NSPathUtilities.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSValue.h"
+#import "Foundation/NSBundle.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSProcessInfo.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSUserDefaults.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSFileManager.h"
+#import "Foundation/NSPathUtilities.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSValue.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/Source/NSCachedURLResponse.m b/Source/NSCachedURLResponse.m
index 51a492dcb..e5b123676 100644
--- a/Source/NSCachedURLResponse.m
+++ b/Source/NSCachedURLResponse.m
@@ -23,8 +23,8 @@
    */ 
 
 #define	EXPOSE_NSCachedURLResponse_IVARS	1
-#include "GSURLPrivate.h"
-#include "Foundation/NSCoder.h"
+#import "GSURLPrivate.h"
+#import "Foundation/NSCoder.h"
 
 // Internal data storage
 typedef struct {
diff --git a/Source/NSCallBacks.m b/Source/NSCallBacks.m
index 46ff27a42..1f934f06c 100644
--- a/Source/NSCallBacks.m
+++ b/Source/NSCallBacks.m
@@ -29,11 +29,11 @@
 
 /**** Included Headers *******************************************************/
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "NSCallBacks.h"
-#include "Foundation/NSObject.h"
-#include "Foundation/NSString.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "NSCallBacks.h"
+#import "Foundation/NSObject.h"
+#import "Foundation/NSString.h"
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Source/NSCharacterSet.m b/Source/NSCharacterSet.m
index 6915de80c..e2936a34b 100644
--- a/Source/NSCharacterSet.m
+++ b/Source/NSCharacterSet.m
@@ -26,7 +26,7 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
+#import "config.h"
 #import "GNUstepBase/GSLock.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSCoder.h"
@@ -45,7 +45,7 @@
 #define	GNUSTEP_INDEX_CHARSET	1
 //#undef	GNUSTEP_INDEX_CHARSET
 
-#include "NSCharacterSetData.h"
+#import "NSCharacterSetData.h"
 
 //PENDING: may want to make these less likely to conflict
 #define UNICODE_MAX	1114112
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 537e24606..5e15525af 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -68,32 +68,32 @@ static GC_descr	nodeDesc;	// Type descriptor for map node.
 #include "GNUstepBase/GSIMap.h"
 
 #define	_IN_CONNECTION_M
-#include "Foundation/NSConnection.h"
+#import "Foundation/NSConnection.h"
 #undef	_IN_CONNECTION_M
 
-#include "Foundation/NSPortCoder.h"
-#include "GNUstepBase/DistributedObjects.h"
+#import "Foundation/NSPortCoder.h"
+#import "GNUstepBase/DistributedObjects.h"
 
-#include "Foundation/NSHashTable.h"
-#include "Foundation/NSMapTable.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSDate.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSPort.h"
-#include "Foundation/NSPortMessage.h"
-#include "Foundation/NSPortNameServer.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSDebug.h"
-#include "GSInvocation.h"
-#include "GSPortPrivate.h"
-#include "GSPrivate.h"
+#import "Foundation/NSHashTable.h"
+#import "Foundation/NSMapTable.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSPort.h"
+#import "Foundation/NSPortMessage.h"
+#import "Foundation/NSPortNameServer.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSDebug.h"
+#import "GSInvocation.h"
+#import "GSPortPrivate.h"
+#import "GSPrivate.h"
 
 
 static inline NSRunLoop *
diff --git a/Source/NSCopyObject.m b/Source/NSCopyObject.m
index a0ecfd4b0..420b61e60 100644
--- a/Source/NSCopyObject.m
+++ b/Source/NSCopyObject.m
@@ -25,9 +25,9 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObject.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObject.h"
 
 NSObject *NSCopyObject(NSObject *anObject, NSUInteger extraBytes, NSZone *zone)
 {
diff --git a/Source/NSData.m b/Source/NSData.m
index ef1c0d8aa..98f944c71 100644
--- a/Source/NSData.m
+++ b/Source/NSData.m
@@ -67,7 +67,7 @@
  *		
  */
 
-#include "config.h"
+#import "config.h"
 #import "GNUstepBase/preface.h"
 #import "GNUstepBase/GSObjCRuntime.h"
 #import "Foundation/NSObjCRuntime.h"
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index 21ee89fa7..d7d760edd 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -25,7 +25,7 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSNSDateFormatter_IVARS	1
 #import "Foundation/NSDate.h"
 #import "Foundation/NSCalendarDate.h"
diff --git a/Source/NSDebug.m b/Source/NSDebug.m
index b132f9d03..bcbc7aa99 100644
--- a/Source/NSDebug.m
+++ b/Source/NSDebug.m
@@ -27,19 +27,19 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #include <stdio.h>
-#include "GSPrivate.h"
-#include "GNUstepBase/GSLock.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSNotificationQueue.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSValue.h"
+#import "GSPrivate.h"
+#import "GNUstepBase/GSLock.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSNotificationQueue.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSValue.h"
 
 #if     HAVE_EXECINFO_H
 #include        <execinfo.h>
diff --git a/Source/NSDictionary.m b/Source/NSDictionary.m
index db7c6d949..eead5b14b 100644
--- a/Source/NSDictionary.m
+++ b/Source/NSDictionary.m
@@ -26,7 +26,7 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSData.h"
diff --git a/Source/NSGeometry.m b/Source/NSGeometry.m
index 460fd084e..5ca46e3c2 100644
--- a/Source/NSGeometry.m
+++ b/Source/NSGeometry.m
@@ -34,15 +34,15 @@
 
 /**** Included Headers *******************************************************/
 
-#include "config.h"
+#import "config.h"
 #include <math.h>
 #include <stdlib.h>
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSGeometry.h"
-#include "Foundation/NSScanner.h"
-#include "Foundation/NSNotification.h"
-#include "GSPrivate.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSGeometry.h"
+#import "Foundation/NSScanner.h"
+#import "Foundation/NSNotification.h"
+#import "GSPrivate.h"
 
 static Class	NSStringClass = 0;
 static Class	NSScannerClass = 0;
diff --git a/Source/NSKeyValueCoding.m b/Source/NSKeyValueCoding.m
index da7aab473..f0b801255 100644
--- a/Source/NSKeyValueCoding.m
+++ b/Source/NSKeyValueCoding.m
@@ -24,21 +24,21 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSEnumerator.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSKeyValueCoding.h"
-#include "Foundation/NSMethodSignature.h"
-#include "Foundation/NSNull.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSZone.h"
+#import "config.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSKeyValueCoding.h"
+#import "Foundation/NSMethodSignature.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSZone.h"
 
 /* For the NSKeyValueMutableArray and NSKeyValueMutableSet classes
  */
diff --git a/Source/NSKeyValueObserving.m b/Source/NSKeyValueObserving.m
index d9d4b398a..214193f16 100644
--- a/Source/NSKeyValueObserving.m
+++ b/Source/NSKeyValueObserving.m
@@ -24,7 +24,7 @@
    $Date$ $Revision$
 */
 
-#include "GNUstepBase/preface.h"
+#import "GNUstepBase/preface.h"
 #import "Foundation/NSCharacterSet.h"
 #import "Foundation/NSDebug.h"
 #import "Foundation/NSDictionary.h"
diff --git a/Source/NSKeyedArchiver.m b/Source/NSKeyedArchiver.m
index 56b1baca7..9ae8bd5ac 100644
--- a/Source/NSKeyedArchiver.m
+++ b/Source/NSKeyedArchiver.m
@@ -63,7 +63,7 @@ static GC_descr	nodeDesc;	// Type descriptor for map node.
 
 
 #define	_IN_NSKEYEDARCHIVER_M	1
-#include "Foundation/NSKeyedArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #undef	_IN_NSKEYEDARCHIVER_M
 
 /* Exceptions */
diff --git a/Source/NSKeyedUnarchiver.m b/Source/NSKeyedUnarchiver.m
index ec66f7bf6..193f4fcb3 100644
--- a/Source/NSKeyedUnarchiver.m
+++ b/Source/NSKeyedUnarchiver.m
@@ -51,7 +51,7 @@
 #include "GNUstepBase/GSIArray.h"
 
 #define	_IN_NSKEYEDUNARCHIVER_M	1
-#include "Foundation/NSKeyedArchiver.h"
+#import "Foundation/NSKeyedArchiver.h"
 #undef	_IN_NSKEYEDUNARCHIVER_M
 
 @interface NilMarker: NSObject
diff --git a/Source/NSLog.m b/Source/NSLog.m
index ef8e0f687..d954c6bb4 100644
--- a/Source/NSLog.m
+++ b/Source/NSLog.m
@@ -25,18 +25,18 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSDate.h"
-#include "Foundation/NSCalendarDate.h"
-#include "Foundation/NSTimeZone.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSProcessInfo.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSThread.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSCalendarDate.h"
+#import "Foundation/NSTimeZone.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSProcessInfo.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSThread.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
 #ifdef	HAVE_SYSLOG_H
@@ -69,7 +69,7 @@
 #include <unistd.h>
 #endif
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 extern NSThread	*GSCurrentThread();
 
diff --git a/Source/NSNull.m b/Source/NSNull.m
index 033febdb5..889c95482 100644
--- a/Source/NSNull.m
+++ b/Source/NSNull.m
@@ -25,8 +25,8 @@
    $Date$ $Revision$
    */
 
-#include "Foundation/NSNull.h"
-#include "Foundation/NSString.h"
+#import "Foundation/NSNull.h"
+#import "Foundation/NSString.h"
 
 /**
  * An object to use as a placeholder - in collections for instance.
diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m
index 372479b26..f08efca66 100644
--- a/Source/NSObjCRuntime.m
+++ b/Source/NSObjCRuntime.m
@@ -25,11 +25,11 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSString.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSString.h"
 #include <string.h>
 
 /**
diff --git a/Source/NSObject.m b/Source/NSObject.m
index cb9c46895..6debee8d9 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -33,29 +33,29 @@
 #define InterlockedDecrement	BadInterlockedDecrement
 #endif
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "GNUstepBase/GNUstep.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "GNUstepBase/GNUstep.h"
 #include <stdarg.h>
-#include "Foundation/NSObject.h"
+#import "Foundation/NSObject.h"
 #include <objc/Protocol.h>
-#include "Foundation/NSMethodSignature.h"
-#include "Foundation/NSInvocation.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSPortCoder.h"
-#include "Foundation/NSDistantObject.h"
-#include "Foundation/NSZone.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSMapTable.h"
+#import "Foundation/NSMethodSignature.h"
+#import "Foundation/NSInvocation.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSPortCoder.h"
+#import "Foundation/NSDistantObject.h"
+#import "Foundation/NSZone.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSMapTable.h"
 #include <limits.h>
-#include "GNUstepBase/GSLocale.h"
+#import "GNUstepBase/GSLocale.h"
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -70,7 +70,7 @@
 #include <fenv.h>
 #endif
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 
 #ifndef NeXT_RUNTIME
diff --git a/Source/NSPage.m b/Source/NSPage.m
index c141cd8ac..ba1f2566e 100644
--- a/Source/NSPage.m
+++ b/Source/NSPage.m
@@ -25,10 +25,10 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSZone.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSZone.h"
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/Source/NSPathUtilities.m b/Source/NSPathUtilities.m
index dca75bbef..a4d12a23b 100644
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@@ -58,25 +58,25 @@
    which default to pre POSIX declaration.  */
 #define _POSIX_PTHREAD_SEMANTICS
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
 #include "objc-load.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSPathUtilities.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSFileManager.h"
-#include "Foundation/NSProcessInfo.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSUserDefaults.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSPathUtilities.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSFileManager.h"
+#import "Foundation/NSProcessInfo.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSUserDefaults.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 #include "pathconfig/pathconfig.h"
 
diff --git a/Source/NSPipe.m b/Source/NSPipe.m
index 2768a24a3..41a08cdac 100644
--- a/Source/NSPipe.m
+++ b/Source/NSPipe.m
@@ -24,15 +24,15 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 
 #define	EXPOSE_NSPipe_IVARS	1
 
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObject.h"
-#include "Foundation/NSFileHandle.h"
-#include "Foundation/NSDebug.h"
-#include "GSPrivate.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObject.h"
+#import "Foundation/NSFileHandle.h"
+#import "Foundation/NSDebug.h"
+#import "GSPrivate.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m
index 7602988c7..6dd0dec56 100644
--- a/Source/NSPortCoder.m
+++ b/Source/NSPortCoder.m
@@ -83,10 +83,10 @@ static GC_descr	nodeDesc;	// Type descriptor for map node.
 
 
 #define	_IN_PORT_CODER_M
-#include "Foundation/NSPortCoder.h"
+#import "Foundation/NSPortCoder.h"
 #undef	_IN_PORT_CODER_M
 
-#include "GNUstepBase/DistributedObjects.h"
+#import "GNUstepBase/DistributedObjects.h"
 
 typedef	unsigned char	uchar;
 
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index 57a7a8c61..df50c3900 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -54,8 +54,8 @@
  * - To the NEXTSTEP/GNUStep community
  *************************************************************************/
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -119,7 +119,7 @@
 #import "GNUstepBase/NSProcessInfo+GNUstepBase.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 @interface NSBundle (Private)
 + (NSString*) _gnustep_target_os;
diff --git a/Source/NSProtocolChecker.m b/Source/NSProtocolChecker.m
index 5b9d7f2ac..423325f18 100644
--- a/Source/NSProtocolChecker.m
+++ b/Source/NSProtocolChecker.m
@@ -27,13 +27,13 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSProtocolChecker_IVARS	1
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSProtocolChecker.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSInvocation.h"
-#include "Foundation/NSMethodSignature.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSProtocolChecker.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSInvocation.h"
+#import "Foundation/NSMethodSignature.h"
 #include <objc/Protocol.h>
 
 /**
diff --git a/Source/NSProxy.m b/Source/NSProxy.m
index 498d52aba..b167bb7df 100644
--- a/Source/NSProxy.m
+++ b/Source/NSProxy.m
@@ -25,16 +25,16 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSInvocation.h"
-#include "Foundation/NSProxy.h"
-#include "Foundation/NSMethodSignature.h"
-#include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSDistantObject.h"
-#include "Foundation/NSPortCoder.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSInvocation.h"
+#import "Foundation/NSProxy.h"
+#import "Foundation/NSMethodSignature.h"
+#import "Foundation/NSAutoreleasePool.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSDistantObject.h"
+#import "Foundation/NSPortCoder.h"
 
 #ifdef	HAVE_LIMITS_H
 /* For UINT_MAX */
diff --git a/Source/NSRange.m b/Source/NSRange.m
index 13ee8c4ef..4374e6845 100644
--- a/Source/NSRange.m
+++ b/Source/NSRange.m
@@ -25,13 +25,13 @@
    $Date$ $Revision$
  */
 
-#include "config.h"
+#import "config.h"
 
 #define	IN_NSRANGE_M 1
-#include "Foundation/NSException.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSRange.h"
-#include "Foundation/NSScanner.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSRange.h"
+#import "Foundation/NSScanner.h"
 
 @class	NSString;
 
diff --git a/Source/NSScanner.m b/Source/NSScanner.m
index 39a1a1487..c7565b5fa 100644
--- a/Source/NSScanner.m
+++ b/Source/NSScanner.m
@@ -45,7 +45,7 @@
 #include <limits.h>
 #include <math.h>
 #include <ctype.h>    /* FIXME: May go away once I figure out Unicode */
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /* BSD and Solaris have this */
 #if defined(HANDLE_LLONG_MAX) && !defined(HANDLE_LONG_LONG_MAX)
diff --git a/Source/NSSerializer.m b/Source/NSSerializer.m
index 5b82148d9..a82de2cbb 100644
--- a/Source/NSSerializer.m
+++ b/Source/NSSerializer.m
@@ -25,24 +25,24 @@
    $Date$ $Revision$
    */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSArray.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSEnumerator.h"
-#include "Foundation/NSProxy.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSSet.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSNotificationQueue.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSValue.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSEnumerator.h"
+#import "Foundation/NSProxy.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSSet.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSNotificationQueue.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSValue.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 @class	GSDictionary;
 @class	GSMutableDictionary;
diff --git a/Source/NSString.m b/Source/NSString.m
index 7b73bc8be..207545c95 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -97,9 +97,9 @@
 #include <stdio.h>
 #include <wchar.h>
 
-#include "GNUstepBase/Unicode.h"
+#import "GNUstepBase/Unicode.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 extern BOOL GSScanDouble(unichar*, unsigned, double*);
 
diff --git a/Source/NSThread.m b/Source/NSThread.m
index c3d9ecd78..06f677c60 100644
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@@ -31,9 +31,9 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSThread_IVARS	1
-#include "GNUstepBase/preface.h"
+#import "GNUstepBase/preface.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -64,19 +64,19 @@
 #define NBLK_OPT     FNDELAY
 #endif
 
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSThread.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSNotification.h"
-#include "Foundation/NSNotificationQueue.h"
-#include "Foundation/NSRunLoop.h"
-#include "Foundation/NSConnection.h"
-#include "Foundation/NSInvocation.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSThread.h"
+#import "Foundation/NSLock.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSNotification.h"
+#import "Foundation/NSNotificationQueue.h"
+#import "Foundation/NSRunLoop.h"
+#import "Foundation/NSConnection.h"
+#import "Foundation/NSInvocation.h"
 
-#include "GSPrivate.h"
-#include "GSRunLoopCtxt.h"
+#import "GSPrivate.h"
+#import "GSRunLoopCtxt.h"
 
 #if	GS_WITH_GC
 #include	<gc.h>
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index 5ecb68014..8b2c17358 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -27,9 +27,9 @@
    $Date$ $Revision$
 */
 
-#include "config.h"
+#import "config.h"
 #define	EXPOSE_NSUserDefaults_IVARS	1
-#include "GNUstepBase/preface.h"
+#import "GNUstepBase/preface.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
@@ -67,7 +67,7 @@
 #include <locale.h>
 #endif
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /* Wait for access */
 #define _MAX_COUNT 5          /* Max 10 sec. */
diff --git a/Source/NSXMLDTD.m b/Source/NSXMLDTD.m
index 3f2930f8a..ad48711d6 100644
--- a/Source/NSXMLDTD.m
+++ b/Source/NSXMLDTD.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
 */
 
-#include "NSXMLPrivate.h"
+#import "NSXMLPrivate.h"
 
 @implementation NSXMLDTD
 
diff --git a/Source/NSXMLDocument.m b/Source/NSXMLDocument.m
index b7cb3c267..6c875d4b8 100644
--- a/Source/NSXMLDocument.m
+++ b/Source/NSXMLDocument.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
 */
 
-#include "NSXMLPrivate.h"
+#import "NSXMLPrivate.h"
 
 @implementation	NSXMLDocument
 
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index 714e67b0c..55a2cde76 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
 */
 
-#include "NSXMLPrivate.h"
+#import "NSXMLPrivate.h"
 
 @implementation NSXMLNode
 
diff --git a/Source/NSZone.m b/Source/NSZone.m
index 4330816c6..bce7d705c 100644
--- a/Source/NSZone.m
+++ b/Source/NSZone.m
@@ -86,17 +86,17 @@
 
 #define IN_NSZONE_M 1
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
 #include <stddef.h>
 #include <string.h>
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSZone.h"
-#include "Foundation/NSLock.h"
-#include "GSPrivate.h"
-#include "GSPThread.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSZone.h"
+#import "Foundation/NSLock.h"
+#import "GSPrivate.h"
+#import "GSPThread.h"
 
 /**
  * Try to get more memory - the normal process has failed.
diff --git a/Source/callframe.m b/Source/callframe.m
index 546b93c09..dc5020c2f 100644
--- a/Source/callframe.m
+++ b/Source/callframe.m
@@ -23,17 +23,18 @@
    Boston, MA 02111 USA.
    */
 
-#include "config.h"
+#import "config.h"
+
 #include <stdlib.h>
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
 #include "callframe.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDebug.h"
-#include "GSInvocation.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDebug.h"
+#import "GSInvocation.h"
 
 #if defined(ALPHA) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
 typedef long long smallret_t;
diff --git a/Source/cifframe.m b/Source/cifframe.m
index 1151f53ec..0830ca568 100644
--- a/Source/cifframe.m
+++ b/Source/cifframe.m
@@ -23,17 +23,18 @@
    Boston, MA 02111 USA.
    */
 
-#include "config.h"
+#import "config.h"
+
 #include <stdlib.h>
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
 
 #include "cifframe.h"
-#include "Foundation/NSException.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDebug.h"
-#include "GSInvocation.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSData.h"
+#import "Foundation/NSDebug.h"
+#import "GSInvocation.h"
 
 #if defined(ALPHA) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
 typedef long long smallret_t;
diff --git a/Source/externs.m b/Source/externs.m
index 095918f46..d8e60eb1f 100644
--- a/Source/externs.m
+++ b/Source/externs.m
@@ -22,13 +22,13 @@
    Boston, MA 02111 USA.
    */
 
-#include "config.h"
-#include "Foundation/NSString.h"
+#import "config.h"
+#import "Foundation/NSString.h"
 
-#include "Foundation/NSArray.h"
-#include "Foundation/NSException.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSException.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /*
  PENDING some string constants are scattered about in the class impl
diff --git a/Source/libgnustep-base-entry.m b/Source/libgnustep-base-entry.m
index c234e42f9..e37812209 100644
--- a/Source/libgnustep-base-entry.m
+++ b/Source/libgnustep-base-entry.m
@@ -22,10 +22,10 @@
    Boston, MA 02111 USA.
 */
 
-#include "config.h"
-#include "GNUstepBase/preface.h"
-#include "Foundation/NSObjCRuntime.h"
-#include "Foundation/NSString.h"
+#import "config.h"
+#import "GNUstepBase/preface.h"
+#import "Foundation/NSObjCRuntime.h"
+#import "Foundation/NSString.h"
 
 /* Only if using Microsoft's tools and libraries */
 #ifdef __MS_WIN32__
diff --git a/Source/objc-load.m b/Source/objc-load.m
index ae1306f0f..81498ed50 100644
--- a/Source/objc-load.m
+++ b/Source/objc-load.m
@@ -30,7 +30,7 @@
 
 */
 
-#include "config.h"
+#import "config.h"
 
 #ifdef HAVE_DLADDR
 /* Define _GNU_SOURCE because that is required with GNU libc in order
@@ -48,11 +48,11 @@
 #endif
 
 #include "objc-load.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSException.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSDebug.h"
+#import "Foundation/NSException.h"
 
-#include "GSPrivate.h"
+#import "GSPrivate.h"
 
 /* include the interface to the dynamic linker */
 #include "dynamic-load.h"
diff --git a/Source/preface.m b/Source/preface.m
index 0e6883b9e..7db40ac03 100644
--- a/Source/preface.m
+++ b/Source/preface.m
@@ -23,7 +23,7 @@
 */
 
 #include <config.h>
-#include "GNUstepBase/preface.h"
+#import "GNUstepBase/preface.h"
 
 const char *gnustep_base_version = STRINGIFY (GNUSTEP_BASE_VERSION);
 
diff --git a/Source/synchronization.m b/Source/synchronization.m
index a205e541c..ab44628e1 100644
--- a/Source/synchronization.m
+++ b/Source/synchronization.m
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include "objc/objc.h"
 #include "objc/objc-api.h"
-#include "GSPThread.h"
+#import "GSPThread.h"
 
 /*
  * Node structure...