Some more #include -> #import replacement.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30036 72102866-910b-0410-8b05-ffd578937521
2025-04-23 07:00:46 +00:00 · 2010-03-25 21:30:28 +00:00 · 2010-03-25 21:30:28 +00:00 · 53381f6992
commit 53381f6992
parent 717ed845d0
29 changed files with 203 additions and 157 deletions
--- a/31
+++ b/31
@ -1,3 +1,34 @@
+2010-03-25 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSImageCell.h
+	* Headers/AppKit/NSLevelIndicator.h
+	* Headers/AppKit/NSMatrix.h
+	* Headers/AppKit/NSMenu.h
+	* Headers/AppKit/NSLayoutManager.h
+	* Headers/AppKit/NSInputServer.h
+	* Headers/AppKit/NSImageRep.h
+	* Headers/AppKit/NSMovieView.h
+	* Headers/AppKit/NSMovie.h
+	* Headers/AppKit/NSHelpManager.h
+	* Headers/AppKit/NSMenuItemCell.h
+	* Headers/AppKit/NSInterfaceStyle.h
+	* Headers/AppKit/NSMenuItem.h
+	* Headers/AppKit/NSInputManager.h
+	* Headers/AppKit/NSLevelIndicatorCell.h
+	* Headers/AppKit/NSMenuView.h
+	* Headers/AppKit/NSHelpPanel.h
+	* Headers/AppKit/NSImage.h
+	* Headers/AppKit/NSKeyValueBinding.h
+	* Source/NSPopUpButtonCell.m
+	* Source/GSWindowDecorationView.m
+	* Source/NSPopUpButton.m
+	* Source/NSHelpManager.m
+	* Source/NSToolbar.m
+	* Source/GSToolbarCustomizationPalette.m
+	* Source/GSTitleView.m
+	* Source/NSMenuView.m
+	* Source/NSCell.m: Some more #include -> #import replacement.
+
 2010-03-25 Fred Kiefer <FredKiefer@gmx.de>

 	* Source/GSNibLoading.m
--- a/Headers/AppKit/NSHelpManager.h
+++ b/Headers/AppKit/NSHelpManager.h
@ -31,12 +31,13 @@
 #define __GNUstep_H_NSHelpManager
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSBundle.h>
-#include <Foundation/NSGeometry.h>
-#include <Foundation/NSMapTable.h>
-#include <AppKit/NSApplication.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSGeometry.h>
+#import <AppKit/NSApplication.h>

@class NSAttributedString;
+@class NSString;
+@class NSMapTable;

@interface NSBundle (NSHelpManager)
 - (NSString *)pathForHelpResource:(NSString *)fileName;
--- a/Headers/AppKit/NSHelpPanel.h
+++ b/Headers/AppKit/NSHelpPanel.h
@ -31,10 +31,10 @@
 #define _GNUstep_H_NSHelpPanel
 #import <GNUstepBase/GSVersionMacros.h>

-#if	OS_API_VERSION(GS_API_OPENSTEP,GS_API_MACOSX) || GS_API_VERSION(GS_API_NONE, GS_API_LATEST)
+#if OS_API_VERSION(GS_API_OPENSTEP,GS_API_MACOSX) || GS_API_VERSION(GS_API_NONE, GS_API_LATEST)

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSPanel.h>
+#import <AppKit/NSApplication.h>
+#import <AppKit/NSPanel.h>

@class NSString;

@ -82,12 +82,6 @@
 //
 - (void) print: (id)sender;

-//
-// NSCoding protocol
-//
- (void) encodeWithCoder: (NSCoder *)aCoder;
- (id) initWithCoder: (NSCoder *)aDecoder;
-
@end

 #endif // !GS_API_MACOSX
--- a/Headers/AppKit/NSImage.h
+++ b/Headers/AppKit/NSImage.h
@ -31,9 +31,9 @@
 #define _GNUstep_H_NSImage
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSGraphicsContext.h>
-#include <Foundation/NSBundle.h>
-#include <AppKit/NSBitmapImageRep.h>
+#import <AppKit/NSGraphicsContext.h>
+#import <Foundation/NSBundle.h>
+#import <AppKit/NSBitmapImageRep.h>

