diff --git a/ChangeLog b/ChangeLog
index 518cdc7789..9b078a0236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdlib/stdlib.h: Relax conditions for *cvt functions and valloc.
+
 	* Versions.def: Add GLIBC_2.12 for libpthread.
 
 	[BZ #11126]
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 248aa33471..d1f3841f1b 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -497,8 +497,8 @@ extern void cfree (void *__ptr) __THROW;
 # include <alloca.h>
 #endif /* Use GNU, BSD, or misc.  */
 
-#if ((defined __USE_BSD || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+    || defined __USE_BSD
 /* Allocate SIZE bytes on a page boundary.  The storage cannot be freed.  */
 extern void *valloc (size_t __size) __THROW __attribute_malloc__ __wur;
 #endif
@@ -797,8 +797,8 @@ __END_NAMESPACE_C99
 #endif
 
 
-#if ((defined __USE_SVID || defined __USE_XOPEN_EXTENDED)	\
-     && !defined __USE_XOPEN2K) || defined __USE_GNU
+#if (defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K) \
+    || defined __USE_SVID
 /* Convert floating point numbers to strings.  The returned values are
    valid only until another call to the same function.  */