Include <> -> ""

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16917 72102866-910b-0410-8b05-ffd578937521
2025-04-22 17:52:42 +00:00 · 2003-06-13 15:01:12 +00:00 · 2003-06-13 15:01:12 +00:00 · 6be9174933
commit 6be9174933
parent 0c5ea479e7
138 changed files with 1006 additions and 936 deletions
--- a/67
+++ b/67
@ -1,3 +1,70 @@
+ 2003-06-08  David Ayers  <d.ayers@inode.at>
+ 	
+	* Headers/gnustep/gui/IMConnectors.h: Change syntax of include <>
+ 	to "" for local headers.  Change base/ to gnustep/base/ in
+ 	includes.  Change AppKit/GSFiles.h to gnustep
+ 	gnustep/gui/GSFiles.h includes.
+ 	* Source/Functions.m, Source/GSDisplayServer.m, Source/GSFontInfo.m,
+ 	Source/GSFusedSilica.m, Source/GSFusedSilicaContext.m,
+ 	Source/GSHbox.m, Source/GSHelpManagerPanel.m,
+ 	Source/GSInfoPanel.m, Source/GSKeyBindingAction.m,
+ 	Source/GSKeyBindingTable.m, Source/GSLayoutManager.m,
+ 	Source/GSMemoryPanel.m, Source/GSServicesManager.m,
+ 	Source/GSSimpleLayoutManager.m, Source/GSSlideView.h
+ 	Source/GSSlideView.m, Source/GSTable.m, Source/GSTextStorage.h
+ 	Source/GSTextStorage.m, Source/GSTrackingRect.m,
+ 	Source/GSTypesetter.m, Source/GSVbox.m, Source/NSActionCell.m,
+ 	Source/NSAffineTransform.m, Source/NSApplication.m,
+ 	Source/NSAttributedString.m, Source/NSBezierPath.m,
+ 	Source/NSBitmapImageRep.m, Source/NSBox.m, Source/NSBrowser.m,
+ 	Source/NSBrowserCell.m, Source/NSBundleAdditions.m,
+ 	Source/NSButton.m, Source/NSButtonCell.m,
+ 	Source/NSCachedImageRep.m, Source/NSCell.m, Source/NSClipView.m,
+ 	Source/NSColor.m, Source/NSColorList.m, Source/NSColorPanel.m,
+ 	Source/NSColorPicker.m, Source/NSColorWell.m,
+ 	Source/NSComboBox.m, Source/NSComboBoxCell.m, Source/NSControl.m,
+ 	Source/NSCursor.m, Source/NSCustomImageRep.m,
+ 	Source/NSDataLink.m, Source/NSDataLinkManager.m,
+ 	Source/NSDataLinkPanel.m, Source/NSDocument.m,
+ 	Source/NSDocumentController.m, Source/NSDrawer.m,
+ 	Source/NSEPSImageRep.m, Source/NSEvent.m, Source/NSFileWrapper.m,
+ 	Source/NSFont.m, Source/NSFontManager.m, Source/NSFontPanel.m,
+ 	Source/NSForm.m, Source/NSFormCell.m, Source/NSGraphicsContext.m,
+ 	Source/NSHelpManager.m, Source/NSHelpPanel.m, Source/NSImage.m,
+ 	Source/NSImageCell.m, Source/NSImageRep.m, Source/NSImageView.m,
+ 	Source/NSInputManager.m, Source/NSInputServer.m,
+ 	Source/NSInterfaceStyle.m, Source/NSLayoutManager.m,
+ 	Source/NSMatrix.m, Source/NSMenu.m, Source/NSMenuItem.m,
+ 	Source/NSMenuItemCell.m, Source/NSMenuView.m,
+ 	Source/NSOpenGLContext.m, Source/NSOpenGLPixelFormat.m,
+ 	Source/NSOpenGLView.m, Source/NSOpenPanel.m,
+ 	Source/NSOutlineView.m, Source/NSPageLayout.m, Source/NSPanel.m,
+ 	Source/NSParagraphStyle.m, Source/NSPasteboard.m,
+ 	Source/NSPopUpButton.m, Source/NSPopUpButtonCell.m,
+ 	Source/NSPrintInfo.m, Source/NSPrintOperation.m,
+ 	Source/NSPrintPanel.m, Source/NSPrinter.m,
+ 	Source/NSProgressIndicator.m, Source/NSResponder.m,
+ 	Source/NSRulerMarker.m, Source/NSRulerView.m,
+ 	Source/NSSavePanel.m, Source/NSScreen.m, Source/NSScrollView.m,
+ 	Source/NSScroller.m, Source/NSSecureTextField.m,
+ 	Source/NSSelection.m, Source/NSSlider.m, Source/NSSliderCell.m,
+ 	Source/NSSound.m, Source/NSSpellChecker.m,
+ 	Source/NSSpellServer.m, Source/NSSplitView.m, Source/NSStepper.m,
+ 	Source/NSStepperCell.m, Source/NSStringDrawing.m,
+ 	Source/NSTabView.m, Source/NSTabViewItem.m,
+ 	Source/NSStepperCell.m, Source/NSStringDrawing.m,
+ 	Source/NSTabView.m, Source/NSTabViewItem.m,
+ 	Source/NSTableColumn.m, Source/NSTableHeaderCell.m,
+ 	Source/NSTableHeaderView.m, Source/NSTableView.m,
+ 	Source/NSText.m, Source/NSTextAttachment.m,
+ 	Source/NSTextContainer.m, Source/NSTextField.m,
+ 	Source/NSTextFieldCell.m, Source/NSTextStorage.m,
+ 	Source/NSTextView.m, Source/NSTextView_actions.m,
+ 	Source/NSToolbar.m, Source/NSToolbarItem.m, Source/NSView.m,
+ 	Source/NSWindow.m, Source/NSWindowController.m,
+ 	Source/NSWorkspace.m, Source/externs.m, Source/linking.m,
+ 	Source/tiff.m: Ditto.
+ 
 2003-06-08  Kazunobu Kuriyama  <kazunobu.kuriyama@nifty.com>

        * configure.ac: Add --with-audiofile-include and --with-audiofile
--- a/Documentation/Gui/DefaultsSummary.gsdoc
+++ b/Documentation/Gui/DefaultsSummary.gsdoc
@ -265,10 +265,11 @@
 	  <term>GSAppOwnsMiniwindow</term>
 	  <desc>
          <p>
-          A boolean value which defaults to <code>YES</code>. Some window
-          managers control the miniaturized versions of windows themselves.
-          Set this default to <code>NO</code> to let the window manager
-          have it's way, otherwise, GNUstep will create a miniwindow.
+	  GSAppOwnsMiniwindow is for miniwindows (not app icons). If
+	  it's YES or absent, GNUstep handles miniaturization itself
+	  and doesn't let the window manager do it. If it's NO, the
+	  window manager is allowed to do its own iconification. This
+	  does not affect app icons at all.
          </p>
 	  </desc>
 	  <term>GSFontAntiAlias</term>
@ -288,7 +289,7 @@
          X-Server. A value of <code>"*-iso8859-1"</code> would only
          include fonts available with ISO Western encoding. This
          feature might be helpfull if the font_cacher program is having
