diff --git a/ChangeLog b/ChangeLog
index e9a7cb7007..ac40fc7488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-10  Joseph Myers  <joseph@codesourcery.com>
+
+	* string/string.h [__USE_BSD && __USE_GNU && __GNUC__] (ffsll):
+	Remove [__GNUC__] condition.
+	* wcsmbs/wchar.h [__USE_ISOC99 || (__GNUC__ && __USE_GNU)]: Change
+	condition to just [__USE_ISOC99].
+	[__GNUC__ && __USE_GNU]: Change condition to just [__USE_GNU].
+
 2013-01-10  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14200]
diff --git a/string/string.h b/string/string.h
index 4b3a686f2c..ecc3fef1bd 100644
--- a/string/string.h
+++ b/string/string.h
@@ -522,10 +522,8 @@ extern int ffs (int __i) __THROW __attribute__ ((__const__));
    platforms.  */
 # ifdef	__USE_GNU
 extern int ffsl (long int __l) __THROW __attribute__ ((__const__));
-#  ifdef __GNUC__
 __extension__ extern int ffsll (long long int __ll)
      __THROW __attribute__ ((__const__));
-#  endif
 # endif
 
 /* Compare S1 and S2, ignoring case.  */
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 75e2dea6ab..e91558683e 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -475,7 +475,7 @@ extern unsigned long int wcstoul (const wchar_t *__restrict __nptr,
      __THROW;
 __END_NAMESPACE_STD
 
-#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_GNU)
+#ifdef __USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Convert initial portion of wide string NPTR to `long long int'
    representation.  */
@@ -491,9 +491,9 @@ extern unsigned long long int wcstoull (const wchar_t *__restrict __nptr,
 					wchar_t **__restrict __endptr,
 					int __base) __THROW;
 __END_NAMESPACE_C99
-#endif /* ISO C99 or GCC and GNU.  */
+#endif /* ISO C99.  */
 
-#if defined __GNUC__ && defined __USE_GNU
+#ifdef __USE_GNU
 /* Convert initial portion of wide string NPTR to `long long int'
    representation.  */
 __extension__
@@ -507,7 +507,7 @@ __extension__
 extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr,
 				       wchar_t **__restrict __endptr,
 				       int __base) __THROW;
-#endif /* GCC and use GNU.  */
+#endif /* Use GNU.  */
 
 #ifdef __USE_GNU
 /* The concept of one static locale per category is not very well