@class NSString;
@class NSMutableArray;
--- a/Headers/AppKit/NSImageCell.h
+++ b/Headers/AppKit/NSImageCell.h
@ -31,7 +31,7 @@
 #define _GNUstep_H_NSImageCell
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSCell.h>
+#import <AppKit/NSCell.h>

 /**
 *  <p>Enumeration of the ways that you can display an image in an
--- a/Headers/AppKit/NSImageRep.h
+++ b/Headers/AppKit/NSImageRep.h
@ -31,8 +31,9 @@
 #define _GNUstep_H_NSImageRep
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSGeometry.h>
-#include <AppKit/AppKitDefines.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/AppKitDefines.h>

@class NSString;
@class NSArray;
--- a/Headers/AppKit/NSInputManager.h
+++ b/Headers/AppKit/NSInputManager.h
@ -29,12 +29,12 @@
 #define _GNUstep_H_NSInputManager
 #import <GNUstepBase/GSVersionMacros.h>

-#include <objc/Protocol.h>
-#include <objc/objc.h>
-#include <Foundation/NSGeometry.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSAttributedString.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>

+@class NSArray;
+@class NSAttributedString;
+@class NSMutableArray;
@class NSInputServer;
@class NSEvent;
@class NSImage;
--- a/Headers/AppKit/NSInputServer.h
+++ b/Headers/AppKit/NSInputServer.h
@ -29,9 +29,10 @@
 #define _GNUstep_H_NSInputServer
 #import <GNUstepBase/GSVersionMacros.h>

-#include <objc/Protocol.h>
-#include <Foundation/NSGeometry.h>
-#include <Foundation/NSString.h>
+#import <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+
+@class NSString;

@protocol NSInputServerMouseTracker
 - (BOOL) mouseDownOnCharacterIndex: (unsigned)index
--- a/Headers/AppKit/NSInterfaceStyle.h
+++ b/Headers/AppKit/NSInterfaceStyle.h
@ -31,7 +31,7 @@

 #if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)

-#include <AppKit/AppKitDefines.h>
+#import <AppKit/AppKitDefines.h>

@class NSResponder;
@class NSString;
--- a/Headers/AppKit/NSKeyValueBinding.h
+++ b/Headers/AppKit/NSKeyValueBinding.h
@ -30,8 +30,8 @@
 #define _GNUstep_H_NSKeyValueBinding

 #import <GNUstepBase/GSVersionMacros.h>
-#include <Foundation/NSObject.h>
-#include <AppKit/AppKitDefines.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/AppKitDefines.h>

 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)

--- a/Headers/AppKit/NSLayoutManager.h
+++ b/Headers/AppKit/NSLayoutManager.h
@ -29,8 +29,9 @@
 #define _GNUstep_H_NSLayoutManager
 #import <GNUstepBase/GSVersionMacros.h>

-#include <GNUstepGUI/GSLayoutManager.h>
-#include <AppKit/NSTextView.h>
+#import <Foundation/NSGeometry.h>
+#import <GNUstepGUI/GSLayoutManager.h>
+#import <AppKit/NSTextView.h>

@class NSParagraphStyle;

--- a/Headers/AppKit/NSLevelIndicator.h
+++ b/Headers/AppKit/NSLevelIndicator.h
@ -30,9 +30,9 @@
 #ifndef _GNUstep_H_NSLevelIndicator
 #define _GNUstep_H_NSLevelIndicator

-#include "AppKit/NSControl.h"
+#import "AppKit/NSControl.h"
 // For the tick mark 
-#include "AppKit/NSLevelIndicatorCell.h"
+#import "AppKit/NSLevelIndicatorCell.h"

 #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)

--- a/Headers/AppKit/NSLevelIndicatorCell.h
+++ b/Headers/AppKit/NSLevelIndicatorCell.h
@ -30,9 +30,9 @@
 #ifndef _GNUstep_H_NSLevelIndicatorCell
 #define _GNUstep_H_NSLevelIndicatorCell

-#include "AppKit/NSActionCell.h"
+#import "AppKit/NSActionCell.h"
 // For the tick mark 
-#include "AppKit/NSSliderCell.h"
+#import "AppKit/NSSliderCell.h"

 #if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)

--- a/Headers/AppKit/NSMatrix.h
+++ b/Headers/AppKit/NSMatrix.h
@ -31,7 +31,7 @@
 #define _GNUstep_H_NSMatrix
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSControl.h>
+#import <AppKit/NSControl.h>

@class NSArray;
@class NSMutableArray;
--- a/Headers/AppKit/NSMenu.h
+++ b/Headers/AppKit/NSMenu.h
@ -30,11 +30,11 @@
 #define _GNUstep_H_NSMenu
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSObject.h>
-#include <Foundation/NSGeometry.h>
+#import <Foundation/NSObject.h>
+#import <Foundation/NSGeometry.h>

-#include <AppKit/NSMenuItem.h>
-#include <AppKit/AppKitDefines.h>
+#import <AppKit/NSMenuItem.h>
+#import <AppKit/AppKitDefines.h>

@class NSString;
@class NSEvent;
--- a/Headers/AppKit/NSMenuItem.h
+++ b/Headers/AppKit/NSMenuItem.h
@ -34,8 +34,8 @@
 #define _GNUstep_H_NSMenuItem
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSObject.h>
-#include <AppKit/NSUserInterfaceValidation.h>
+#import <Foundation/NSObject.h>
+#import <AppKit/NSUserInterfaceValidation.h>

@class NSAttributedString;
@class NSString;
--- a/Headers/AppKit/NSMenuItemCell.h
+++ b/Headers/AppKit/NSMenuItemCell.h
@ -29,8 +29,8 @@
 #define _GNUstep_H_NSMenuItemCell
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSMenuItem.h>
+#import <AppKit/NSButtonCell.h>
+#import <AppKit/NSMenuItem.h>

@class NSMenuView;

--- a/Headers/AppKit/NSMenuView.h
+++ b/Headers/AppKit/NSMenuView.h
@ -29,23 +29,23 @@
 #define _GNUstep_H_NSMenuView
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSCoder.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSProcessInfo.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSNotification.h>
-
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenuItemCell.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
+#import <AppKit/NSMenu.h>
+#import <AppKit/NSMenuItem.h>
+//#import <AppKit/NSMenuItemCell.h>
+#import <AppKit/NSView.h>

+@class NSArray;
+@class NSMutableArray;
+@class NSNotification;
+@class NSString;
@class NSColor;
+@class NSMenuItemCell;
@class NSPopUpButton;
+@class NSEvent;
@class NSFont;
+@class NSScreen;
+@class NSWindow;
+

 /**
   The NSMenu class uses an object implementing the NSMenuView protocol to
--- a/Headers/AppKit/NSMovie.h
+++ b/Headers/AppKit/NSMovie.h
@ -30,7 +30,7 @@
 #define _GNUstep_H_NSMovie
 #import <GNUstepBase/GSVersionMacros.h>

-#include <Foundation/NSObject.h>
+#import <Foundation/NSObject.h>

@class NSArray;
@class NSData;
--- a/Headers/AppKit/NSMovieView.h
+++ b/Headers/AppKit/NSMovieView.h
@ -30,7 +30,7 @@
 #define _GNUstep_H_NSMovieView
 #import <GNUstepBase/GSVersionMacros.h>

-#include <AppKit/NSView.h>
+#import <AppKit/NSView.h>

@class NSMovie;

--- a/Source/GSTitleView.m
+++ b/Source/GSTitleView.m
@ -24,22 +24,25 @@
   Boston, MA 02110-1301, USA.
 */