-          problem with the X-Server.
+          problem with the X-Server (Xlib backend only).
          </p>
 	  </desc>
 	  <term>GraphicCompositing</term>
@ -298,7 +299,8 @@
          <code>YES</code>, then the application uses various tricks
          to get alpha colors to work when compositing images. This
          may slow down drawing of images, but it is generally
-          recommended anyway, particularly on fast systems.
+          recommended anyway, particularly on fast systems
+	  (Xlib backend only).
          </p>
 	  </desc>
 	  <term>Keyboard Modifiers</term>
@ -336,10 +338,12 @@
 	  <term>UseWindowMakerIcons</term>
 	  <desc>
          <p>
-          A boolean value which defaults to <code>YES</code>. If set to
-          <code>YES</code> then icon windows are controlled by the
-          window manager, otherwise they are controlled by the GNUstep
-          application.
+	  UseWindowMakerIcons is for app icons, and has no effect when
+	  the window manager isn't Window Maker. It displays the
+	  application's icon window in the window Window Maker
+	  provides instead of creating one controlled by the app. This
+	  allows the icon to be docked.  It is a boolean value which
+	  defaults to <code>YES</code>.
          </p>
 	  </desc>
 	  <term>XGPS-Shm</term>
--- a/Documentation/gsdoc/.cvsignore
+++ b/Documentation/gsdoc/.cvsignore
@ -1 +0,0 @@
-
--- a/Source/Functions.m
+++ b/Source/Functions.m
@ -30,14 +30,14 @@
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSProcessInfo.h>

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/DPSOperators.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/DPSOperators.h"

 char **NSArgv = NULL;

--- a/Source/GSDisplayServer.m
+++ b/Source/GSDisplayServer.m
@ -31,10 +31,10 @@
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSThread.h>

-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/GSDisplayServer.h>
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSWindow.h"
+#include "gnustep/gui/GSDisplayServer.h"

 #include "GSSlideView.h"

--- a/Source/GSFontInfo.m
+++ b/Source/GSFontInfo.m
@ -27,7 +27,7 @@

 #include <math.h>

-#include <AppKit/GSFontInfo.h>
+#include "gnustep/gui/GSFontInfo.h"
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSArray.h>
--- a/Source/GSFusedSilica.m
+++ b/Source/GSFusedSilica.m
@ -24,8 +24,8 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
   */

-#include <gnustep/gui/GSFusedSilicaContext.h>
-#include <AppKit/NSAffineTransform.h>
+#include "gnustep/gui/GSFusedSilicaContext.h"
+#include "AppKit/NSAffineTransform.h"
 #include <Foundation/NSDictionary.h>

 /* Managing Graphics Contexts */
--- a/Source/GSFusedSilicaContext.m
+++ b/Source/GSFusedSilicaContext.m
@ -24,9 +24,9 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
   */

-#include <gnustep/gui/GSFusedSilicaContext.h>
-#include <gnustep/gui/GSFontInfo.h>
-#include <AppKit/NSGraphics.h>
+#include "gnustep/gui/GSFusedSilicaContext.h"
+#include "gnustep/gui/GSFontInfo.h"
+#include "AppKit/NSGraphics.h"
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSValue.h>
--- a/Source/GSHbox.m
+++ b/Source/GSHbox.m
@ -25,9 +25,9 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/GSHbox.h>
+#include "gnustep/gui/GSHbox.h"
 // For the separator
-#include <AppKit/NSBox.h>
+#include "AppKit/NSBox.h"

@implementation GSHbox: GSTable
 //
--- a/Source/GSHelpManagerPanel.m
+++ b/Source/GSHelpManagerPanel.m
@ -25,14 +25,14 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSAttributedString.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSScrollView.h>
-#include <AppKit/NSClipView.h>
-#include <AppKit/NSColor.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSAttributedString.h"
+#include "AppKit/NSTextView.h"
+#include "AppKit/NSScrollView.h"
+#include "AppKit/NSClipView.h"
+#include "AppKit/NSColor.h"

-#include <AppKit/GSHelpManagerPanel.h>
+#include "gnustep/gui/GSHelpManagerPanel.h"

@implementation GSHelpManagerPanel

--- a/Source/GSHorizontalTypesetter.m
+++ b/Source/GSHorizontalTypesetter.m
@ -24,7 +24,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include "AppKit/GSHorizontalTypesetter.h"
+#include "gnustep/gui/GSHorizontalTypesetter.h"

 #include <math.h>

@ -38,7 +38,7 @@
 #include "AppKit/NSTextAttachment.h"
 #include "AppKit/NSTextContainer.h"
 #include "AppKit/NSTextStorage.h"
-#include "AppKit/GSLayoutManager.h"
+#include "gnustep/gui/GSLayoutManager.h"



--- a/Source/GSInfoPanel.m
+++ b/Source/GSInfoPanel.m
@ -25,12 +25,12 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSTextField.h>
-#include <AppKit/GSInfoPanel.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSTextField.h"
+#include "gnustep/gui/GSInfoPanel.h"
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSString.h>
--- a/Source/GSKeyBindingAction.m
+++ b/Source/GSKeyBindingAction.m
@ -24,7 +24,7 @@
 */ 

 #include "GSKeyBindingAction.h"
-#include <AppKit/NSInputManager.h>
+#include "AppKit/NSInputManager.h"

@implementation GSKeyBindingAction
 - (void) performActionWithInputManager: (NSInputManager *)manager
--- a/Source/GSKeyBindingTable.m
+++ b/Source/GSKeyBindingTable.m
@ -25,8 +25,8 @@

 #include "GSKeyBindingAction.h"
 #include "GSKeyBindingTable.h"
-#include <AppKit/NSInputManager.h>
-#include <AppKit/NSEvent.h>
+#include "AppKit/NSInputManager.h"
+#include "AppKit/NSEvent.h"

@implementation GSKeyBindingTable : NSObject

--- a/Source/GSLayoutManager.m
+++ b/Source/GSLayoutManager.m
@ -24,19 +24,19 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/GSLayoutManager_internal.h>
-
 #include <Foundation/NSCharacterSet.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSValue.h>

-#include <AppKit/GSTypesetter.h>
-#include <AppKit/NSTextStorage.h>
-#include <AppKit/NSTextContainer.h>
+#include "AppKit/NSTextStorage.h"
+#include "AppKit/NSTextContainer.h"

 /* just for NSAttachmentCharacter */
-#include <AppKit/NSTextAttachment.h>
+#include "AppKit/NSTextAttachment.h"
+
+#include "gnustep/gui/GSTypesetter.h"
+#include "gnustep/gui/GSLayoutManager_internal.h"



