diff --git a/crypt/cert.c b/crypt/cert.c
index 49896be1d9..34d7e4158c 100644
--- a/crypt/cert.c
+++ b/crypt/cert.c
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "crypt.h"
 
 int totfails = 0;
diff --git a/io/test-utime.c b/io/test-utime.c
index 5f31792745..32e14bd161 100644
--- a/io/test-utime.c
+++ b/io/test-utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1996, 1997, 2000 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
@@ -18,6 +18,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <utime.h>
diff --git a/libio/tst_swscanf.c b/libio/tst_swscanf.c
index ce56144bb0..59e5324c0e 100644
--- a/libio/tst_swscanf.c
+++ b/libio/tst_swscanf.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <wchar.h>
 
 int
diff --git a/libio/tst_wscanf.c b/libio/tst_wscanf.c
index 719f37867e..97bc518124 100644
--- a/libio/tst_wscanf.c
+++ b/libio/tst_wscanf.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <wchar.h>
 
 int
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 4d8d6543d9..f2ad56d54d 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-21  Andreas Jaeger  <aj@suse.de>
+
+	* tst-trans.c: Include <stdlib.h> and <string.h>.
+
 2000-06-19  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/pt_BR: Correct day and month names.
diff --git a/localedata/tst-trans.c b/localedata/tst-trans.c
index a84ee20e72..7b064234e7 100644
--- a/localedata/tst-trans.c
+++ b/localedata/tst-trans.c
@@ -20,6 +20,8 @@
 
 #include <locale.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <wchar.h>
 #include <wctype.h>
 
diff --git a/misc/tst-efgcvt.c b/misc/tst-efgcvt.c
index 776508700a..6eaa8be9f5 100644
--- a/misc/tst-efgcvt.c
+++ b/misc/tst-efgcvt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000 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
@@ -23,6 +23,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 int error_count;
 
diff --git a/nss/test-netdb.c b/nss/test-netdb.c
index 01056a69d7..afce9587ca 100644
--- a/nss/test-netdb.c
+++ b/nss/test-netdb.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 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>, 1998.
+   Contributed by Andreas Jaeger <aj@suse.de>, 1998.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -33,6 +33,8 @@
 #include <netdb.h>
 #include <rpc/netdb.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/param.h>
diff --git a/posix/globtest.c b/posix/globtest.c
index 90b9eb6ad3..231459490b 100644
--- a/posix/globtest.c
+++ b/posix/globtest.c
@@ -18,6 +18,7 @@
 
 #include <getopt.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <glob.h>
 
diff --git a/posix/runtests.c b/posix/runtests.c
index 8347286989..2e823fb52f 100644
--- a/posix/runtests.c
+++ b/posix/runtests.c
@@ -28,6 +28,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 
 
diff --git a/posix/test-vfork.c b/posix/test-vfork.c
index 2abeb5ae14..66c17c3d90 100644
--- a/posix/test-vfork.c
+++ b/posix/test-vfork.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <error.h>
 #include <errno.h>
diff --git a/posix/tst-getaddrinfo.c b/posix/tst-getaddrinfo.c
index f954506824..a37a8d62d9 100644
--- a/posix/tst-getaddrinfo.c
+++ b/posix/tst-getaddrinfo.c
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c
index 69cfbb1d0d..79e094c3dc 100644
--- a/posix/wordexp-test.c
+++ b/posix/wordexp-test.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000 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
@@ -23,6 +23,7 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <wordexp.h>
 
 #define IFS " \n\t"
diff --git a/stdio-common/scanf4.c b/stdio-common/scanf4.c
index 177b2ec22f..f9a9134745 100644
--- a/stdio-common/scanf4.c
+++ b/stdio-common/scanf4.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 int
 main(int arc, char *argv[])
diff --git a/stdio-common/scanf5.c b/stdio-common/scanf5.c
index bbbb774c23..fb4acfabf1 100644
--- a/stdio-common/scanf5.c
+++ b/stdio-common/scanf5.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 int
 main(int argc, char *argv[])
diff --git a/stdio-common/temptest.c b/stdio-common/temptest.c
index 35ea4dc808..ec8e179f03 100644
--- a/stdio-common/temptest.c
+++ b/stdio-common/temptest.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 char *files[500];
diff --git a/stdio-common/tst-fileno.c b/stdio-common/tst-fileno.c
index 0b47c0f0d3..79c768d732 100644
--- a/stdio-common/tst-fileno.c
+++ b/stdio-common/tst-fileno.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1997, 2000 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
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 static int
diff --git a/stdio-common/tst-printfsz.c b/stdio-common/tst-printfsz.c
index fed829c012..5925050b59 100644
--- a/stdio-common/tst-printfsz.c
+++ b/stdio-common/tst-printfsz.c
@@ -1,6 +1,7 @@
 /* Based on code by Larry McVoy <lm@neteng.engr.sgi.com>.  */
 #include <printf.h>
 #include <stdio.h>
+#include <string.h>
 
 #define V       12345678.12345678
 
diff --git a/stdlib/tst-xpg-basename.c b/stdlib/tst-xpg-basename.c
index 933b71c534..12067e702d 100644
--- a/stdlib/tst-xpg-basename.c
+++ b/stdlib/tst-xpg-basename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -19,6 +19,8 @@
 
 #include <libgen.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 static struct
 {
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 1a3d18c7dd..c1d811da21 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -52,6 +52,9 @@ fi
 # kernel headers are young enough.  Additionally we have minimal
 # kernel versions for some architectures.
 case "$machine" in
+  mips*)
+    arch_minimum_kernel=2.2.15
+    ;;
   sh*)
     arch_minimum_kernel=2.3.99
     ;;
@@ -79,10 +82,10 @@ fi
 
 if test -n "$minimum_kernel"; then
   echo $ac_n "checking for kernel header at least $minimum_kernel""... $ac_c" 1>&6
-echo "configure:83: checking for kernel header at least $minimum_kernel" >&5
+echo "configure:86: checking for kernel header at least $minimum_kernel" >&5
   decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
   cat > conftest.$ac_ext <<EOF
-#line 86 "configure"
+#line 89 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 #if LINUX_VERSION_CODE < $decnum
@@ -194,7 +197,7 @@ if test $host = $build; then
     ac_prefix=$ac_default_prefix
   fi
   echo $ac_n "checking for symlinks in ${ac_prefix}/include""... $ac_c" 1>&6
-echo "configure:198: checking for symlinks in ${ac_prefix}/include" >&5
+echo "configure:201: checking for symlinks in ${ac_prefix}/include" >&5
   ac_message=
   if test -L ${ac_prefix}/include/net; then
     ac_message="$ac_message
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index d379421a80..05b58e9e79 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -39,6 +39,9 @@ fi
 # kernel headers are young enough.  Additionally we have minimal
 # kernel versions for some architectures.
 case "$machine" in
+  mips*)
+    arch_minimum_kernel=2.2.15
+    ;;
   sh*)
     arch_minimum_kernel=2.3.99
     ;;
diff --git a/time/clocktest.c b/time/clocktest.c
index 65cd938643..d46c59b905 100644
--- a/time/clocktest.c
+++ b/time/clocktest.c
@@ -1,5 +1,6 @@
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/wctype/test_wcfuncs.c b/wctype/test_wcfuncs.c
index 7ced68ba5d..61328ea22d 100644
--- a/wctype/test_wcfuncs.c
+++ b/wctype/test_wcfuncs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000 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
@@ -17,6 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <wctype.h>
 
 int