Index: configure.ac
===================================================================
--- configure.ac	(revision 30897)
+++ configure.ac	(working copy)
@@ -2612,7 +2612,7 @@
 if test $enable_icu = yes; then
   AC_CHECK_ICU(4.0, have_icu=yes, have_icu=no)
   if test "$have_icu" = "yes"; then
-    AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucurr.h)
+    AC_CHECK_HEADERS(unicode/uloc.h unicode/ulocdata.h unicode/ucurr.h unicode/unum.h)
     LIBS="$LIBS $ICU_LIBS"
     HAVE_ICU=1
   fi
Index: Headers/Foundation/NSLocale.h
===================================================================
--- Headers/Foundation/NSLocale.h	(revision 30897)
+++ Headers/Foundation/NSLocale.h	(working copy)
@@ -48,29 +48,33 @@
   NSLocaleLanguageDirectionBottomToTop = 4
 };
 
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
 GS_EXPORT NSString * const NSCurrentLocaleDidChangeNotification;
+#endif
 
 //
 // NSLocale Component Keys
 //
-GS_EXPORT NSString * const NSLocaleIdentifier;
-GS_EXPORT NSString * const NSLocaleLanguageCode;
-GS_EXPORT NSString * const NSLocaleCountryCode;
-GS_EXPORT NSString * const NSLocaleScriptCode;
-GS_EXPORT NSString * const NSLocaleVariantCode;
-GS_EXPORT NSString * const NSLocaleExemplarCharacterSet;
-GS_EXPORT NSString * const NSLocaleCalendar;
-GS_EXPORT NSString * const NSLocaleCollationIdentifier;
-GS_EXPORT NSString * const NSLocaleUsesMetricSystem;
-GS_EXPORT NSString * const NSLocaleMeasurementSystem;
-GS_EXPORT NSString * const NSLocaleDecimalSeparator;
-GS_EXPORT NSString * const NSLocaleGroupingSeparator;
-GS_EXPORT NSString * const NSLocaleCurrencySymbol;
-GS_EXPORT NSString * const NSLocaleCurrencyCode;
-GS_EXPORT NSString * const NSLocaleCollatorIdentifier;
-GS_EXPORT NSString * const NSLocaleQuotationBeginDelimiterKey;
+GS_EXPORT NSString * const NSLocaleIdentifier;           // NSString
+GS_EXPORT NSString * const NSLocaleLanguageCode;         // NSString
+GS_EXPORT NSString * const NSLocaleCountryCode;          // NSString
+GS_EXPORT NSString * const NSLocaleScriptCode;           // NSString
+GS_EXPORT NSString * const NSLocaleVariantCode;          // NSString
+GS_EXPORT NSString * const NSLocaleExemplarCharacterSet; // NSCharacterSet
+GS_EXPORT NSString * const NSLocaleCalendar;             // NSCalendar
+GS_EXPORT NSString * const NSLocaleCollationIdentifier;  // NSString
+GS_EXPORT NSString * const NSLocaleUsesMetricSystem;     // NSNumber
+GS_EXPORT NSString * const NSLocaleMeasurementSystem;    // NSString
+GS_EXPORT NSString * const NSLocaleDecimalSeparator;     // NSString
+GS_EXPORT NSString * const NSLocaleGroupingSeparator;    // NSString
+GS_EXPORT NSString * const NSLocaleCurrencySymbol;       // NSString
+GS_EXPORT NSString * const NSLocaleCurrencyCode;         // NSString
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
+GS_EXPORT NSString * const NSLocaleCollatorIdentifier;   // NSString
+GS_EXPORT NSString * const NSLocaleQuotationBeginDelimiterKey; // NSString
 GS_EXPORT NSString * const NSLocaleAlternateQuotationBeginDelimiterKey;
 GS_EXPORT NSString * const NSLocaleAlternateQuotationEndDelimiterKey;
+#endif
 
 //
 // NSLocale Calendar Keys
@@ -82,10 +86,12 @@
 GS_EXPORT NSString * const NSIslamicCalendar;
 GS_EXPORT NSString * const NSIslamicCivilCalendar;
 GS_EXPORT NSString * const NSJapaneseCalendar;
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
 GS_EXPORT NSString * const NSRepublicOfChinaCalendar;
 GS_EXPORT NSString * const NSPersianCalendar;
 GS_EXPORT NSString * const NSIndianCalendar;
 GS_EXPORT NSString * const NSISO8601Calendar;
+#endif
 
 /**
  * Provides information describing language, date and time, and currency
Index: Headers/Additions/GNUstepBase/config.h.in
===================================================================
--- Headers/Additions/GNUstepBase/config.h.in	(revision 30897)
+++ Headers/Additions/GNUstepBase/config.h.in	(working copy)
@@ -597,6 +597,9 @@
 /* Define if libobjc has the _objc_unexpected_exception callback */
 #undef HAVE_UNEXPECTED
 
+/* Define to 1 if you have the <unicode/unum.h> header file. */
+#undef HAVE_UNICODE_UNUM_H
+
 /* Define to 1 if you have the <unicode/ucurr.h> header file. */
 #undef HAVE_UNICODE_UCURR_H