diff --git a/ChangeLog b/ChangeLog
index 9fdeaa591..3abf260a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-29 Adam Fedor <fedor@gnu.org>
+
+	* Headers/Foundation/NSCoder.h (uint8_t, int32_t, int64_t): Define
+	only ifndef (sugg. from Peter Cooper <comrade-gs@obverse.com.au>)
+
 Mon Mar 29 17:19:40 BST 2004 Nicola Pero <n.pero@mi.flashnet.it>
 
 	* Tools/autogsdoc.m: Use @"..." @"..." for concatenated string
diff --git a/Headers/Foundation/NSCoder.h b/Headers/Foundation/NSCoder.h
index 0f50fc232..00342cec4 100644
--- a/Headers/Foundation/NSCoder.h
+++ b/Headers/Foundation/NSCoder.h
@@ -82,9 +82,15 @@
  * MacOS-X adds some typedefs that GNUstep already has by another name.
  */
 #include <GSConfig.h>
+#ifndef uint8_t
 #define	uint8_t	gsu8
+#endif
+#ifndef int32_t
 #define	int32_t	gss32
+#endif
+#ifndef int64_t
 #define	int64_t	gss64
+#endif
 
 
 /** <override-subclass />