Final set of #include -> #import replacement in additional headers.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30097 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,43 @@
+2010-04-07 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/Additions/GNUstepGUI/GSHbox.h
+	* Headers/Additions/GNUstepGUI/GSHelpManagerPanel.h
+	* Headers/Additions/GNUstepGUI/GSLayoutManager_internal.h
+	* Headers/Additions/GNUstepGUI/GSTypesetter.h
+	* Headers/Additions/GNUstepGUI/GSAnimator.h
+	* Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
+	* Headers/Additions/GNUstepGUI/GSTextConverter.h
+	* Headers/Additions/GNUstepGUI/GSPrintOperation.h
+	* Headers/Additions/GNUstepGUI/GSServicesManager.h
+	* Headers/Additions/GNUstepGUI/GSVbox.h
+	* Headers/Additions/GNUstepGUI/GSHorizontalTypesetter.h
+	* Headers/Additions/GNUstepGUI/GMAppKit.h
+	* Headers/Additions/GNUstepGUI/GSTable.h
+	* Headers/Additions/GNUstepGUI/GSMemoryPanel.h
+	* Headers/Additions/GNUstepGUI/GSMethodTable.h
+	* Headers/Additions/GNUstepGUI/GSDisplayServer.h
+	* Headers/Additions/GNUstepGUI/GSToolbarView.h
+	* Headers/Additions/GNUstepGUI/GSTheme.h
+	* Headers/Additions/GNUstepGUI/GSPDFPrintOperation.h
+	* Headers/Additions/GNUstepGUI/GSLayoutManager.h
+	* Headers/Additions/GNUstepGUI/GSDragView.h
+	* Headers/Additions/GNUstepGUI/IMLoading.h
+	* Headers/Additions/GNUstepGUI/IMConnectors.h
+	* Headers/Additions/GNUstepGUI/GSPasteboardServer.h
+	* Headers/Additions/GNUstepGUI/GSInfoPanel.h
+	* Headers/Additions/GNUstepGUI/GSTitleView.h
+	* Headers/Additions/GNUstepGUI/GSTrackingRect.h
+	* Headers/Additions/GNUstepGUI/GSEPSPrintOperation.h
+	* Headers/Additions/GNUstepGUI/GSPrinting.h
+	* Headers/Additions/GNUstepGUI/GMArchiver.h
+	* Headers/Additions/GNUstepGUI/IMCustomObject.h
+	* Printing/GSCUPS/GSCUPSPrinter.m
+	* Model/GMArchiver.m
+	* Model/GMAppKit.m
+	* Source/NSAlert.m
+	* Source/GSMemoryPanel.m: Final set of #include -> #import
+	replacement in additional headers.
+
 2010-04-06 Fred Kiefer <FredKiefer@gmx.de>
 
 	* ColorPickers/GSWheelColorPicker.m,

Headers/Additions/GNUstepGUI/GMAppKit.h

@@ -28,8 +28,41 @@
 #ifndef _GNUstep_H_GMAppKit
 #define _GNUstep_H_GMAppKit
 
-#include <AppKit/AppKit.h>
-#include <GNUstepGUI/GMArchiver.h>
+#ifndef GNUSTEP
+#import <AppKit/AppKit.h>
+#else
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSBox.h>
+#import <AppKit/NSButton.h>
+#import <AppKit/NSCell.h>
+#import <AppKit/NSClipView.h>
+#import <AppKit/NSColor.h>
+#import <AppKit/NSControl.h>
+#import <AppKit/NSFont.h>
+#import <AppKit/NSImage.h>
+#import <AppKit/NSMatrix.h>
+#import <AppKit/NSMenuItem.h>
+#import <AppKit/NSMenu.h>
+#import <AppKit/NSPopUpButton.h>
+#import <AppKit/NSResponder.h>
+#import <AppKit/NSTextField.h>
+#import <AppKit/NSScrollView.h>
+#import <AppKit/NSSecureTextField.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSWindow.h>
+#import <AppKit/NSPanel.h>
+#import <AppKit/NSSavePanel.h>
+#import <AppKit/NSOpenPanel.h>
+#import <AppKit/NSBrowser.h>
+#import <AppKit/NSColorWell.h>
+#import <AppKit/NSImageView.h>
+#import <AppKit/NSSliderCell.h>
+#import <AppKit/NSTextFieldCell.h>
+#import <AppKit/NSFormCell.h>
+#import <AppKit/NSText.h>
+#import <AppKit/NSTextView.h>
+#endif
+#import <GNUstepGUI/GMArchiver.h>
 
 @interface NSApplication (GMArchiverMethods) <ModelCoding>
 @end
