diff --git a/Headers/gnustep/base/NSException.h b/Headers/gnustep/base/NSException.h
index 26b82658b..12d9162d4 100644
--- a/Headers/gnustep/base/NSException.h
+++ b/Headers/gnustep/base/NSException.h
@@ -24,11 +24,10 @@
 #ifndef __NSException_h_OBJECTS_INCLUDE
 #define __NSException_h_OBJECTS_INCLUDE
 
-#include <Foundation/NSObject.h>
+#include <Foundation/NSString.h>
 #include <setjmp.h>
 #include <stdarg.h>
 
-@class NSString;
 @class NSDictionary;
 
 @interface NSException : NSObject <NSCoding, NSCopying>
diff --git a/Source/NSGeometry.m b/Source/NSGeometry.m
index 1ba1690c9..8bbaf6116 100644
--- a/Source/NSGeometry.m
+++ b/Source/NSGeometry.m
@@ -295,14 +295,19 @@ NSIsEmptyRect(NSRect aRect)
     return (!((NSWidth(aRect) > 0) && (NSHeight(aRect) > 0)));
 }
 
-/* FIXME: what to do for flipped coordinates? */
 BOOL 	
 NSMouseInRect(NSPoint aPoint, NSRect aRect, BOOL flipped)
 {
-    return ((aPoint.x > NSMinX(aRect))
-	        && (aPoint.y > NSMinY(aRect))
+    if (flipped)
+    	return ((aPoint.x >= NSMinX(aRect))
+	        && (aPoint.y >= NSMinY(aRect))
 		&& (aPoint.x < NSMaxX(aRect))
 		&& (aPoint.y < NSMaxY(aRect)));
+    else
+    	return ((aPoint.x >= NSMinX(aRect))
+	        && (aPoint.y > NSMinY(aRect))
+		&& (aPoint.x < NSMaxX(aRect))
+		&& (aPoint.y <= NSMaxY(aRect)));
 }
 
 BOOL