diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index eca6974e032d..767e12fd0e69 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-19  David O'Brien  <obrien@FreeBSD.org>
+
+	* encoding.c (MAX, MIN, ROUNDING): #undef before defining.
+
 2002-04-09  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	PR objc/6107
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index ec7173774e8a..39277235b1f3 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -30,14 +30,17 @@ Boston, MA 02111-1307, USA.  */
 #include "objc-api.h"
 #include "encoding.h"
 
+#undef  MAX
 #define MAX(X, Y)                    \
   ({ typeof(X) __x = (X), __y = (Y); \
      (__x > __y ? __x : __y); })
 
+#undef  MIN
 #define MIN(X, Y)                    \
   ({ typeof(X) __x = (X), __y = (Y); \
      (__x < __y ? __x : __y); })
 
+#undef  ROUND
 #define ROUND(V, A) \
   ({ typeof(V) __v=(V); typeof(A) __a=(A); \
      __a*((__v+__a-1)/__a); })