diff --git a/ChangeLog b/ChangeLog
index de09bc710..7e48eee9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-04  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Headers/Foundation/NSCompoundPredicate.h:
+	* Headers/Foundation/NSComparisonPredicate.h:
+	* Headers/Foundation/NSExpression.h:
+	Fixup version macros
+
 2007-01-30  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSAutoreleasePool.m: Fix bug reporting autorlease count.
diff --git a/Headers/Foundation/NSComparisonPredicate.h b/Headers/Foundation/NSComparisonPredicate.h
index bc4eb17fc..d7bccf4dd 100644
--- a/Headers/Foundation/NSComparisonPredicate.h
+++ b/Headers/Foundation/NSComparisonPredicate.h
@@ -26,6 +26,8 @@
 #define __NSComparisonPredicate_h_GNUSTEP_BASE_INCLUDE
 #import	<GNUstepBase/GSVersionMacros.h>
 
+#if	OS_API_VERSION(100400, GS_API_LATEST)
+
 #import	<Foundation/NSExpression.h>
 #import	<Foundation/NSPredicate.h>
 
@@ -103,4 +105,5 @@ typedef enum _NSPredicateOperatorType
 }
 #endif
 
+#endif	/* 100400 */
 #endif
diff --git a/Headers/Foundation/NSCompoundPredicate.h b/Headers/Foundation/NSCompoundPredicate.h
index aabfcf1f3..d6ed2db76 100644
--- a/Headers/Foundation/NSCompoundPredicate.h
+++ b/Headers/Foundation/NSCompoundPredicate.h
@@ -26,6 +26,8 @@
 #define __NSCompoundPredicate_h_GNUSTEP_BASE_INCLUDE
 #import	<GNUstepBase/GSVersionMacros.h>
 
+#if	OS_API_VERSION(100400, GS_API_LATEST)
+
 #import	<Foundation/NSPredicate.h>
 
 #if	defined(__cplusplus)
@@ -56,5 +58,6 @@ typedef enum _NSCompoundPredicateType
 }
 #endif
 
+#endif	/* 100400 */
 #endif
 
diff --git a/Headers/Foundation/NSExpression.h b/Headers/Foundation/NSExpression.h
index a7d51441c..e2a77e80a 100644
--- a/Headers/Foundation/NSExpression.h
+++ b/Headers/Foundation/NSExpression.h
@@ -26,6 +26,8 @@
 #define __NSExpression_h_GNUSTEP_BASE_INCLUDE
 #import	<GNUstepBase/GSVersionMacros.h>
 
+#if	OS_API_VERSION(100400, GS_API_LATEST)
+
 #import	<Foundation/NSPredicate.h>
 
 #if	defined(__cplusplus)
@@ -69,5 +71,7 @@ typedef enum _NSExpressionType
 }
 #endif
 
+#endif	/* 100400 */
+
 #endif /* __NSExpression_h_GNUSTEP_BASE_INCLUDE */