-#include <Foundation/NSDebug.h>
-#include <Foundation/NSRunLoop.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSRunLoop.h>

-#include <AppKit/NSApplication.h>
-#include "AppKit/NSAttributedString.h"
-#include <AppKit/NSButton.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuView.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSColor.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSMenuView.h"
+#import "AppKit/NSPanel.h"
+#import "AppKit/NSView.h"
+#import "AppKit/NSWindow.h"

-#include <GNUstepGUI/GSTitleView.h>
-#include "GNUstepGUI/GSTheme.h"
+#import "GNUstepGUI/GSTitleView.h"
+#import "GNUstepGUI/GSTheme.h"

@implementation GSTitleView

--- a/Source/GSToolbarCustomizationPalette.m
+++ b/Source/GSToolbarCustomizationPalette.m
@ -26,17 +26,18 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSArray.h>
-#include <Foundation/NSDebug.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSEnumerator.h>
-#include "AppKit/NSNibLoading.h"
-#include "AppKit/NSWindow.h"
-#include "AppKit/NSToolbar.h"
-#include "AppKit/NSToolbarItem.h"
-#include "AppKit/NSPopUpButton.h"
-#include "NSToolbarFrameworkPrivate.h"
-#include "GSToolbarCustomizationPalette.h"
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSNotification.h>
+#import "AppKit/NSNibLoading.h"
+#import "AppKit/NSWindow.h"
+#import "AppKit/NSToolbar.h"
+#import "AppKit/NSToolbarItem.h"
+#import "AppKit/NSPopUpButton.h"
+#import "NSToolbarFrameworkPrivate.h"
+#import "GSToolbarCustomizationPalette.h"

 #define DEBUG_LEVEL @"Toolbar"