@@ -58,6 +91,9 @@
 @interface NSImage (GMArchiverMethods) <ModelCoding>
 @end
 
+@interface NSMatrix (GMArchiverMethods) <ModelCoding>
+@end
+
 @interface NSMenuItem (GMArchiverMethods) <ModelCoding>
 @end
 
@@ -73,6 +109,9 @@
 @interface NSTextField (GMArchiverMethods) <ModelCoding>
 @end
 
+@interface NSScrollView (GMArchiverMethods) <ModelCoding>
+@end
+
 @interface NSSecureTextFieldCell (GMArchiverMethods) <ModelCoding>
 @end
 
@@ -88,9 +127,27 @@
 @interface NSSavePanel (GMArchiverMethods) <ModelCoding>
 @end
 
+@interface NSOpenPanel (GMArchiverMethods) <ModelCoding>
+@end
+
 @interface NSBrowser (GMArchiverMethods) <ModelCoding>
 @end
 
+@interface NSColorWell (GMArchiverMethods) <ModelCoding>
+@end
+
+@interface NSImageView (GMArchiverMethods) <ModelCoding>
+@end
+
+@interface NSSliderCell (GMArchiverMethods) <ModelCoding>
+@end
+
+@interface NSTextFieldCell (GMArchiverMethods) <ModelCoding>
+@end
+
+@interface NSFormCell (GMArchiverMethods) <ModelCoding>
+@end
+
 @interface NSText (GMArchiverMethods) <ModelCoding>
 @end
 

Headers/Additions/GNUstepGUI/GMArchiver.h

@@ -31,18 +31,19 @@
 #define __GMArchiver_h__
 
 #ifndef GNUSTEP
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 #else
-#include <Foundation/NSCoder.h>
-#include <Foundation/NSHashTable.h>
-#include <Foundation/NSMapTable.h>
-#include <Foundation/NSGeometry.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSZone.h>
 #endif
 
 @class NSString;
 @class NSData;
 @class NSArray;
 @class NSDictionary;
+@class NSHashTable;
+@class NSMapTable;
 @class NSMutableArray;
 @class NSMutableDictionary;
 

Headers/Additions/GNUstepGUI/GSAnimator.h

@@ -27,14 +27,15 @@
 #ifndef _GNUstep_H_GSAnimator_
 #define _GNUstep_H_GSAnimator_
 
