diff --git a/ChangeLog b/ChangeLog
index 952dfa3cd7..796971037f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2004-10-06  Jakub Jelinek  <jakub@redhat.com>
 
-	* sysdeps/s390/jmpbuf-unwind.h: Include bits/wordsize.h.
-	(JMPBUF_CFA_UNWINDS_ADJ): Subtract 96 resp. 160 bytes from CFA.
+	* posix/tst-getaddrinfo2.c: Include stdlib.h and string.h.
+	(do_test): Use %p instead of 0x%08X to print a pointer.
+
+	* malloc/malloc.c: Include stdio-common/_itoa.h.
 
 2004-10-05  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/malloc/malloc.c b/malloc/malloc.c
index a41171490a..ad6009a198 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -257,6 +257,10 @@
 
 #include <malloc-machine.h>
 
+#ifdef _LIBC
+#include <stdio-common/_itoa.h>
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
index 242da0a5a1..d4f3188f53 100644
--- a/nptl/allocatestack.c
+++ b/nptl/allocatestack.c
@@ -772,8 +772,8 @@ __reclaim_stacks (void)
 
 #if HP_TIMING_AVAIL
 /* Find a thread given the thread ID.  */
-struct pthread *
 attribute_hidden
+struct pthread *
 __find_thread_by_id (pid_t tid)
 {
   struct pthread *result = NULL;
diff --git a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
index 67350c2151..c435eff307 100644
--- a/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/jmp-unwind.c
@@ -19,8 +19,7 @@
 
 #include <setjmp.h>
 #include <stddef.h>
-#include <pthread-functions.h>
-#include <pthreaddef.h>
+#include <pthreadP.h>
 
 extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
 #pragma weak __pthread_cleanup_upto
diff --git a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
index f7d88f20e6..36886f58a4 100644
--- a/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
+++ b/nptl/sysdeps/unix/sysv/linux/s390/jmp-unwind.c
@@ -1,5 +1,5 @@
 /* Clean up stack frames unwound by longjmp.  Linux/s390 version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,8 +19,7 @@
 
 #include <setjmp.h>
 #include <stddef.h>
-#include <pthread-functions.h>
-#include <pthreaddef.h>
+#include <pthreadP.h>
 
 extern void __pthread_cleanup_upto (__jmp_buf env, char *targetframe);
 #pragma weak __pthread_cleanup_upto
diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
index 03c2ef8106..92fb08c951 100644
--- a/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h
@@ -100,7 +100,7 @@ typedef union
     __extension__ unsigned long long int __wakeup_seq;
     __extension__ unsigned long long int __woken_seq;
     void *__mutex;
-    int __nwaiters;
+    unsigned int __nwaiters;
     unsigned int __broadcast_seq;
   } __data;
   char __size[__SIZEOF_PTHREAD_COND_T];
diff --git a/nptl/tst-clock2.c b/nptl/tst-clock2.c
index fd216b2ba1..bca40956e2 100644
--- a/nptl/tst-clock2.c
+++ b/nptl/tst-clock2.c
@@ -58,6 +58,14 @@ do_test (void)
 #if defined _POSIX_THREAD_CPUTIME && _POSIX_THREAD_CPUTIME >= 0
 # define N 10
 
+# if _POSIX_THREAD_CPUTIME == 0
+  if (sysconf (_SC_THREAD_CPUTIME) < 0)
+    {
+      puts ("_POSIX_THREAD_CPUTIME option not available");
+      return 0;
+    }
+# endif
+
   if (pthread_barrier_init (&b2, NULL, 2) != 0
       || pthread_barrier_init (&bN, NULL, N + 1) != 0)
     {
diff --git a/posix/tst-getaddrinfo2.c b/posix/tst-getaddrinfo2.c
index b0bce5925c..13edca0a34 100644
--- a/posix/tst-getaddrinfo2.c
+++ b/posix/tst-getaddrinfo2.c
@@ -2,6 +2,8 @@
 #include <errno.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 
 static int
@@ -47,7 +49,7 @@ do_test (void)
       if (err)
         {
           printf ("FAIL getaddrinfo IPv4 socktype 0,513: "
-                  "fam %d alen %d addr 0x%08X addr/fam %d "
+                  "fam %d alen %d addr %p addr/fam %d "
                   "addr/port %d H[%d]\n",
                   pai->ai_family, pai->ai_addrlen, psin,
                   psin ? psin->sin_family : 0,