diff --git a/ChangeLog b/ChangeLog
index 1084ba796..8fb72e0b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 18 10:21:38 1998  Adam Fedor  <fedor@ultra.doc.com>
+
+	* Source/NSClipView.m (MIN, MAX): Remove.
+	* Source/NSMatrix.c: Likewise.
+
 Mon Sep 14 1998  Felipe A. Rodriguez  <far@ix.netcom.com>
 
 	* NSEvent.m extensive optimization. 
diff --git a/Source/NSClipView.m b/Source/NSClipView.m
index 1de3f967a..cec193011 100644
--- a/Source/NSClipView.m
+++ b/Source/NSClipView.m
@@ -37,22 +37,6 @@
   [a release]; \
   a = b;
 
-#ifdef MIN
-# undef MIN
-#endif
-#define MIN(a, b) \
-    ({typedef _ta = (a), _tb = (b);   \
-	_ta _a = (a); _tb _b = (b);     \
-	_a < _b ? _a : _b; })
-
-#ifdef MAX
-# undef MAX
-#endif
-#define MAX(a, b) \
-    ({typedef _ta = (a), _tb = (b);   \
-	_ta _a = (a); _tb _b = (b);     \
-	_a > _b ? _a : _b; })
-
 @implementation NSClipView
 
 - init
diff --git a/Source/NSMatrix.m b/Source/NSMatrix.m
index 516391b5d..5cd334433 100644
--- a/Source/NSMatrix.m
+++ b/Source/NSMatrix.m
@@ -52,34 +52,9 @@
   [a release]; \
   a = b;
 
-#ifdef MIN
-# undef MIN
-#endif
-#define MIN(a, b) \
-    ({typedef _ta = (a), _tb = (b);   \
-	_ta _a = (a); _tb _b = (b);     \
-	_a < _b ? _a : _b; })
-
-#ifdef MAX
-# undef MAX
-#endif
-#define MAX(a, b) \
-    ({typedef _ta = (a), _tb = (b);   \
-	_ta _a = (a); _tb _b = (b);     \
-	_a > _b ? _a : _b; })
-
-#ifdef ABS
-# undef ABS
-#endif
-#define ABS(x) \
-    ({typedef _tx = (x); \
-      _tx _x = (x); \
-      _x >= 0 ? _x : -_x; })
-
 #define SIGN(x) \
-    ({typedef _tx = (x); \
-      _tx _x = (x); \
-      _x > 0 ? 1 : (_x == 0 ? 0 : -1); })
+    ({typeof(x) _SIGN_x = (x); \
+      _SIGN_x > 0 ? 1 : (_SIGN_x == 0 ? 0 : -1); })
 
 #define FREE(p) do { if (p) free (p); } while (0)