diff --git a/ChangeLog b/ChangeLog
index 41995fd..3059339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-12 09:42-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* CoreDataHeaders.h: Conditionally use the defines for _, ASSIGN, and
+	RETAIN when the framework is not being compiled using GNUstep and
+	GNUSTEP is not defined.
+
 2010-12-27  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	* NSAttributeDescription.m ([-initWithCoder:],
diff --git a/CoreDataHeaders.h b/CoreDataHeaders.h
index c0530ba..5df76a8 100644
--- a/CoreDataHeaders.h
+++ b/CoreDataHeaders.h
@@ -22,6 +22,7 @@
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
 */
 
+#ifndef GNUSTEP /* if and only if we are not compiling under GNUstep, should these be defined */
 #ifndef ASSIGN
 #define ASSIGN(VAR, VAL) [(VAR) autorelease], (VAR)=[(VAL) retain]
 #endif
@@ -34,6 +35,7 @@
 #ifndef _
 #define _(STR) STR
 #endif
+#endif
 
 #import <CoreData/CoreData.h>
 #import "CoreDataUtilities.h"