diff --git a/elf/vismod2.c b/elf/vismod2.c
index 3a7b1d97f3..35ce4d2564 100644
--- a/elf/vismod2.c
+++ b/elf/vismod2.c
@@ -16,6 +16,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <stdlib.h>
+
 int
 protlocal (void)
 {
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 94446af99f..e81a764e18 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-21  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/pthread/timer_routines.c: Include <stdlib.h> for memset
+	prototype.
+
+	* join.c: Include <stdlib.h> for exit prototype.
+
 2000-06-20  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/i386/useldt.h: Include <stdlib.h>.
diff --git a/linuxthreads/join.c b/linuxthreads/join.c
index adcac46aa2..97da2dfa34 100644
--- a/linuxthreads/join.c
+++ b/linuxthreads/join.c
@@ -16,6 +16,7 @@
 
 #include <errno.h>
 #include <sched.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include "pthread.h"
 #include "internals.h"
diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c
index 2d4e325b6d..4e3a8fc65a 100644
--- a/linuxthreads/sysdeps/pthread/timer_routines.c
+++ b/linuxthreads/sysdeps/pthread/timer_routines.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stddef.h>
+#include <string.h>
 #include <sysdep.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/rt/aio_suspend.c b/rt/aio_suspend.c
index 6736857ba1..ca8e5581dc 100644
--- a/rt/aio_suspend.c
+++ b/rt/aio_suspend.c
@@ -30,6 +30,7 @@
 #undef aio_suspend64
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include "aio_misc.h"