--- a/Source/GSMemoryPanel.m
+++ b/Source/GSMemoryPanel.m
@ -25,9 +25,9 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/GSMemoryPanel.h>
-#include <AppKit/GSHbox.h>
-#include <AppKit/GSVbox.h>
+#include "gnustep/gui/GSMemoryPanel.h"
+#include "gnustep/gui/GSHbox.h"
+#include "gnustep/gui/GSVbox.h"

 enum {
  OrderByClassName,
--- a/Source/GSServicesManager.m
+++ b/Source/GSServicesManager.m
@ -24,7 +24,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

 #include <Foundation/NSArray.h>
 #include <Foundation/NSSet.h>
@ -48,15 +48,15 @@
 #include <Foundation/NSObjCRuntime.h>
 #include <Foundation/NSInvocation.h>

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSWorkspace.h>
-#include <AppKit/NSDocumentController.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/NSDocumentController.h"

-#include <AppKit/GSServicesManager.h>
+#include "gnustep/gui/GSServicesManager.h"

 static GSServicesManager	*manager = nil;

--- a/Source/GSSimpleLayoutManager.m
+++ b/Source/GSSimpleLayoutManager.m
@ -43,16 +43,16 @@
 #include <Foundation/NSScanner.h>
 #include <Foundation/NSCharacterSet.h>

-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSText.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSTextStorage.h>
-#include <AppKit/NSTextContainer.h>
-#include <AppKit/NSStringDrawing.h>
-#include <AppKit/NSParagraphStyle.h>
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSText.h"
+#include "AppKit/NSTextView.h"
+#include "AppKit/NSTextStorage.h"
+#include "AppKit/NSTextContainer.h"
+#include "AppKit/NSStringDrawing.h"
+#include "AppKit/NSParagraphStyle.h"

-#include "GSSimpleLayoutManager.h"
+#include "gnustep/gui/GSSimpleLayoutManager.h"

 #define HUGE 1e7

--- a/Source/GSSlideView.h
+++ b/Source/GSSlideView.h
@ -26,7 +26,7 @@
   */

 #include <Foundation/NSGeometry.h>
-#include <AppKit/NSView.h>
+#include "AppKit/NSView.h"

@class NSCell;

--- a/Source/GSSlideView.m
+++ b/Source/GSSlideView.m
@ -26,14 +26,14 @@
 */

 #include <Foundation/NSDebug.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSCell.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSWindow.h"

-#include "AppKit/GSDisplayServer.h"
+#include "gnustep/gui/GSDisplayServer.h"
 #include "GSSlideView.h"
 #include <math.h>

--- a/Source/GSTable.m
+++ b/Source/GSTable.m
@ -25,7 +25,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/GSTable.h>
+#include "gnustep/gui/GSTable.h"

@interface GSTable (Private)
 -(void) _updateForNewFrameSize: (NSSize)newFrameSize;
--- a/Source/GSTextStorage.h
+++ b/Source/GSTextStorage.h
@ -25,7 +25,7 @@
   License along with this library; if not, write to the Free
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
-#include <AppKit/NSTextStorage.h>
+#include "AppKit/NSTextStorage.h"

@class NSMutableString;
@class NSMutableArray;
--- a/Source/GSTextStorage.m
+++ b/Source/GSTextStorage.m
@ -48,7 +48,7 @@
 #include <Foundation/NSLock.h>
 #include <Foundation/NSThread.h>
 #include <Foundation/NSNotification.h>
-#include <AppKit/NSTextStorage.h>
+#include "AppKit/NSTextStorage.h"
 #include "GSTextStorage.h"

 #define		SANITY_CHECKS	0
@ -62,7 +62,7 @@
 #define GSI_MAP_VTYPES	GSUNION_INT
 #define	GSI_MAP_NOCLEAN	1

-#include <base/GSIMap.h>
+#include <gnustep/base/GSIMap.h>

 static NSDictionary	*blank;
 static NSLock		*attrLock = nil;
--- a/Source/GSTrackingRect.m
+++ b/Source/GSTrackingRect.m
@ -26,8 +26,8 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <gnustep/gui/GSTrackingRect.h>
+#include "gnustep/gui/config.h"
+#include "gnustep/gui/GSTrackingRect.h"

@implementation GSTrackingRect

--- a/Source/GSTypesetter.m
+++ b/Source/GSTypesetter.m
@ -24,13 +24,13 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include "AppKit/GSTypesetter.h"
+#include "gnustep/gui/GSTypesetter.h"

-#include "AppKit/GSLayoutManager.h"
-#include "AppKit/GSHorizontalTypesetter.h"
+#include "gnustep/gui/GSLayoutManager.h"
+#include "gnustep/gui/GSHorizontalTypesetter.h"

 #include <Foundation/NSDictionary.h>
-#include <AppKit/NSAttributedString.h>
+#include "AppKit/NSAttributedString.h"


@implementation GSTypesetter
--- a/Source/GSVbox.m
+++ b/Source/GSVbox.m
@ -28,8 +28,8 @@

 // See GSHbox.m for comments
 // This file is derived from GSVbox.m
-#include <AppKit/GSVbox.h>
-#include <AppKit/NSBox.h>
+#include "gnustep/gui/GSVbox.h"
+#include "AppKit/NSBox.h"

@implementation GSVbox: GSTable
 //
--- a/Source/NSActionCell.m
+++ b/Source/NSActionCell.m
@ -25,10 +25,10 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSCoder.h>
-#include <AppKit/NSActionCell.h>
-#include <AppKit/NSControl.h>
+#include "AppKit/NSActionCell.h"
+#include "AppKit/NSControl.h"

@implementation NSActionCell

--- a/Source/NSAffineTransform.m
+++ b/Source/NSAffineTransform.m
@ -24,17 +24,16 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <math.h>

 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>

-#include <AppKit/config.h>
-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSBezierPath.h>
-#include <AppKit/PSOperators.h>
+#include "AppKit/NSAffineTransform.h"
+#include "AppKit/NSBezierPath.h"
+#include "AppKit/PSOperators.h"

 /* Private definitions */
 #define A matrix.m11
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@ -29,7 +29,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <stdio.h>

 #include <Foundation/NSArray.h>
@ -50,27 +50,27 @@
 # include <Foundation/NSConnection.h>
 #endif

-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/GSDisplayServer.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSDocumentController.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSFontManager.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenuItemCell.h>
-#include <AppKit/NSMenuView.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSWorkspace.h>
-#include <AppKit/GSServicesManager.h>
-#include <AppKit/NSNibLoading.h>
-#include <AppKit/NSPageLayout.h>
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSDocumentController.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSFontManager.h"
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuItem.h"
+#include "AppKit/NSMenuItemCell.h"
+#include "AppKit/NSMenuView.h"
+#include "AppKit/NSCursor.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/NSNibLoading.h"
+#include "AppKit/NSPageLayout.h"

-#include <AppKit/GSGuiPrivate.h>
-#include <AppKit/GSInfoPanel.h>
+#include "gnustep/gui/GSDisplayServer.h"
+#include "gnustep/gui/GSServicesManager.h"
+#include "gnustep/gui/GSGuiPrivate.h"
+#include "gnustep/gui/GSInfoPanel.h"

 /* The -gui thread. See the comment in initialize_gnustep_backend. */
 NSThread *GSAppKitThread;
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@ -32,18 +32,18 @@
 #include <Foundation/NSRange.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSFileManager.h>
-#include <AppKit/NSAttributedString.h>
-#include <AppKit/NSDocumentController.h>
-#include <AppKit/NSParagraphStyle.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSTextAttachment.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSFileWrapper.h>
-#include <AppKit/NSFont.h>
+#include "AppKit/NSAttributedString.h"
+#include "AppKit/NSDocumentController.h"
+#include "AppKit/NSParagraphStyle.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSTextAttachment.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSFileWrapper.h"
+#include "AppKit/NSFont.h"
 // For the colour name spaces
-#include <AppKit/NSGraphics.h>
+#include "AppKit/NSGraphics.h"

-#include <AppKit/GSTextConverter.h>
+#include "gnustep/gui/GSTextConverter.h"

 /* Cache class pointers to avoid the expensive lookup by string. */ 
 static Class dictionaryClass = nil;
--- a/Source/NSBezierPath.m
+++ b/Source/NSBezierPath.m
@ -27,13 +27,13 @@
   59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA.
 */

-#include <AppKit/NSBezierPath.h>
+#include "AppKit/NSBezierPath.h"

-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/PSOperators.h>
-#include <AppKit/GSFontInfo.h>
+#include "AppKit/NSAffineTransform.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/PSOperators.h"
+#include "AppKit/GSFontInfo.h"

 #include <math.h>

@ -1434,7 +1434,7 @@ typedef struct _PathElement
 #ifdef GSIArray
 #undef GSIArray
 #endif
-#include <base/GSIArray.h>
+#include <gnustep/base/GSIArray.h>

@interface GSBezierPath : NSBezierPath
 {
--- a/Source/NSBitmapImageRep.m
+++ b/Source/NSBitmapImageRep.m
@ -25,7 +25,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <stdlib.h>
 #include <math.h>
 #include <tiff.h>
@ -34,14 +34,13 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSBitmapImageRep.h>
-#include <AppKit/AppKitExceptions.h>
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSBitmapImageRep.h"
+#include "AppKit/AppKitExceptions.h"

-#include <gnustep/gui/config.h>
-#include <gnustep/gui/nsimage-tiff.h>
+#include "gnustep/gui/nsimage-tiff.h"

 /* Maximum number of planes */
 #define MAX_PLANES 5
--- a/Source/NSBox.m
+++ b/Source/NSBox.m
@ -25,16 +25,16 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSString.h>

-#include <AppKit/NSBox.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSTextFieldCell.h>
+#include "AppKit/NSBox.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSTextFieldCell.h"

 #include <math.h>

--- a/Source/NSBrowser.m
+++ b/Source/NSBrowser.m
@ -34,24 +34,24 @@
 */

 #include <math.h>                  // (float)rintf(float x)
-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
-#include <AppKit/NSBrowser.h>
-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSScroller.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSScrollView.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSTableHeaderCell.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSBezierPath.h>
+#include "AppKit/NSBrowser.h"
+#include "AppKit/NSBrowserCell.h"
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSScroller.h"
+#include "AppKit/NSCell.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSScrollView.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSTableHeaderCell.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSBezierPath.h"

 DEFINE_RINT_IF_MISSING

--- a/Source/NSBrowserCell.m
+++ b/Source/NSBrowserCell.m
@ -27,17 +27,17 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

 #include <Foundation/NSUserDefaults.h>

-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/NSBrowserCell.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSWindow.h"

 /*
 * Class variables
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@ -27,7 +27,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSClassDescription.h>
 #include <Foundation/NSArchiver.h>
 #include <Foundation/NSArray.h>
@ -45,24 +45,24 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSKeyValueCoding.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSControl.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSSound.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSNibConnector.h>
-#include <AppKit/NSNibLoading.h>
-#include <AppKit/GSNibTemplates.h>
-#include <AppKit/IMLoading.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSControl.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSSound.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSTextView.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSNibConnector.h"
+#include "AppKit/NSNibLoading.h"
+#include "gnustep/gui/GSNibTemplates.h"
+#include "AppKit/IMLoading.h"

 //
 // For the template classes since they need to know about any and all subclasses
 // of the parent classes covered by them.
 //
-#include <AppKit/AppKit.h>
+#include "AppKit/AppKit.h"

 static const int currentVersion = 1;

--- a/Source/NSButton.m
+++ b/Source/NSButton.m
@ -26,12 +26,12 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

-#include <AppKit/NSButton.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSApplication.h>
+#include "AppKit/NSButton.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSButtonCell.h"
+#include "AppKit/NSApplication.h"

 //
 // class variables
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@ -30,25 +30,25 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSLock.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSDebug.h>
-#include "gnustep/base/GSCategories.h"
+#include <gnustep/base/GSCategories.h>

-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSSound.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSButtonCell.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSSound.h"
+#include "AppKit/NSWindow.h"

@implementation NSButtonCell

--- a/Source/NSCachedImageRep.m
+++ b/Source/NSCachedImageRep.m
@ -30,15 +30,15 @@
    using the rect information.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSUserDefaults.h>

-#include <AppKit/NSCachedImageRep.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/PSOperators.h>
+#include "AppKit/NSCachedImageRep.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/PSOperators.h"

@interface GSCacheW : NSWindow
@end
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@ -31,7 +31,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSGeometry.h>
 #include <Foundation/NSException.h>
@ -40,26 +40,26 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSFormatter.h>
 #include <Foundation/NSRunLoop.h>
-#include "gnustep/base/GSCategories.h"
+#include <gnustep/base/GSCategories.h>

-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSAttributedString.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSControl.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSClipView.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSParagraphStyle.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSTextContainer.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSAttributedString.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSControl.h"
+#include "AppKit/NSCell.h"
+#include "AppKit/NSClipView.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSCursor.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSParagraphStyle.h"
+#include "AppKit/NSTextView.h"
+#include "AppKit/NSTextContainer.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSWindow.h"

 static Class	colorClass;
 static Class	cellClass;
--- a/Source/NSClipView.m
+++ b/Source/NSClipView.m
@ -24,15 +24,15 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSNotification.h>

-#include <AppKit/NSClipView.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/PSOperators.h>
+#include "AppKit/NSClipView.h"
+#include "AppKit/NSCursor.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/PSOperators.h"

 #include <math.h>

--- a/Source/NSColor.m
+++ b/Source/NSColor.m
@ -27,7 +27,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSArchiver.h>
 #include <Foundation/NSDictionary.h>
@ -37,13 +37,13 @@
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDebug.h>

-#include <AppKit/NSColor.h>
-#include <AppKit/NSColorList.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/PSOperators.h>
+#include "AppKit/NSColor.h"
+#include "AppKit/NSColorList.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/PSOperators.h"

 static Class	NSColorClass;

--- a/Source/NSColorList.m
+++ b/Source/NSColorList.m
@ -27,7 +27,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSDictionary.h>
@ -37,9 +37,9 @@
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSString.h>

-#include <AppKit/NSColorList.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/AppKitExceptions.h>
+#include "AppKit/NSColorList.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/AppKitExceptions.h"

 // The list of available color lists is created only once -- this has
 // a drawback, that you need to restart your program to get the color
--- a/Source/NSColorPanel.m
+++ b/Source/NSColorPanel.m
@ -25,23 +25,23 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSEnumerator.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSPathUtilities.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSColorPanel.h>
-#include <AppKit/NSColorPicker.h>
-#include <AppKit/NSColorPicking.h>
-#include <AppKit/NSColorWell.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/IMLoading.h>
+#include "AppKit/NSButtonCell.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSColorPanel.h"
+#include "AppKit/NSColorPicker.h"
+#include "AppKit/NSColorPicking.h"
+#include "AppKit/NSColorWell.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/IMLoading.h"

 #define MAX_ALPHA_VALUE 100.0
 static NSLock *_gs_gui_color_panel_lock = nil;
--- a/Source/NSColorPicker.m
+++ b/Source/NSColorPicker.m
@ -27,10 +27,10 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSBundle.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSColorPicker.h>
+#include "AppKit/NSButtonCell.h"
+#include "AppKit/NSColorPicker.h"

@implementation NSColorPicker

--- a/Source/NSColorWell.m
+++ b/Source/NSColorWell.m
@ -27,16 +27,16 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSActionCell.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSColorPanel.h>
-#include <AppKit/NSColorWell.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSDragging.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSWindow.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSActionCell.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSColorPanel.h"
+#include "AppKit/NSColorWell.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSDragging.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSWindow.h"
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSNotification.h>

--- a/Source/NSComboBox.m
+++ b/Source/NSComboBox.m
@ -25,11 +25,11 @@

 #include <Foundation/NSNotification.h>
 #include <Foundation/NSString.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSComboBox.h>
-#include <AppKit/NSComboBoxCell.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSComboBox.h"
+#include "AppKit/NSComboBoxCell.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSWindow.h"

@interface NSObject(MouseUpping)
 - (NSEvent *)_mouseUpEvent;
--- a/Source/NSComboBoxCell.m
+++ b/Source/NSComboBoxCell.m
@ -29,19 +29,19 @@
 #include <Foundation/NSRunLoop.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSAutoreleasePool.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSBox.h>
-#include <AppKit/NSBrowser.h>
-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/NSButtonCell.h>
-#include <AppKit/NSComboBox.h>
-#include <AppKit/NSComboBoxCell.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSScroller.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSBox.h"
+#include "AppKit/NSBrowser.h"
+#include "AppKit/NSBrowserCell.h"
+#include "AppKit/NSButtonCell.h"
+#include "AppKit/NSComboBox.h"
+#include "AppKit/NSComboBoxCell.h"
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSScreen.h"
+#include "AppKit/NSScroller.h"

@interface GSComboWindow : NSPanel
 {
--- a/Source/NSControl.m
+++ b/Source/NSControl.m
@ -27,17 +27,17 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
-#include <AppKit/NSControl.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSActionCell.h>
+#include "AppKit/NSControl.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSCell.h"
+#include "AppKit/NSActionCell.h"

 /*
 * Class variables
--- a/Source/NSCursor.m
+++ b/Source/NSCursor.m
@ -29,12 +29,14 @@

 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSBitmapImageRep.h>
-#include <AppKit/GSDisplayServer.h>
+
+#include "AppKit/NSColor.h"
+#include "AppKit/NSCursor.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSBitmapImageRep.h"
+
+#include "gnustep/gui/GSDisplayServer.h"

 // Class variables
 static NSMutableArray *gnustep_gui_cursor_stack;
--- a/Source/NSCustomImageRep.m
+++ b/Source/NSCustomImageRep.m
@ -25,8 +25,8 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSCustomImageRep.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSCustomImageRep.h"
 #include <Foundation/NSCoder.h>

@implementation NSCustomImageRep
--- a/Source/NSDataLink.m
+++ b/Source/NSDataLink.m
@ -23,9 +23,9 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSDataLink.h>
-#include <AppKit/NSDataLinkManager.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSDataLink.h"
+#include "AppKit/NSDataLinkManager.h"

@implementation NSDataLink

--- a/Source/NSDataLinkManager.m
+++ b/Source/NSDataLinkManager.m
@ -23,8 +23,8 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSDataLinkManager.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSDataLinkManager.h"

@implementation NSDataLinkManager

--- a/Source/NSDataLinkPanel.m
+++ b/Source/NSDataLinkPanel.m
@ -23,9 +23,9 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSDataLinkPanel.h>
-#include <AppKit/NSNibLoading.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSDataLinkPanel.h"
+#include "AppKit/NSNibLoading.h"

 static NSDataLinkPanel *__sharedDataLinkPanel;

--- a/Source/NSDocument.m
+++ b/Source/NSDocument.m
@ -28,16 +28,16 @@
 */

 #include <Foundation/NSData.h>
-#include <AppKit/NSDocument.h>
-#include <AppKit/NSFileWrapper.h>
-#include <AppKit/NSSavePanel.h>
-#include <AppKit/NSPrintInfo.h>
-#include <AppKit/NSPageLayout.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSDocumentFrameworkPrivate.h>
+#include "AppKit/NSDocument.h"
+#include "AppKit/NSFileWrapper.h"
+#include "AppKit/NSSavePanel.h"
+#include "AppKit/NSPrintInfo.h"
+#include "AppKit/NSPageLayout.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSDocumentFrameworkPrivate.h"

-#include <AppKit/GSGuiPrivate.h>
+#include "gnustep/gui/GSGuiPrivate.h"

@implementation NSDocument

--- a/Source/NSDocumentController.m
+++ b/Source/NSDocumentController.m
@ -27,12 +27,12 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <AppKit/NSDocumentController.h>
-#include <AppKit/NSOpenPanel.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSWorkspace.h>
-#include <AppKit/NSDocumentFrameworkPrivate.h>
+#include "AppKit/NSDocumentController.h"
+#include "AppKit/NSOpenPanel.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSMenuItem.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/NSDocumentFrameworkPrivate.h"
 #include <Foundation/NSUserDefaults.h>

 static NSString *NSTypesKey             = @"NSTypes";
--- a/Source/NSDrawer.m
+++ b/Source/NSDrawer.m
@ -27,9 +27,9 @@

 #include <Foundation/NSCoder.h>
 #include <Foundation/NSNotification.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSDrawer.h>
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSDrawer.h"

 static NSNotificationCenter *nc = nil;

--- a/Source/NSEPSImageRep.m
+++ b/Source/NSEPSImageRep.m
@ -28,8 +28,8 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSData.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSEPSImageRep.h>
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSEPSImageRep.h"

@implementation NSEPSImageRep 

--- a/Source/NSEvent.m
+++ b/Source/NSEvent.m
@ -30,7 +30,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSTimer.h>
@ -40,13 +40,14 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSDebug.h>

-#include <AppKit/NSEvent.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/PSOperators.h>
-#include <AppKit/GSDisplayServer.h>
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/PSOperators.h"
+
+#include "gnustep/gui/GSDisplayServer.h"

 /*
 *	gstep-base has a faster mechanism to get the current thread.
--- a/Source/NSFileWrapper.m
+++ b/Source/NSFileWrapper.m
@ -27,11 +27,11 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

-#include <AppKit/NSFileWrapper.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSWorkspace.h>
+#include "AppKit/NSFileWrapper.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSWorkspace.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSValue.h>
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@ -26,7 +26,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSSet.h>
@ -34,12 +34,12 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSDebug.h>

-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSFontManager.h>
-#include <AppKit/GSFontInfo.h>
-#include <AppKit/NSView.h>
-#include <gnustep/gui/GSFusedSilicaContext.h>
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSFontManager.h"
+#include "AppKit/NSView.h"
+#include "gnustep/gui/GSFontInfo.h"
+#include "gnustep/gui/GSFusedSilicaContext.h"


 /*
--- a/Source/NSFontManager.m
+++ b/Source/NSFontManager.m
@ -26,19 +26,19 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSFontManager.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSFontPanel.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/GSFontInfo.h>
+#include "AppKit/NSFontManager.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSFontPanel.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuItem.h"
+#include "gnustep/gui/GSFontInfo.h"


 /*
--- a/Source/NSFontPanel.m
+++ b/Source/NSFontPanel.m
@ -27,25 +27,25 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSValue.h>
-#include <AppKit/NSDragging.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSFontPanel.h>
-#include <AppKit/NSFontManager.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSSplitView.h>
-#include <AppKit/NSScrollView.h>
-#include <AppKit/NSBrowser.h>
-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/NSTextView.h>
-#include <AppKit/NSTextField.h>
-#include <AppKit/NSTextFieldCell.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSBox.h>
+#include "AppKit/NSDragging.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSFontPanel.h"
+#include "AppKit/NSFontManager.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSSplitView.h"
+#include "AppKit/NSScrollView.h"
+#include "AppKit/NSBrowser.h"
+#include "AppKit/NSBrowserCell.h"
+#include "AppKit/NSTextView.h"
+#include "AppKit/NSTextField.h"
+#include "AppKit/NSTextFieldCell.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSBox.h"

 #define _SAVE_PANEL_X_PAD	5
 #define _SAVE_PANEL_Y_PAD	4
--- a/Source/NSForm.m
+++ b/Source/NSForm.m
@ -25,10 +25,10 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSNotification.h>
-#include <AppKit/NSForm.h>
-#include <AppKit/NSFormCell.h>
+#include "AppKit/NSForm.h"
+#include "AppKit/NSFormCell.h"

@implementation NSForm

--- a/Source/NSFormCell.m
+++ b/Source/NSFormCell.m
@ -27,13 +27,13 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSNotification.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSFormCell.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSTextFieldCell.h>
+#include "AppKit/NSColor.h"
+#include "AppKit/NSFormCell.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSTextFieldCell.h"

 static NSColor	*shadowCol;

--- a/Source/NSGraphicsContext.m
+++ b/Source/NSGraphicsContext.m
@ -1445,7 +1445,7 @@ NSGraphicsContext	*GSCurrentContext(void)

@end

-#include <AppKit/GSDisplayServer.h>
+#include "gnustep/gui/GSDisplayServer.h"

 /* ----------------------------------------------------------------------- */
 /* NSGraphics Ops */	
--- a/Source/NSHelpManager.m
+++ b/Source/NSHelpManager.m
@ -31,13 +31,13 @@
 #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/NSHelpManager.h>
-#include <AppKit/NSGraphics.h>
+#include "AppKit/NSAttributedString.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/NSHelpManager.h"
+#include "AppKit/NSGraphics.h"

-#include <AppKit/GSHelpManagerPanel.h>
+#include "gnustep/gui/GSHelpManagerPanel.h"

@implementation NSBundle (NSHelpManager)

--- a/Source/NSHelpPanel.m
+++ b/Source/NSHelpPanel.m
@ -23,9 +23,9 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSHelpPanel.h>
-#include <AppKit/NSHelpManager.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSHelpPanel.h"
+#include "AppKit/NSHelpManager.h"


@implementation NSApplication (NSHelpPanel)
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@ -22,7 +22,7 @@
   If not, write to the Free Software Foundation,
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */ 
-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <string.h>

 #include <Foundation/NSString.h>
@ -35,18 +35,18 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSDebug.h>

-#include <AppKit/NSImage.h>
-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSBitmapImageRep.h>
-#include <AppKit/NSCachedImageRep.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSPrintOperation.h>
-#include <AppKit/PSOperators.h>
-#include <AppKit/GSDisplayServer.h>
+#include "AppKit/NSImage.h"
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSBitmapImageRep.h"
+#include "AppKit/NSCachedImageRep.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSScreen.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSPrintOperation.h"
+#include "AppKit/PSOperators.h"
+#include "gnustep/gui/GSDisplayServer.h"

 BOOL	NSImageForceCaching = NO;	/* use on missmatch	*/

--- a/Source/NSImageCell.m
+++ b/Source/NSImageCell.m
@ -25,12 +25,12 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImageCell.h>
-#include <AppKit/NSImage.h>
+#include "AppKit/NSCell.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImageCell.h"
+#include "AppKit/NSImage.h"

@implementation NSImageCell

--- a/Source/NSImageRep.m
+++ b/Source/NSImageRep.m
@ -25,7 +25,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <string.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
@ -35,14 +35,14 @@
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSImageRep.h>
-#include <AppKit/NSBitmapImageRep.h>
-#include <AppKit/NSEPSImageRep.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/DPSOperators.h>
+#include "AppKit/NSImageRep.h"
+#include "AppKit/NSBitmapImageRep.h"
+#include "AppKit/NSEPSImageRep.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/DPSOperators.h"

 static NSMutableArray *imageReps = nil;
 static Class NSImageRep_class = NULL;
--- a/Source/NSImageView.m
+++ b/Source/NSImageView.m
@ -24,12 +24,12 @@
   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */

-#include <AppKit/NSDragging.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSImageCell.h>
-#include <AppKit/NSImageView.h>
-#include <AppKit/NSPasteboard.h>
+#include "AppKit/NSDragging.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSImageCell.h"
+#include "AppKit/NSImageView.h"
+#include "AppKit/NSPasteboard.h"

 /*
 * Class variables
--- a/Source/NSInputManager.m
+++ b/Source/NSInputManager.m
@ -23,13 +23,13 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <AppKit/NSEvent.h>
-#include <AppKit/NSInputManager.h>
-#include <AppKit/NSInputServer.h>
-#include <AppKit/NSText.h>
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSInputManager.h"
+#include "AppKit/NSInputServer.h"
+#include "AppKit/NSText.h"

 /* For NSBeep () */
-#include <AppKit/NSGraphics.h>
+#include "AppKit/NSGraphics.h"

 #include "GSKeyBindingAction.h"
 #include "GSKeyBindingTable.h"
--- a/Source/NSInputServer.m
+++ b/Source/NSInputServer.m
@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <AppKit/NSInputServer.h>
+#include "AppKit/NSInputServer.h"

@implementation NSInputServer

--- a/Source/NSInterfaceStyle.m
+++ b/Source/NSInterfaceStyle.m
@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSException.h>
@ -31,8 +31,8 @@
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSMapTable.h>

-#include <AppKit/NSResponder.h>
-#include <AppKit/NSInterfaceStyle.h>
+#include "AppKit/NSResponder.h"
+#include "AppKit/NSInterfaceStyle.h"

 NSString	*NSInterfaceStyleDefault = @"NSInterfaceStyleDefault";

--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@ -103,17 +103,17 @@ first. Remaining cases, highest priority first:
 #include <math.h>

 #include "AppKit/NSLayoutManager.h"
-#include "AppKit/GSLayoutManager_internal.h"
+#include "gnustep/gui/GSLayoutManager_internal.h"

 #include <Foundation/NSException.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSParagraphStyle.h>
-#include <AppKit/NSRulerMarker.h>
-#include <AppKit/NSTextContainer.h>
-#include <AppKit/NSTextStorage.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/DPSOperators.h>
+#include "AppKit/NSColor.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSParagraphStyle.h"
+#include "AppKit/NSRulerMarker.h"
+#include "AppKit/NSTextContainer.h"
+#include "AppKit/NSTextStorage.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/DPSOperators.h"



--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@ -48,7 +48,7 @@
     on OS42, command and shift on MacOSX).
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <stdlib.h>

 #include <Foundation/NSValue.h>
@ -61,12 +61,12 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSZone.h>

-#include <AppKit/NSColor.h>
-#include <AppKit/NSCursor.h>
-#include <AppKit/NSActionCell.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSMatrix.h>
+#include "AppKit/NSColor.h"
+#include "AppKit/NSCursor.h"
+#include "AppKit/NSActionCell.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSMatrix.h"

 #include <math.h>

--- a/Source/NSMenu.m
+++ b/Source/NSMenu.m
@ -32,7 +32,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
@ -40,20 +40,20 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSNotification.h>

-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenuView.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSPopUpButtonCell.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSAttributedString.h>
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuItem.h"
+#include "AppKit/NSMenuView.h"
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSPopUpButtonCell.h"
+#include "AppKit/NSScreen.h"
+#include "AppKit/NSAttributedString.h"


 /*
--- a/Source/NSMenuItem.m
+++ b/Source/NSMenuItem.m
@ -27,17 +27,17 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
-#include "gnustep/base/GSCategories.h"
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSCell.h>
+#include <gnustep/base/GSCategories.h>
+#include "AppKit/NSMenuItem.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSCell.h"

 static BOOL usesUserKeyEquivalents = NO;
 static Class imageClass;
--- a/Source/NSMenuItemCell.m
+++ b/Source/NSMenuItemCell.m
@ -23,7 +23,7 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSDictionary.h>
@ -34,13 +34,13 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>

-#include <AppKit/NSColor.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItemCell.h>
-#include <AppKit/NSMenuView.h>
+#include "AppKit/NSColor.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuItemCell.h"
+#include "AppKit/NSMenuView.h"


@implementation NSMenuItemCell
--- a/Source/NSMenuView.m
+++ b/Source/NSMenuView.m
@ -29,18 +29,18 @@

 #include <Foundation/NSRunLoop.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/NSWindow.h>
-#include <AppKit/PSOperators.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/NSWindow.h"
+#include "AppKit/PSOperators.h"

 #include <Foundation/NSDebug.h>

-#include <AppKit/NSImage.h>
+#include "AppKit/NSImage.h"

 /*
  NSMenuView contains:
--- a/Source/NSOpenGLContext.m
+++ b/Source/NSOpenGLContext.m
@ -26,8 +26,8 @@
 */

 #include <Foundation/NSDebug.h>
-#include <AppKit/NSOpenGL.h>
-#include <AppKit/GSDisplayServer.h>
+#include "AppKit/NSOpenGL.h"
+#include "gnustep/gui/GSDisplayServer.h"

@implementation NSOpenGLContext
 + _classContext
--- a/Source/NSOpenGLPixelFormat.m
+++ b/Source/NSOpenGLPixelFormat.m
@ -28,8 +28,8 @@
 #include <Foundation/NSString.h>

 #include <Foundation/NSDebug.h>
-#include <AppKit/GSDisplayServer.h>
-#include <AppKit/NSOpenGL.h>
+#include "gnustep/gui/GSDisplayServer.h"
+#include "AppKit/NSOpenGL.h"


 // @interface GSGLPixelFormat : NSOpenGLPixelFormat
--- a/Source/NSOpenGLView.m
+++ b/Source/NSOpenGLView.m
@ -28,8 +28,8 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSNotification.h>
-#include <AppKit/NSOpenGL.h>
-#include <AppKit/NSOpenGLView.h>
+#include "AppKit/NSOpenGL.h"
+#include "AppKit/NSOpenGLView.h"



--- a/Source/NSOpenPanel.m
+++ b/Source/NSOpenPanel.m
@ -43,13 +43,13 @@
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSURL.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSBrowser.h>
-#include <AppKit/NSBrowserCell.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSForm.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSOpenPanel.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSBrowser.h"
+#include "AppKit/NSBrowserCell.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSForm.h"
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSOpenPanel.h"

 static NSOpenPanel *_gs_gui_open_panel = nil;

--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@ -33,20 +33,20 @@
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSValue.h>

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSCell.h>
-#include <AppKit/NSClipView.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSOutlineView.h>
-#include <AppKit/NSScroller.h>
-#include <AppKit/NSTableColumn.h>
-#include <AppKit/NSTableHeaderView.h>
-#include <AppKit/NSText.h>
-#include <AppKit/NSTextFieldCell.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSCell.h"
+#include "AppKit/NSClipView.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSOutlineView.h"
+#include "AppKit/NSScroller.h"
+#include "AppKit/NSTableColumn.h"
+#include "AppKit/NSTableHeaderView.h"
+#include "AppKit/NSText.h"
+#include "AppKit/NSTextFieldCell.h"
+#include "AppKit/NSWindow.h"

 static NSNotificationCenter *nc = nil;
 static const int current_version = 1;
--- a/Source/NSPageLayout.m
+++ b/Source/NSPageLayout.m
@ -26,23 +26,23 @@

 */ 

-#include <AppKit/NSApplication.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSTextField.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSImageView.h>
-#include <AppKit/NSBox.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSComboBox.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSNibLoading.h>
-#include <AppKit/NSForm.h>
-#include <AppKit/NSFormCell.h>
-#include <AppKit/NSPrintInfo.h>
-#include <AppKit/NSPageLayout.h>
-#include <AppKit/NSPrinter.h>
-#include <AppKit/GSGuiPrivate.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSTextField.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSImageView.h"
+#include "AppKit/NSBox.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSComboBox.h"
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSNibLoading.h"
+#include "AppKit/NSForm.h"
+#include "AppKit/NSFormCell.h"
+#include "AppKit/NSPrintInfo.h"
+#include "AppKit/NSPageLayout.h"
+#include "AppKit/NSPrinter.h"
+#include "gnustep/gui/GSGuiPrivate.h"

 static NSPageLayout *shared_instance;

--- a/Source/NSPanel.m
+++ b/Source/NSPanel.m
@ -33,26 +33,26 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

 #include <Foundation/NSBundle.h>
 #include <Foundation/NSCoder.h>
-#include <AppKit/NSPanel.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSMatrix.h>
-#include <AppKit/NSTextField.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSBox.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSScreen.h>
-#include <AppKit/NSScrollView.h>
-#include <AppKit/IMLoading.h>
-#include <AppKit/GMAppKit.h>
+#include "AppKit/NSPanel.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSButton.h"
+#include "AppKit/NSMatrix.h"
+#include "AppKit/NSTextField.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSBox.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSScreen.h"
+#include "AppKit/NSScrollView.h"
+#include "AppKit/IMLoading.h"
+#include "AppKit/GMAppKit.h"

-#include <AppKit/GMArchiver.h>
+#include "AppKit/GMArchiver.h"

-#include <AppKit/NSHelpManager.h>
+#include "AppKit/NSHelpManager.h"

 #ifdef ALERT_TITLE
 static NSString	*defaultTitle = @"Alert";
--- a/Source/NSParagraphStyle.m
+++ b/Source/NSParagraphStyle.m
@ -31,7 +31,7 @@
 #include <Foundation/NSDebug.h>

 #include <Foundation/NSException.h>
-#include <AppKit/NSParagraphStyle.h>
+#include "AppKit/NSParagraphStyle.h"

@implementation NSTextTab

--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@ -26,11 +26,11 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
-#include <AppKit/NSPasteboard.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSWorkspace.h>
-#include <AppKit/NSFileWrapper.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSPasteboard.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/NSFileWrapper.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSHost.h>
@ -51,7 +51,7 @@
 #include <Foundation/NSTask.h>
 #include <Foundation/NSTimer.h>

-#include <gnustep/gui/GSPasteboardServer.h>
+#include "gnustep/gui/GSPasteboardServer.h"

@interface NSPasteboard (Private)
 + (id<GSPasteboardSvr>) _pbs;
--- a/Source/NSPopUpButton.m
+++ b/Source/NSPopUpButton.m
@ -28,12 +28,12 @@
 */ 

 #include <Foundation/Foundation.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSPopUpButtonCell.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuItem.h>
-#include <AppKit/NSMenuView.h>
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSPopUpButtonCell.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuItem.h"
+#include "AppKit/NSMenuView.h"

 /*
 * class variables
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@ -23,15 +23,15 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */

-#include <gnustep/gui/config.h>  
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSMenuView.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSPopUpButtonCell.h>
-#include <AppKit/NSWindow.h>
+#include "gnustep/gui/config.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSMenuView.h"
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSPopUpButtonCell.h"
+#include "AppKit/NSWindow.h"

 /* The image to use in a specific popupbutton is
 * _pbc_image[_pbcFlags.pullsDown]; that is, _pbc_image[0] if it is a
--- a/Source/NSPrintInfo.m
+++ b/Source/NSPrintInfo.m
@ -34,9 +34,9 @@
 #include <Foundation/NSEnumerator.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSValue.h>
-#include <AppKit/NSPrinter.h>
+#include "AppKit/NSPrinter.h"

-#include <AppKit/NSPrintInfo.h>
+#include "AppKit/NSPrintInfo.h"

 #define NSNUMBER(val) [NSNumber numberWithInt: val]
 #define DICTSET(dict, obj, key) \
--- a/Source/NSPrintOperation.m
+++ b/Source/NSPrintOperation.m
@ -30,7 +30,7 @@
 */ 

 #include <math.h>
-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSString.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSData.h>
@ -41,17 +41,17 @@
 #include <Foundation/NSThread.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSValue.h>
-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSAffineTransform.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSGraphicsContext.h>
-#include <AppKit/NSView.h>
-#include <AppKit/NSPrinter.h>
-#include <AppKit/NSPrintPanel.h>
-#include <AppKit/NSPrintInfo.h>
-#include <AppKit/NSPrintOperation.h>
-#include <AppKit/NSWorkspace.h>
-#include <AppKit/PSOperators.h>
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSAffineTransform.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSGraphicsContext.h"
+#include "AppKit/NSView.h"
+#include "AppKit/NSPrinter.h"
+#include "AppKit/NSPrintPanel.h"
+#include "AppKit/NSPrintInfo.h"
+#include "AppKit/NSPrintOperation.h"
+#include "AppKit/NSWorkspace.h"
+#include "AppKit/PSOperators.h"

 #define NSNUMBER(a) [NSNumber numberWithInt: (a)]
 #define NSFNUMBER(a) [NSNumber numberWithFloat: (a)]
--- a/Source/NSPrintPanel.m
+++ b/Source/NSPrintPanel.m
@ -26,21 +26,21 @@

 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSValue.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSForm.h>
-#include <AppKit/NSNibLoading.h>
-#include <AppKit/NSPrinter.h>
-#include <AppKit/NSPrintPanel.h>
-#include <AppKit/NSPrintInfo.h>
-#include <AppKit/NSPrintOperation.h>
-#include <AppKit/NSPopUpButton.h>
-#include <AppKit/NSSavePanel.h>
-#include <AppKit/NSView.h>
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSForm.h"
+#include "AppKit/NSNibLoading.h"
+#include "AppKit/NSPrinter.h"
+#include "AppKit/NSPrintPanel.h"
+#include "AppKit/NSPrintInfo.h"
+#include "AppKit/NSPrintOperation.h"
+#include "AppKit/NSPopUpButton.h"
+#include "AppKit/NSSavePanel.h"
+#include "AppKit/NSView.h"

 static NSPrintPanel *shared_instance;

--- a/Source/NSPrinter.m
+++ b/Source/NSPrinter.m
@ -35,7 +35,7 @@
 * (This is not required in the OpenStep standard, but could be useful).
 */

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
@ -51,10 +51,10 @@
 #include <Foundation/NSUtilities.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSMapTable.h>
-#include <AppKit/AppKitExceptions.h>
-#include <AppKit/NSGraphics.h>
+#include "AppKit/AppKitExceptions.h"
+#include "AppKit/NSGraphics.h"

-#include <AppKit/NSPrinter.h>
+#include "AppKit/NSPrinter.h"

 // Define size used for the name and type maps - just use a small table
 #define NAMEMAPSIZE 0
--- a/Source/NSProgressIndicator.m
+++ b/Source/NSProgressIndicator.m
@ -24,9 +24,9 @@
 */

 #include <Foundation/NSTimer.h>
-#include <AppKit/NSProgressIndicator.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSWindow.h>
+#include "AppKit/NSProgressIndicator.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSWindow.h"

@implementation NSProgressIndicator

--- a/Source/NSResponder.m
+++ b/Source/NSResponder.m
@ -25,16 +25,16 @@
   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 

-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/NSResponder.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSMenu.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSHelpManager.h>
-#include <AppKit/NSInputManager.h>
+#include "AppKit/NSResponder.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSMenu.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSHelpManager.h"
+#include "AppKit/NSInputManager.h"

@implementation NSResponder

--- a/Source/NSRulerMarker.m
+++ b/Source/NSRulerMarker.m
@ -26,13 +26,13 @@
 */ 

 #include <Foundation/NSException.h>
-#include <AppKit/NSRulerMarker.h>
-#include <AppKit/NSRulerView.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSCursor.h>
+#include "AppKit/NSRulerMarker.h"
+#include "AppKit/NSRulerView.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSImage.h"
+#include "AppKit/NSApplication.h"
+#include "AppKit/NSWindow.h"
+#include "AppKit/NSCursor.h"

@interface NSRulerView (GNUstepInternal)
 - (NSRect)_markersRect;
--- a/Source/NSRulerView.m
+++ b/Source/NSRulerView.m
@ -24,21 +24,21 @@
 */

 #include <math.h>
-#include <gnustep/gui/config.h>
+#include "gnustep/gui/config.h"

 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSValue.h>
-#include <AppKit/NSAttributedString.h>
-#include <AppKit/NSBezierPath.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSGraphics.h>
-#include <AppKit/NSRulerMarker.h>
-#include <AppKit/NSRulerView.h>
-#include <AppKit/NSScrollView.h>
+#include "AppKit/NSAttributedString.h"
+#include "AppKit/NSBezierPath.h"
+#include "AppKit/NSColor.h"
+#include "AppKit/NSEvent.h"
+#include "AppKit/NSFont.h"
+#include "AppKit/NSGraphics.h"
+#include "AppKit/NSRulerMarker.h"
+#include "AppKit/NSRulerView.h"
+#include "AppKit/NSScrollView.h"

 DEFINE_RINT_IF_MISSING

--- a/Show more
+++ b/Show more