diff --git a/ChangeLog b/ChangeLog
index 7c3faba27f..e0a2338bb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* math/libm-test.inc: Include <strcmp.h>.
+
 2000-06-20  Jes Sorensen  <jes@linuxcare.com>
 
 	* sysdeps/unix/sysv/linux/ia64/syscalls.list: New file.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 965ac05e31..94446af99f 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,7 @@
 2000-06-20  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/i386/useldt.h: Include <stdlib.h>.
+
 	* sysdeps/unix/sysv/linux/bits/posix_opt.h: Define _POSIX_BARRIERS.
 	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Likewise.
 
@@ -10,6 +12,7 @@
 	* Examples/ex9.c: New file.
 	* sysdeps/pthread/pthread.h: Add barrier data types and declarations.
 	* sysdeps/pthread/bits/pthreadtypes.h: Likewise.
+	Patch by Kaz Kylheku <kaz@ashi.footprints.net>.
 
 2000-06-19  H.J. Lu  <hjl@gnu.org>
 
diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h
index bd527a3d3c..10cc3d41a3 100644
--- a/linuxthreads/sysdeps/i386/useldt.h
+++ b/linuxthreads/sysdeps/i386/useldt.h
@@ -20,6 +20,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stddef.h>	/* For offsetof.  */
+#include <stdlib.h>	/* For abort().  */
 
 
 /* We don't want to include the kernel header.  So duplicate the
diff --git a/math/libm-test.inc b/math/libm-test.inc
index c3af9f9009..bd399d488f 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@arthur.rhein-neckar.de>, 1997.
 
@@ -119,6 +119,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <argp.h>
 
 /* Possible exceptions */
@@ -3106,7 +3107,7 @@ nearbyint_test (void)
   TEST_f_f (nearbyint, 1.5, 2.0);
   TEST_f_f (nearbyint, -0.5, minus_zero);
   TEST_f_f (nearbyint, -1.5, -2.0);
-  
+
   END (nearbyint);
 }
 
@@ -3977,7 +3978,7 @@ main (int argc, char **argv)
   output_points = 1;
   /* XXX set to 0 for releases.  */
   ignore_max_ulp = 0;
-  
+
   /* Parse and process arguments.  */
   argp_parse (&argp, argc, argv, 0, &remaining, NULL);