--- a/Source/GSWindowDecorationView.m
+++ b/Source/GSWindowDecorationView.m
@ -24,18 +24,18 @@
   Boston, MA 02110-1301, USA.
 */

-#include <GNUstepGUI/GSWindowDecorationView.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>

-#include <Foundation/NSEnumerator.h>
-#include <Foundation/NSException.h>
+#import <GNUstepGUI/GSWindowDecorationView.h>
+#import "AppKit/NSColor.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSMenuView.h"
+#import "AppKit/NSWindow.h"
+#import "GNUstepGUI/GSDisplayServer.h"
+#import "GNUstepGUI/GSTheme.h"

-#include "AppKit/NSColor.h"
-#include "AppKit/NSMenuView.h"
-#include "AppKit/NSWindow.h"
-#include "GNUstepGUI/GSDisplayServer.h"
-#include "GNUstepGUI/GSTheme.h"
-
-#include "NSToolbarFrameworkPrivate.h"
+#import "NSToolbarFrameworkPrivate.h"

@implementation GSWindowDecorationView

--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@ -1432,7 +1432,7 @@ static NSColor *dtxtCol;
 {
  SEL action = [self action];

-  if ([sender respondsTo: @selector(sendAction:to:)])
+  if ([sender respondsToSelector: @selector(sendAction:to:)])
    {
      return [sender sendAction: action to: [self target]];
    }
--- a/Source/NSHelpManager.m
+++ b/Source/NSHelpManager.m
@ -27,28 +27,29 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSData.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSBundle.h>
-#include <Foundation/NSArchiver.h>
-#include "AppKit/NSAttributedString.h"
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSWorkspace.h"
-#include "AppKit/NSFileWrapper.h"
-#include "AppKit/NSHelpManager.h"
-#include "AppKit/NSHelpPanel.h"
-#include "AppKit/NSHelpPanel.h"
-#include "AppKit/NSCursor.h"
-#include "AppKit/NSImage.h"
-#include "AppKit/NSGraphics.h"
-#include "AppKit/NSScrollView.h"
-#include "AppKit/NSTextView.h"
-#include "AppKit/NSTextStorage.h"
+#import <Foundation/NSArchiver.h>
+#import <Foundation/NSBundle.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSFileManager.h>
+#import <Foundation/NSMapTable.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
+#import "AppKit/NSAttributedString.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSWorkspace.h"
+#import "AppKit/NSFileWrapper.h"
+#import "AppKit/NSHelpManager.h"
+#import "AppKit/NSHelpPanel.h"
+#import "AppKit/NSHelpPanel.h"
+#import "AppKit/NSCursor.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSScrollView.h"
+#import "AppKit/NSTextView.h"
+#import "AppKit/NSTextStorage.h"

-#include "GNUstepGUI/GSHelpManagerPanel.h"
+#import "GNUstepGUI/GSHelpManagerPanel.h"

@implementation NSBundle (NSHelpManager)

--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@ -28,24 +28,32 @@
   Boston, MA 02110-1301, USA.
 */

-#include <Foundation/NSRunLoop.h>
-#include <Foundation/NSDebug.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSCoder.h>
+#import <Foundation/NSDate.h>
+#import <Foundation/NSDebug.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSNotification.h>
+//#import <Foundation/NSProcessInfo.h>
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSValue.h>

-#include "AppKit/NSApplication.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSFont.h"
-#include "AppKit/NSMenuView.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSButton.h"
-#include "AppKit/NSPopUpButtonCell.h"
-#include "AppKit/NSWindow.h"
-#include "AppKit/PSOperators.h"
-#include "AppKit/NSImage.h"
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSFont.h"
+#import "AppKit/NSImage.h"
+#import "AppKit/NSMenuView.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSButton.h"
+#import "AppKit/NSPopUpButtonCell.h"
+#import "AppKit/NSScreen.h"
+#import "AppKit/NSWindow.h"
+#import "AppKit/PSOperators.h"

-#include "GNUstepGUI/GSTheme.h"
-#include "GNUstepGUI/GSTitleView.h"
+#import "GNUstepGUI/GSTheme.h"
+#import "GNUstepGUI/GSTitleView.h"

-#include <Foundation/Foundation.h>

 typedef struct _GSCellRect {
  NSRect rect;
@ -60,7 +68,7 @@ typedef struct _GSCellRect {
 #ifdef GSIArray
 #undef GSIArray
 #endif
-#include <GNUstepBase/GSIArray.h>
+#import <GNUstepBase/GSIArray.h>

 static NSMapTable *viewInfo = 0;

--- a/Source/NSPopUpButton.m
+++ b/Source/NSPopUpButton.m
@ -33,12 +33,14 @@
 #import <Foundation/NSValue.h>
 #import "AppKit/NSApplication.h"
 #import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
 #import "AppKit/NSKeyValueBinding.h"
 #import "AppKit/NSPopUpButton.h"
 #import "AppKit/NSPopUpButtonCell.h"
 #import "AppKit/NSMenu.h"
 #import "AppKit/NSMenuItem.h"
 #import "AppKit/NSMenuView.h"
+#import "AppKit/NSWindow.h"

 /*
 * class variables
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@ -27,6 +27,7 @@
 */

 #import "config.h"
+#import <Foundation/NSNotification.h>
 #import <Foundation/NSValue.h>
 #import "AppKit/NSApplication.h"
 #import "AppKit/NSEvent.h"
--- a/Source/NSToolbar.m
+++ b/Source/NSToolbar.m
@ -29,31 +29,32 @@
   Boston, MA 02110-1301, USA.
 */ 

-#include <Foundation/NSObject.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSEnumerator.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSKeyValueCoding.h>
-#include <Foundation/NSNotification.h>
-#include <Foundation/NSNull.h>
-#include <Foundation/NSRunLoop.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSTimer.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSDecimalNumber.h>
-#include "AppKit/NSApplication.h"
-#include "AppKit/NSEvent.h"
-#include "AppKit/NSMenu.h"
-#include "AppKit/NSNibLoading.h"
-#include "AppKit/NSToolbar.h"
-#include "AppKit/NSToolbarItem.h"
-#include "AppKit/NSView.h"
-#include "AppKit/NSWindow.h"
-#include "GNUstepGUI/GSToolbarView.h"
+#import <Foundation/NSObject.h>
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSEnumerator.h>
+#import <Foundation/NSException.h>
+#import <Foundation/NSKeyValueCoding.h>
+#import <Foundation/NSNotification.h>
+#import <Foundation/NSNull.h>
+#import <Foundation/NSRunLoop.h>
+#import <Foundation/NSString.h>
+#import <Foundation/NSTimer.h>
+#import <Foundation/NSUserDefaults.h>
+#import <Foundation/NSDecimalNumber.h>
+#import "AppKit/NSApplication.h"
+#import "AppKit/NSEvent.h"
+#import "AppKit/NSGraphics.h"
+#import "AppKit/NSMenu.h"
+#import "AppKit/NSNibLoading.h"
+#import "AppKit/NSToolbar.h"
+#import "AppKit/NSToolbarItem.h"
+#import "AppKit/NSView.h"
+#import "AppKit/NSWindow.h"
+#import "GNUstepGUI/GSToolbarView.h"

-#include "NSToolbarFrameworkPrivate.h"
-#include "GSToolbarCustomizationPalette.h"
+#import "NSToolbarFrameworkPrivate.h"
+#import "GSToolbarCustomizationPalette.h"

 // internal
 static NSNotificationCenter *nc = nil;