diff --git a/Tools/cvtenc.m b/Tools/cvtenc.m
index 6795f7d41..9a3060c7e 100644
--- a/Tools/cvtenc.m
+++ b/Tools/cvtenc.m
@@ -18,19 +18,18 @@
 
    */
 
-#include "config.h"
-#include	<Foundation/Foundation.h>
-#include	<Foundation/NSArray.h>
-#include	<Foundation/NSData.h>
-#include	<Foundation/NSException.h>
-#include	<Foundation/NSString.h>
-#include	<Foundation/NSProcessInfo.h>
-#include	<Foundation/NSUserDefaults.h>
-#include	<Foundation/NSDebug.h>
-#include	<Foundation/NSFileHandle.h>
-#include	<Foundation/NSAutoreleasePool.h>
+#import "config.h"
+#import	"Foundation/NSArray.h"
+#import	"Foundation/NSData.h"
+#import	"Foundation/NSException.h"
+#import	"Foundation/NSString.h"
+#import	"Foundation/NSProcessInfo.h"
+#import	"Foundation/NSUserDefaults.h"
+#import	"Foundation/NSDebug.h"
+#import	"Foundation/NSFileHandle.h"
+#import	"Foundation/NSAutoreleasePool.h"
 #ifdef NeXT_Foundation_LIBRARY
-#include "GNUstepBase/GSCategories.h"
+#import "GNUstepBase/GSCategories.h"
 #endif
 
 #include	<ctype.h>
diff --git a/Tools/locale_alias.m b/Tools/locale_alias.m
index 788b18250..085244c3b 100644
--- a/Tools/locale_alias.m
+++ b/Tools/locale_alias.m
@@ -28,8 +28,10 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <locale.h>
-#include <Foundation/Foundation.h>
-#include <GNUstepBase/GSLocale.h>
+#import	"Foundation/NSAutoreleasePool.h"
+#import	"Foundation/NSDictionary.h"
+#import	"Foundation/NSString.h"
+#import "GNUstepBase/GSLocale.h"
 
 #define MAXSTRING 100
 
diff --git a/Tools/xmlparse.m b/Tools/xmlparse.m
index 1f8297ea1..0a4f14123 100644
--- a/Tools/xmlparse.m
+++ b/Tools/xmlparse.m
@@ -20,18 +20,18 @@
 
    */
 
-#include "config.h"
+#import "config.h"
 #include <stdio.h>
+#import	"Foundation/NSArray.h"
+#import	"Foundation/NSAutoreleasePool.h"
+#import	"Foundation/NSPathUtilities.h"
+#import	"Foundation/NSProcessInfo.h"
+#import	"Foundation/NSString.h"
+#import	"Foundation/NSUserDefaults.h"
 #ifdef NeXT_Foundation_LIBRARY
-#include <Foundation/Foundation.h>
-#include <GNUstepBase/GSCategories.h>
-#else
-#include <Foundation/NSArray.h>
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSObjCRuntime.h>
-#include <Foundation/NSProcessInfo.h>
+#import "GNUstepBase/GSCategories.h"
 #endif
-#include <GNUstepBase/GSXML.h>
+#import "GNUstepBase/GSXML.h"
 
 @interface GSXMLParser (Loader)
 + (NSString*) loadEntity: (NSString*)publicId