diff --git a/ChangeLog b/ChangeLog
index eaf24cd69..8422bfa71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 16 20:16:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/include/NSGeometry.h: Don't pollute macro name space with
+	MAX and MIN.
+	* Source/include/NSRange.h: ditto
+
 Thu Apr 15 10:50:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/include/NSHost.h: Use #ifdefs to prevent multiple inclusion.
diff --git a/Headers/gnustep/base/NSGeometry.h b/Headers/gnustep/base/NSGeometry.h
index db20f375f..43aeb7b99 100644
--- a/Headers/gnustep/base/NSGeometry.h
+++ b/Headers/gnustep/base/NSGeometry.h
@@ -36,12 +36,14 @@
 #define MAX(a,b) \
        ({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b);  \
          _MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
+#define	GS_DEFINED_MAX
 #endif
 
 #ifndef MIN
 #define MIN(a,b) \
        ({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b);  \
          _MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
+#define	GS_DEFINED_MIN
 #endif
 
 /* Point definition. */
@@ -486,4 +488,13 @@ extern NSRect	NSRectFromString(NSString* string);
 
 #endif /* __OBJC__ */
 
+#ifdef	GS_DEFINED_MAX
+#undef	GS_DEFINED_MAX
+#undef	MAX
+#endif
+
+#ifdef	GS_DEFINED_MIN
+#undef	GS_DEFINED_MIN
+#undef	MIN
+#endif
 #endif /* __NSGeometry_h_GNUSTEP_BASE_INCLUDE */
diff --git a/Headers/gnustep/base/NSRange.h b/Headers/gnustep/base/NSRange.h
index 905523106..8c48a9ad2 100644
--- a/Headers/gnustep/base/NSRange.h
+++ b/Headers/gnustep/base/NSRange.h
@@ -33,12 +33,14 @@
 #define MAX(a,b) \
        ({typeof(a) _MAX_a = (a); typeof(b) _MAX_b = (b);  \
          _MAX_a > _MAX_b ? _MAX_a : _MAX_b; })
+#define	GS_DEFINED_MAX
 #endif
 
 #ifndef MIN
 #define MIN(a,b) \
        ({typeof(a) _MIN_a = (a); typeof(b) _MIN_b = (b);  \
          _MIN_a < _MIN_b ? _MIN_a : _MIN_b; })
+#define	GS_DEFINED_MIN
 #endif
 
 typedef struct _NSRange NSRange;
@@ -135,4 +137,14 @@ NSIntersectionRange (NSRange aRange, NSRange bRange)
 extern NSString *
 NSStringFromRange(NSRange range);
 
+#ifdef	GS_DEFINED_MAX
+#undef	GS_DEFINED_MAX
+#undef	MAX
+#endif
+
+#ifdef	GS_DEFINED_MIN
+#undef	GS_DEFINED_MIN
+#undef	MIN
+#endif
+
 #endif /* __NSRange_h_GNUSTEP_BASE_INCLUDE */