-@class NSRunLoop;
-@class NSEvent;
-@class NSTimer;
-@class NSString;
+#import <Foundation/NSDate.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSZone.h>
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSTimer.h>
+@class NSArray;
+@class NSEvent;
+@class NSRunLoop;
+@class NSString;
+@class NSTimer;
 
 /**
  * Protocol that needs to be adopted by classes that want to

Headers/Additions/GNUstepGUI/GSDisplayServer.h

@@ -29,32 +29,37 @@
 #ifndef _GSDisplayServer_h_INCLUDE
 #define _GSDisplayServer_h_INCLUDE
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include <Foundation/NSMapTable.h>
-#include <Foundation/NSSet.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
 
-#include <AppKit/NSDragging.h>
-#include <AppKit/AppKitDefines.h>
-#include <AppKit/NSGraphicsContext.h>
+#import <AppKit/AppKitDefines.h>
+#import <AppKit/NSDragging.h>
+#import <AppKit/NSGraphicsContext.h>
 
 @class NSArray;
-@class NSMutableDictionary;
-@class NSEvent;
-@class NSImage;
+@class NSCountedSet;
+@class NSDictionary;
+@class NSMapTable;
 @class NSMutableArray;
 @class NSMutableData;
+@class NSMutableDictionary;
+@class NSString;
+
+@class NSEvent;
+@class NSImage;
+
 @class GSDisplayServer;
 @class NSGraphicsContext;
+@class NSWindow;
 
 #if !NO_GNUSTEP
-APPKIT_EXPORT GSDisplayServer * GSServerForWindow(NSWindow *window);
-APPKIT_EXPORT GSDisplayServer * GSCurrentServer(void);
+APPKIT_EXPORT GSDisplayServer *GSServerForWindow(NSWindow *window);
+APPKIT_EXPORT GSDisplayServer *GSCurrentServer(void);
 
 /* Display attributes */
