diff --git a/ChangeLog b/ChangeLog
index fe8b93120..52b39b0e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-17  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSCell.m
+	* Source/NSButtonCell.m
+	* Source/NSMenuItemCell.m
+	* Source/NSOutlineView.m
+	* Source/NSPopUpButtonCell.m
+	* Source/NSSplitView.m
+	Removed unneeded includes.
+	* Source/NSRulerView.m
+	Rewrote [drawHashMarksAndLabelsInRect:] to use string drawing and
+	bezier path code instead of direct PS operations.
+
 2002-11-15  Adam Fedor  <fedor@gnu.org>
 
 	* Model/GMAppKit.m ([NSColor -encodeWithModelArchiver:]): Encode
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index 5189114a6..1d504e8ff 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -38,17 +38,16 @@
 #include <Foundation/NSDebug.h>
 
 #include <AppKit/AppKitExceptions.h>
+#include <AppKit/NSApplication.h>
 #include <AppKit/NSButtonCell.h>
 #include <AppKit/NSButton.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSEvent.h>
-#include <AppKit/NSApplication.h>
-#include <AppKit/NSFont.h>
-#include <AppKit/NSImage.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/PSOperators.h>
+#include <AppKit/NSWindow.h>
 
 @implementation NSButtonCell
 
diff --git a/Source/NSCell.m b/Source/NSCell.m
index 30761ba42..d7a3ccf7f 100644
--- a/Source/NSCell.m
+++ b/Source/NSCell.m
@@ -38,25 +38,23 @@
 #include <Foundation/NSValue.h>
 
 #include <AppKit/AppKitExceptions.h>
+#include <AppKit/NSAttributedString.h>
 #include <AppKit/NSApplication.h>
-#include <AppKit/NSWindow.h>
-#include <AppKit/NSImage.h>
-#include <AppKit/NSView.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/NSGraphics.h>
 #include <AppKit/NSFont.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSParagraphStyle.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/PSOperators.h>
-#include <AppKit/NSAttributedString.h>
-
-#include <AppKit/NSClipView.h>
+#include <AppKit/NSView.h>
+#include <AppKit/NSWindow.h>
 
 static Class	colorClass;
 static Class	cellClass;
diff --git a/Source/NSMenuItemCell.m b/Source/NSMenuItemCell.m
index 911b49fc9..4f4c4ba91 100644
--- a/Source/NSMenuItemCell.m
+++ b/Source/NSMenuItemCell.m
@@ -24,25 +24,24 @@
 */ 
 
 #include <gnustep/gui/config.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSCoder.h>
+#include <Foundation/NSDictionary.h>
 #include <Foundation/NSException.h>
-#include <Foundation/NSProcessInfo.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSNotification.h>
+#include <Foundation/NSProcessInfo.h>
+#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/NSMenuView.h>
 #include <AppKit/NSMenuItemCell.h>
+#include <AppKit/NSMenuView.h>
 
-#include <AppKit/PSOperators.h>
 
 @implementation NSMenuItemCell
 
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 024797e11..47c90c336 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -25,31 +25,28 @@
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
-#include <AppKit/NSOutlineView.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSMapTable.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSNull.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSException.h>
 #include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSMapTable.h>
+#include <Foundation/NSValue.h>
+
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSCell.h>
-#include <AppKit/NSFont.h>
 #include <AppKit/NSClipView.h>
 #include <AppKit/NSColor.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSGraphics.h>
-#include <AppKit/NSScroller.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/PSOperators.h>
-#include <AppKit/NSCachedImageRep.h>
-
 
 static NSNotificationCenter *nc = nil;
 static const int current_version = 1;
diff --git a/Source/NSPopUpButtonCell.m b/Source/NSPopUpButtonCell.m
index 3b64c1fc2..f0a5e970a 100644
--- a/Source/NSPopUpButtonCell.m
+++ b/Source/NSPopUpButtonCell.m
@@ -25,17 +25,13 @@
 
 #include <gnustep/gui/config.h>  
 #include <AppKit/NSApplication.h>
-#include <AppKit/NSColor.h>
-#include <AppKit/NSFont.h>
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSImage.h>
-#include <AppKit/NSMatrix.h>
 #include <AppKit/NSMenu.h>
 #include <AppKit/NSMenuView.h>
 #include <AppKit/NSPopUpButton.h>
 #include <AppKit/NSPopUpButtonCell.h>
 #include <AppKit/NSWindow.h>
-#include <AppKit/PSOperators.h>
 
 /* The image to use in a specific popupbutton is
  * _pbc_image[_pbcFlags.pullsDown]; that is, _pbc_image[0] if it is a
diff --git a/Source/NSSplitView.m b/Source/NSSplitView.m
index ebde3efce..6f5d99756 100644
--- a/Source/NSSplitView.m
+++ b/Source/NSSplitView.m
@@ -32,24 +32,23 @@
 */
 
 #include <math.h>
-#include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSCoder.h>
+#include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSGeometry.h>
-#include <Foundation/NSString.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSRunLoop.h>
-#include <Foundation/NSDebug.h>
+#include <Foundation/NSString.h>
+
 #include <AppKit/NSApplication.h>
 #include <AppKit/NSColor.h>
-#include <AppKit/NSImage.h>
 #include <AppKit/NSEvent.h>
-#include <AppKit/NSSplitView.h>
 #include <AppKit/NSGraphics.h>
+#include <AppKit/NSImage.h>
+#include <AppKit/NSSplitView.h>
 #include <AppKit/NSWindow.h>
 
-#include "AppKit/DPSOperators.h"
-
 static NSNotificationCenter *nc = nil;
 
 @implementation NSSplitView