diff --git a/ChangeLog b/ChangeLog
index 2be232bb6..1f75ce187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,20 @@
+2011-01-23  Stefan Bidigaray <stefanbidi@gmail.com>
+
+	* Source/NSDateFormatter.m:
+	* Source/NSNumberFormatter.m:
+	* Source/NSCalendar.m: Remove use of OS_API_VERSION() in .m files.
+
 2011-01-23 15:42  David Chisnall <theraven@gna.org>
 
 	* libs/base/trunk/Source/NSNumberFormatter.m: Some small fixes in
 	  NSNumberFormatter. Mostly stop using == to compare C strings.
 
-2011-01-22  Stefan Bidigaray <stefanbidi@gmail.com>
+2011-01-23  Stefan Bidigaray <stefanbidi@gmail.com>
 
 	* Source/NSDateFormatter.m: Initialize UDateFormat before using it.
 	* Source/NSCalendar.m: Implement -components:fromDate:.
 
-2011-01-22  Stefan Bidigaray <stefanbidi@gmail.com>
+2011-01-23  Stefan Bidigaray <stefanbidi@gmail.com>
 
 	* Source/NSDateFormatter.m: Implemented a few more methods.
 
diff --git a/Source/NSCalendar.m b/Source/NSCalendar.m
index 697773f99..ac24139a3 100644
--- a/Source/NSCalendar.m
+++ b/Source/NSCalendar.m
@@ -182,7 +182,6 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
     _identifier = NSIslamicCivilCalendar;
   else if ([string isEqualToString: NSJapaneseCalendar])
     _identifier = NSJapaneseCalendar;
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
   else if ([string isEqualToString: NSRepublicOfChinaCalendar])
     _identifier = NSRepublicOfChinaCalendar;
   else if ([string isEqualToString: NSPersianCalendar])
@@ -191,7 +190,6 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
     _identifier = NSIndianCalendar;
   else if ([string isEqualToString: NSISO8601Calendar])
     _identifier = NSISO8601Calendar;
-#endif
   else
     {
       RELEASE(self);
@@ -600,9 +598,7 @@ static UCalendarDateFields _NSCalendarUnitToDateField (NSCalendarUnit unit)
   _week = NSUndefinedDateComponent;
   _weekday = NSUndefinedDateComponent;
   _weekdayOrdinal = NSUndefinedDateComponent;
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
   _quarter = NSUndefinedDateComponent;
-#endif
   
   return self;
 }
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index 69d860f79..03c915ec7 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -92,7 +92,7 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
   
 /* According to Apple docs, default behavior is NSDateFormatterBehavior10_4 on
    10.5 and later. Yeah, go figure. */
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST) && GS_USE_ICU == 1
+#if GS_USE_ICU == 1
   err = U_ZERO_ERROR;
   
   length =
diff --git a/Source/NSNumberFormatter.m b/Source/NSNumberFormatter.m
index f78a81074..10c84131a 100644
--- a/Source/NSNumberFormatter.m
+++ b/Source/NSNumberFormatter.m
@@ -309,18 +309,13 @@ static NSUInteger _defaultBehavior = 0;
 - (NSString*) decimalSeparator
 {
   if (_behavior == NSNumberFormatterBehavior10_4
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
     || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
     {
 #if GS_USE_ICU == 1
       return [self _getSymbol: UNUM_DECIMAL_SEPARATOR_SYMBOL];
 #endif
     }
-  else if (_behavior == NSNumberFormatterBehavior10_0
-#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
-    || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
+  else if (_behavior == NSNumberFormatterBehavior10_0)
     {
       if (_decimalSeparator == 0)
         return @"";
@@ -613,18 +608,13 @@ static NSUInteger _defaultBehavior = 0;
 - (void) setDecimalSeparator: (NSString*)newSeparator
 {
   if (_behavior == NSNumberFormatterBehavior10_4
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
     || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
     {
 #if GS_USE_ICU == 1
       [self _setSymbol: newSeparator : UNUM_DECIMAL_SEPARATOR_SYMBOL];
 #endif
     }
-  else if (_behavior == NSNumberFormatterBehavior10_0
-#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
-    || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
+  else if (_behavior == NSNumberFormatterBehavior10_0)
     {
       if ([newSeparator length] > 0)
         _decimalSeparator = [newSeparator characterAtIndex: 0];
@@ -722,9 +712,7 @@ static NSUInteger _defaultBehavior = 0;
 - (NSString*) stringForObjectValue: (id)anObject
 {
   if (_behavior == NSNumberFormatterBehavior10_4
-#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
     || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
     {
 #if GS_USE_ICU == 1
 
@@ -795,10 +783,6 @@ static NSUInteger _defaultBehavior = 0;
 #endif
     }
   else if (_behavior == NSNumberFormatterBehavior10_0
-#if OS_API_VERSION(GS_OPENSTEP_V, MAC_OS_X_VERSION_10_3)
-    || _behavior == NSNumberFormatterBehaviorDefault)
-#endif
-    // FIXME: Should this method even work for OS X < 10.4?
     {
       NSMutableDictionary	*locale;
       NSCharacterSet	*formattingCharacters;