-APPKIT_EXPORT NSString * GSDisplayName;
-APPKIT_EXPORT NSString * GSDisplayNumber;
-APPKIT_EXPORT NSString * GSScreenNumber;
+APPKIT_EXPORT NSString *GSDisplayName;
+APPKIT_EXPORT NSString *GSDisplayNumber;
+APPKIT_EXPORT NSString *GSScreenNumber;
 
 @interface GSDisplayServer : NSObject
 {

Headers/Additions/GNUstepGUI/GSDragView.h

@@ -30,13 +30,21 @@
    Free Software Foundation, 51 Franklin Street, Fifth Floor, 
    Boston, MA 02110-1301, USA.
 */
+#ifndef _GSDragView_h_INCLUDE
+#define _GSDragView_h_INCLUDE
 
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSDragging.h>
-#include <AppKit/NSView.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSDragging.h>
+#import <AppKit/NSView.h>
+
+@class NSMutableDictionary;
 
 @class NSCell;
-@class NSMutableDictionary;
+@class NSEvent;
+@class NSImage;
+@class NSPasteboard;
+@class NSWindow;
 
 /*
  * used in the operation mask to indicate that the
@@ -124,3 +132,4 @@
 			    windowRef: (int*)mouseWindowRef;
 
 @end
+#endif

Headers/Additions/GNUstepGUI/GSEPSPrintOperation.h

@@ -37,9 +37,9 @@
 #ifndef _GNUstep_H_GSEPSPrintOperation
 #define _GNUstep_H_GSEPSPrintOperation
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include "AppKit/NSPrintOperation.h"
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
+#import "AppKit/NSPrintOperation.h"
 
 @class NSString;
 @class NSView;
@@ -51,10 +51,9 @@
 }
 
 - (id) initWithView:(NSView *)aView	
-		     insideRect:(NSRect)rect
-			       toPath:(NSString *)path
-		      printInfo:(NSPrintInfo *)aPrintInfo;
+         insideRect:(NSRect)rect
+             toPath:(NSString *)path
+          printInfo:(NSPrintInfo *)aPrintInfo;
 @end
 
-
 #endif // _GNUstep_H_GSEPSPrintOperation

Headers/Additions/GNUstepGUI/GSHbox.h

@@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_GSHbox
 #define _GNUstep_H_GSHbox
 
-#include "GSTable.h"
+#import "GSTable.h"
 
 /** 
   <unit>

Headers/Additions/GNUstepGUI/GSHelpManagerPanel.h

@@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_GSHelpManagerPanel
 #define _GNUstep_H_GSHelpManagerPanel
 
-#include <AppKit/NSPanel.h>
+#import <AppKit/NSPanel.h>
 
 @class NSTextView;
 @class NSAttributedString;

Headers/Additions/GNUstepGUI/GSHorizontalTypesetter.h

@@ -28,7 +28,7 @@
 #ifndef _GNUstep_H_GSHorizontalTypesetter
 #define _GNUstep_H_GSHorizontalTypesetter
 
-#include <GNUstepGUI/GSTypesetter.h>
+#import <GNUstepGUI/GSTypesetter.h>
 
 @class NSLock;
 @class GSLayoutManager, NSTextContainer, NSTextStorage;

Headers/Additions/GNUstepGUI/GSInfoPanel.h

@@ -30,7 +30,9 @@
 #ifndef _GNUstep_H_GSInfoPanel
 #define _GNUstep_H_GSInfoPanel
 
-#include <AppKit/NSPanel.h>
+#import <AppKit/NSPanel.h>
+
+@class NSDictionary;
 
 /* If you need an Info Panel, the simpler thing to do is to use
  * NSApplication -orderFrontStandardInfoPanel: and 
@@ -38,7 +40,7 @@
  * They automatically manage an infoPanel for you.
  */
 
-@interface GSInfoPanel:NSPanel
+@interface GSInfoPanel: NSPanel
 {
 }
 /*

Headers/Additions/GNUstepGUI/GSLayoutManager.h

@@ -28,10 +28,10 @@
 #ifndef _GNUstep_H_GSLayoutManager
 #define _GNUstep_H_GSLayoutManager
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGlyphGenerator.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSFont.h>
+#import <AppKit/NSGlyphGenerator.h>
 
 @class GSTypesetter;
 @class NSTextStorage,NSTextContainer;

Headers/Additions/GNUstepGUI/GSLayoutManager_internal.h

@@ -28,7 +28,7 @@
 #ifndef _GNUstep_H_GSLayoutManager_internal
 #define _GNUstep_H_GSLayoutManager_internal
 
-#include <GNUstepGUI/GSLayoutManager.h>
+#import <GNUstepGUI/GSLayoutManager.h>
 
 
 /*

Headers/Additions/GNUstepGUI/GSMemoryPanel.h

@@ -34,8 +34,11 @@
 #ifndef _GNUstep_H_GSMEMORY_PANEL_
 #define _GNUstep_H_GSMEMORY_PANEL_
 
-#include <Foundation/Foundation.h>
-#include <AppKit/AppKit.h>
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSPanel.h>
+
+@class NSTableView;
+@class NSMutableArray;
 
 @interface GSMemoryPanel: NSPanel
 {

Headers/Additions/GNUstepGUI/GSMethodTable.h

@@ -25,17 +25,17 @@
 #ifndef _GSMethodTable_h_INCLUDE
 #define _GSMethodTable_h_INCLUDE
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSFont.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSFont.h>
 
 @class NSAffineTransform;
-@class NSBezierPath;
 @class NSDate;
+@class NSString;
+@class NSBezierPath;
+@class NSColor;
 @class NSEvent;
 @class NSGraphicsContext;
-@class NSString;
-@class NSColor;
 
 typedef struct {
 

Headers/Additions/GNUstepGUI/GSPDFPrintOperation.h

@@ -37,9 +37,9 @@
 #ifndef _GNUstep_H_GSPDFPrintOperation
 #define _GNUstep_H_GSPDFPrintOperation
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include "AppKit/NSPrintOperation.h"
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
+#import "AppKit/NSPrintOperation.h"
 
 @class NSString;
 
@@ -52,9 +52,9 @@
 }
 
 - (id) initWithView:(NSView *)aView	
-		     insideRect:(NSRect)rect
-			       toPath:(NSString *)path
-		      printInfo:(NSPrintInfo *)aPrintInfo;
+         insideRect:(NSRect)rect
+             toPath:(NSString *)path
+          printInfo:(NSPrintInfo *)aPrintInfo;
 @end
 
 

Headers/Additions/GNUstepGUI/GSPasteboardServer.h

@@ -28,9 +28,9 @@
 #ifndef _GNUstep_H_GSPasteboardServer
 #define _GNUstep_H_GSPasteboardServer
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSString.h>
-#include <AppKit/NSPasteboard.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+#import <AppKit/NSPasteboard.h>
 
 @class NSString;
 @class NSArray;

Headers/Additions/GNUstepGUI/GSPrintOperation.h

@@ -38,7 +38,7 @@
 #ifndef _GNUstep_H_GSPrintOperation
 #define _GNUstep_H_GSPrintOperation
 
-#include "AppKit/NSPrintOperation.h"
+#import "AppKit/NSPrintOperation.h"
 
 
 @class NSView;

Headers/Additions/GNUstepGUI/GSPrinting.h

@@ -31,8 +31,9 @@
 #ifndef _GNUstep_H_GSPrinting
 #define _GNUstep_H_GSPrinting
 
-#include <Foundation/NSBundle.h>
+#import <Foundation/NSObject.h>
 
+@class NSBundle;
 
 @interface GSPrinting : NSObject
 {

Headers/Additions/GNUstepGUI/GSServicesManager.h

@@ -28,7 +28,11 @@
 #ifndef _GNUstep_H_GSServicesManager
 #define _GNUstep_H_GSServicesManager
 
-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>
+/* Forward declaring the NSMenuItem protocol here would be nicer, but older
+   versions of gcc can't handle that.  Thus, we include the header
+   instead. */
+#import "AppKit/NSMenuItem.h"
 
 @class	NSApplication;
 @class	NSArray;
@@ -41,11 +45,6 @@
 @class	NSString;
 @class	NSTimer;
 
-/* Forward declaring the NSMenuItem protocol here would be nicer, but older
-   versions of gcc can't handle that.  Thus, we include the header
-   instead. */
-#include "AppKit/NSMenuItem.h"
-
 @interface      GSServicesManager : NSObject
 {
   NSApplication         *_application;

Headers/Additions/GNUstepGUI/GSTable.h

@@ -30,7 +30,7 @@
 #ifndef _GNUstep_H_GSTable
 #define _GNUstep_H_GSTable
 
-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>
 
 /** 
   <unit>

Headers/Additions/GNUstepGUI/GSTextConverter.h

@@ -32,10 +32,13 @@
 #ifndef _GNUstep_H_GSTextConverter
 #define _GNUstep_H_GSTextConverter
 
-#include <Foundation/NSAttributedString.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSError.h>
+#import <Foundation/NSObject.h>
+
+@class NSAttributedString;
+@class NSData;
+@class NSDictionary;
+@class NSError;
+@class NSString;
 
 @protocol GSTextConverter
 + (Class) classForFormat: (NSString*)format 

Headers/Additions/GNUstepGUI/GSTheme.h

@@ -215,17 +215,17 @@
 #ifndef _GNUstep_H_GSTheme
 #define _GNUstep_H_GSTheme
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSCell.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSCell.h>
 // For gradient types
-#include <AppKit/NSButtonCell.h>
+#import <AppKit/NSButtonCell.h>
 // For image frame style
-#include <AppKit/NSImageCell.h>
+#import <AppKit/NSImageCell.h>
 // For scroller constants
-#include <AppKit/NSScroller.h>
+#import <AppKit/NSScroller.h>
 // For segmented control style constants
-#include <AppKit/NSSegmentedControl.h>
+#import <AppKit/NSSegmentedControl.h>
 
 #if	OS_API_VERSION(GS_API_NONE,GS_API_NONE)
 @class NSArray;

Headers/Additions/GNUstepGUI/GSTitleView.h

@@ -27,7 +27,7 @@
 #ifndef _GNUstep_H_GSTitleView
 #define _GNUstep_H_GSTitleView
 
-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>
 
 @class NSMutableDictionary;
 @class NSButton;

Headers/Additions/GNUstepGUI/GSToolbarView.h

@@ -32,9 +32,9 @@
 #ifndef _GSToolbarView_h_INCLUDE
 #define _GSToolbarView_h_INCLUDE
 
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSColor.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSView.h>
+#import <AppKit/NSColor.h>
 
 @class NSMutableArray;
 @class NSClipView;

Headers/Additions/GNUstepGUI/GSTrackingRect.h

@@ -30,7 +30,8 @@
 #ifndef _GNUstep_H_GSTrackingRect
 #define _GNUstep_H_GSTrackingRect
 
-#include <AppKit/NSView.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSView.h>
 
 @interface GSTrackingRect : NSObject <NSCoding>
 {
@@ -64,12 +65,6 @@
 - (BOOL) isValid;
 - (void) invalidate;
 
-/*
- * NSCoding protocol
- */
-- (void) encodeWithCoder: (NSCoder*)aCoder;
-- (id) initWithCoder: (NSCoder*)aDecoder;
-
 @end
 
 #endif /* _GNUstep_H_GSTrackingRect */

Headers/Additions/GNUstepGUI/GSTypesetter.h

@@ -28,11 +28,9 @@
 #ifndef _GNUstep_H_GSTypesetter
 #define _GNUstep_H_GSTypesetter
 
-#include <Foundation/NSObject.h>
-#include <Foundation/NSRange.h>
-#include <Foundation/NSGeometry.h>
-
-
+#import <Foundation/NSObject.h>
+#import <Foundation/NSRange.h>
+#import <Foundation/NSGeometry.h>
 
 @class GSLayoutManager;
 @class NSTextContainer;

Headers/Additions/GNUstepGUI/GSVbox.h

@@ -38,7 +38,7 @@
 #ifndef _GNUstep_H_GSVbox
 #define _GNUstep_H_GSVbox
 
-#include "GSTable.h"
+#import "GSTable.h"
 
 /** 
   <unit>

Headers/Additions/GNUstepGUI/GSWindowDecorationView.h

@@ -27,8 +27,8 @@
 #ifndef _GNUstep_H_GSWindowDecorationView
 #define _GNUstep_H_GSWindowDecorationView
 
-#include <Foundation/NSGeometry.h>
-#include <AppKit/NSView.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSView.h>
 
 @class NSWindow;
 

Headers/Additions/GNUstepGUI/IMConnectors.h

@@ -33,9 +33,10 @@
 #define _GNUstep_H_IMConnectors
 
 #ifndef GNUSTEP
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 #else
-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>
+@class NSString;
 #endif
 
 @interface IMConnector : NSObject

Headers/Additions/GNUstepGUI/IMCustomObject.h

@@ -33,10 +33,12 @@
 #define _GNUstep_H_IMCustomObject
 
 #ifndef GNUSTEP
-#include <AppKit/AppKit.h>
+#import <AppKit/AppKit.h>
 #else
-#include <Foundation/NSObject.h>
-#include <AppKit/NSView.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSView.h>
+
+@class NSString;
 #endif
 
 /* Add an archiving category to object so every object can respond to

Headers/Additions/GNUstepGUI/IMLoading.h

@@ -29,9 +29,12 @@
 #define _GNUstep_H_IMLoading
 
 #ifndef GNUSTEP
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 #else
-#include <Foundation/NSBundle.h>
+#import <Foundation/NSObject.h>
+@class NSArray;
+@class NSBundle;
+@class NSString;
 #endif
 
 @interface NSObject (NibAwaking)

Model/GMAppKit.m

@@ -25,7 +25,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "GNUstepGUI/GMAppKit.h"
+#import <Foundation/NSDebug.h>
+#import "GNUstepGUI/GMAppKit.h"
 
 #ifndef AUTORELEASE
 #define AUTORELEASE(object)	[object autorelease]

Model/GMArchiver.m

@@ -28,18 +28,20 @@
    COPYING file from libFoundation for copyright information. */
 
 #ifndef GNUSTEP
-#include <Foundation/Foundation.h>
+#import <Foundation/Foundation.h>
 #else
-#include <Foundation/NSString.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSObjCRuntime.h>
-#include <Foundation/NSEnumerator.h>
-#include <Foundation/NSScanner.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSArchiver.h>
+#import <Foundation/NSArchiver.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSHashTable.h>
+#import <Foundation/NSMapTable.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSScanner.h>
+#import <Foundation/NSString.h>
 #endif
 
 #ifndef AUTORELEASE
@@ -48,7 +50,7 @@
 #define RETAIN(object)          [object retain]
 #endif
 
-#include <GNUstepGUI/GMArchiver.h>
+#import <GNUstepGUI/GMArchiver.h>
 
 @interface GMClassInfo : NSObject
 {
@@ -1148,4 +1150,4 @@ static NSMutableDictionary* classToAliasMappings = nil;
 @end /* GMUnarchiver */
 
 
-#include "GMArchiveObjects.m"
+#import "GMArchiveObjects.m"

Printing/GSCUPS/GSCUPSPrinter.m

@@ -34,29 +34,20 @@
  * (This is not required in the OpenStep standard, but could be useful).
  */
 
-#include "config.h"
-#include <Foundation/NSDebug.h>
-//#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSArray.h>
-//#include <Foundation/NSDictionary.h>
-#include <Foundation/NSString.h>
-//#include <Foundation/NSBundle.h>
-//#include <Foundation/NSCharacterSet.h>
-//#include <Foundation/NSDictionary.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSPathUtilities.h>
-//#include <Foundation/NSScanner.h>
-//#include <Foundation/NSString.h>
-//#include <Foundation/NSUserDefaults.h>
-//#include <Foundation/NSUtilities.h>
-//#include <Foundation/NSValue.h>
-//#include <Foundation/NSMapTable.h>
-#include <Foundation/NSSet.h>
-#include "AppKit/AppKitExceptions.h"
-#include "AppKit/NSGraphics.h"
-#include "GSCUPSPrinter.h"
-#include "GNUstepGUI/GSPrinting.h"
+#import "config.h"
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSSet.h>
+#import "AppKit/AppKitExceptions.h"
+#import "AppKit/NSGraphics.h"
+#import "GNUstepGUI/GSPrinting.h"
+#import "GSCUPSPrinter.h"
+
 #include <cups/cups.h>
 
 

Source/GSMemoryPanel.m

@@ -26,9 +26,17 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "GNUstepGUI/GSMemoryPanel.h"
-#include "GNUstepGUI/GSHbox.h"
-#include "GNUstepGUI/GSVbox.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>
+#import "AppKit/NSButton.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSTableColumn.h"
+#import "AppKit/NSTableView.h"
+#import "GNUstepGUI/GSMemoryPanel.h"
+#import "GNUstepGUI/GSHbox.h"
+#import "GNUstepGUI/GSVbox.h"
 
 enum {
   OrderByClassName,
@@ -336,7 +344,7 @@ static GSMemoryPanel *sharedGSMemoryPanel = nil;
 
 - (void) snapshot: (id)sender
 {
-  GSMemoryPanel		*snapshot = [GSMemoryPanel new];
+  GSMemoryPanel	*snapshot = [GSMemoryPanel new];
 
   [snapshot setTitle:
     [NSString stringWithFormat: @"Memory Snapshot at %@", [NSDate date]]];

Source/NSAlert.m

@@ -58,6 +58,7 @@
 #import "AppKit/NSScreen.h"
 #import "AppKit/NSScroller.h"
 #import "AppKit/NSScrollView.h"
+#import <AppKit/NSStringDrawing.h>
 #import "AppKit/NSTextField.h"
 #import "AppKit/NSTextView.h"