diff --git a/ChangeLog b/ChangeLog
index 4561f473a7..edf4181504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2000-11-25  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/loadfail.c: Little cosmetic changes to avoid warnings.
+	* elf/loadtest.c: Likewise.
+	* elf/multiload.c: Likewise.
+	* elf/next.c: Likewise.
+	* elf/nodelete.c: Likewise.
+	* elf/noload.c: Likewise.
+	* elf/order.c: Likewise.
+	* elf/origtest.c: Likewise.
+	* elf/preloadtest.c: Likewise.
+	* elf/restest1.c: Likewise.
+
 	* sysdeps/i386/i486/bits/string.h (__strncat_g) [i686]: Fourth
 	parameter of asm must be in %ecx.
 
diff --git a/elf/loadfail.c b/elf/loadfail.c
index e423356348..7531aa958e 100644
--- a/elf/loadfail.c
+++ b/elf/loadfail.c
@@ -34,6 +34,7 @@ main (void)
   return h != NULL;
 }
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/loadtest.c b/elf/loadtest.c
index 7cbe55bcd7..863dc536e7 100644
--- a/elf/loadtest.c
+++ b/elf/loadtest.c
@@ -146,7 +146,7 @@ main (int argc, char *argv[])
     }
 
   /* Unload all loaded modules.  */
-  for (count = 0; count < NOBJS; ++count)
+  for (count = 0; count < (int) NOBJS; ++count)
     if (testobjs[count].handle != NULL)
       {
 	printf ("\nclose: %s: l_initfini = %p, l_versions = %p\n",
@@ -174,6 +174,7 @@ main (int argc, char *argv[])
 }
 
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/multiload.c b/elf/multiload.c
index 3727d97f6a..e85cc96589 100644
--- a/elf/multiload.c
+++ b/elf/multiload.c
@@ -97,6 +97,7 @@ main (void)
   return 0;
 }
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/next.c b/elf/next.c
index a7ca2bdbc2..6a3670c214 100644
--- a/elf/next.c
+++ b/elf/next.c
@@ -5,7 +5,7 @@ extern int successful_rtld_next_test (void);
 extern void *failing_rtld_next_use (void);
 
 
-int
+static int
 do_test (void)
 {
   int result;
diff --git a/elf/nodelete.c b/elf/nodelete.c
index bf1f0d9291..78364a278a 100644
--- a/elf/nodelete.c
+++ b/elf/nodelete.c
@@ -11,6 +11,7 @@ int fini_ran;
 
 
 static void
+__attribute__ ((noreturn))
 handler (int sig)
 {
   siglongjmp (jmpbuf, 1);
diff --git a/elf/noload.c b/elf/noload.c
index 826427f4bd..9281ec714c 100644
--- a/elf/noload.c
+++ b/elf/noload.c
@@ -63,6 +63,7 @@ main (void)
 }
 
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/order.c b/elf/order.c
index 4544591c50..ca617cbc09 100644
--- a/elf/order.c
+++ b/elf/order.c
@@ -1,5 +1,6 @@
 #include <unistd.h>
 
+void init (void) __attribute__ ((constructor));
 void
 __attribute__ ((constructor))
 init (void)
@@ -7,6 +8,7 @@ init (void)
   write (1, "4", 1);
 }
 
+void fini (void) __attribute__ ((destructor));
 void
 __attribute__ ((destructor))
 fini (void)
diff --git a/elf/origtest.c b/elf/origtest.c
index 11bd0f76cf..1cacabcc39 100644
--- a/elf/origtest.c
+++ b/elf/origtest.c
@@ -31,6 +31,7 @@ main (void)
 }
 
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/preloadtest.c b/elf/preloadtest.c
index ac27f67150..9edc87a7bc 100644
--- a/elf/preloadtest.c
+++ b/elf/preloadtest.c
@@ -12,6 +12,7 @@ main (void)
   return res != 92;
 }
 
+extern int foo (int a);
 int
 foo (int a)
 {
diff --git a/elf/restest1.c b/elf/restest1.c
index 2b649c00d2..eb5aeca59e 100644
--- a/elf/restest1.c
+++ b/elf/restest1.c
@@ -49,6 +49,7 @@ main (void)
 }
 
 
+extern int foo (int a);
 int
 foo (int a)
 {