diff --git a/ChangeLog b/ChangeLog
index a6c56608dc..25da4389ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2000-11-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* dlfcn/defaultmod1.c: Add prototypes to avoid warnings.
+	* dlfcn/defaultmod2.c: Likewise.
+	* dlfcn/dlopen.c: Likewise.
+	* dlfcn/dlopenold.c: Likewise.
+	* dlfcn/failtestmod.c: Likewise.
+	* dlfcn/glreflib1.c: Likewise.
+	* dlfcn/glreflib2.c: Likewise.
+	* dlfcn/eval.c: Likewise.  Add attributes.
+
+	* ctype/ctype-extn.c: Define isblank and not __isblank.
+
 	* time/strftime.c: Add const where necessary to avoid warnings.
 	* time/strptime.c (strptime_internal): Add casts to avoid warnings.
 
diff --git a/ctype/ctype-extn.c b/ctype/ctype-extn.c
index cfc8b87d41..2177df020a 100644
--- a/ctype/ctype-extn.c
+++ b/ctype/ctype-extn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 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
@@ -19,14 +19,14 @@
 #define	__NO_CTYPE
 #include <ctype.h>
 
-/* Real function versions of the non-ANSI ctype functions.  */
+/* Real function versions of the non-ANSI ctype functions.  isblank is
+   now in ISO C99 but we leave it here.  */
 
 int
-__isblank (int c)
+isblank (int c)
 {
   return __isctype (c, _ISblank);
 }
-weak_alias (__isblank, isblank)
 
 int
 _tolower (int c)
diff --git a/dlfcn/defaultmod1.c b/dlfcn/defaultmod1.c
index 2c26e389bc..9f330b7f29 100644
--- a/dlfcn/defaultmod1.c
+++ b/dlfcn/defaultmod1.c
@@ -1,6 +1,7 @@
 #include <dlfcn.h>
 #include <stdio.h>
 
+extern int found_in_mod1 (void);
 int
 found_in_mod1 (void)
 {
@@ -8,6 +9,7 @@ found_in_mod1 (void)
 }
 
 
+extern int test_in_mod1 (void *mainp);
 int
 test_in_mod1 (void *mainp)
 {
diff --git a/dlfcn/defaultmod2.c b/dlfcn/defaultmod2.c
index 4cacced3b5..c8615e2dc3 100644
--- a/dlfcn/defaultmod2.c
+++ b/dlfcn/defaultmod2.c
@@ -1,12 +1,14 @@
 #include <dlfcn.h>
 #include <stdio.h>
 
+extern int found_in_mod1 (void);
 int
 found_in_mod1 (void)
 {
   return 1;
 }
 
+extern int found_in_mod2 (void);
 int
 found_in_mod2 (void)
 {
@@ -14,6 +16,7 @@ found_in_mod2 (void)
 }
 
 
+extern int test_in_mod2 (void *mainp);
 int
 test_in_mod2 (void *mainp)
 {
diff --git a/dlfcn/dlopen.c b/dlfcn/dlopen.c
index 793891e896..0891ca55f7 100644
--- a/dlfcn/dlopen.c
+++ b/dlfcn/dlopen.c
@@ -41,6 +41,7 @@ dlopen_doit (void *a)
 }
 
 
+extern void *__dlopen_check (const char *file, int mode);
 void *
 __dlopen_check (const char *file, int mode)
 {
diff --git a/dlfcn/dlopenold.c b/dlfcn/dlopenold.c
index 0d6cea95c5..83ec801b2b 100644
--- a/dlfcn/dlopenold.c
+++ b/dlfcn/dlopenold.c
@@ -46,6 +46,7 @@ dlopen_doit (void *a)
 			args->caller);
 }
 
+extern void *__dlopen_nocheck (const char *file, int mode);
 void *
 __dlopen_nocheck (const char *file, int mode)
 {
diff --git a/dlfcn/eval.c b/dlfcn/eval.c
index ce452b722c..1f9421ddda 100644
--- a/dlfcn/eval.c
+++ b/dlfcn/eval.c
@@ -1,5 +1,5 @@
 /* You don't really want to know what this hack is for.
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -122,7 +122,9 @@ eval (char **stringp)
 }
 
 
+extern void _start (void) __attribute__ ((noreturn));
 void
+__attribute__ ((noreturn))
 _start (void)
 {
   char *buf = NULL;
diff --git a/dlfcn/failtestmod.c b/dlfcn/failtestmod.c
index 595da4d567..a03f90b734 100644
--- a/dlfcn/failtestmod.c
+++ b/dlfcn/failtestmod.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 
 
+extern void constr (void) __attribute__ ((__constructor__));
 void
 __attribute__ ((__constructor__))
 constr (void)
diff --git a/dlfcn/glreflib1.c b/dlfcn/glreflib1.c
index 224ff5b097..d8d4f4a605 100644
--- a/dlfcn/glreflib1.c
+++ b/dlfcn/glreflib1.c
@@ -17,6 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+extern int ref1 (void);
 int
 ref1 (void)
 {
diff --git a/dlfcn/glreflib2.c b/dlfcn/glreflib2.c
index 6f8f970a17..b4e61e0a4e 100644
--- a/dlfcn/glreflib2.c
+++ b/dlfcn/glreflib2.c
@@ -19,6 +19,7 @@
 
 extern int ref1 (void);
 
+extern int ref2 (void);
 int
 ref2 (void)
 {