diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c35342b0fe..4c34456a00 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2004-08-14  Mark Kettenis  <kettenis@gnu.org>
 
+	* defs.h: Remove out-of-date comment.
+	[!FCLOSE_PROVIDED] (fclose): Remove prototype.
+	[!GETENV_PROVIDED] (getenv): Remove prototype.
+
 	* standalone.c: Remove file.
 	* Makefile.in (standalone.o): Remove dependency.
 
diff --git a/gdb/defs.h b/gdb/defs.h
index 5861b43bda..69d9685615 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -1072,10 +1072,6 @@ enum gdb_osabi
    Libiberty thingies are no longer declared here.  We include libiberty.h
    above, instead.  */
 
-#ifndef GETENV_PROVIDED
-extern char *getenv (const char *);
-#endif
-
 /* From other system libraries */
 
 #ifdef HAVE_STDDEF_H
@@ -1093,15 +1089,6 @@ extern char *getenv (const char *);
 #endif
 
 
-/* We take the address of fclose later, but some stdio's forget
-   to declare this.  We can't always declare it since there's
-   no way to declare the parameters without upsetting some compiler
-   somewhere. */
-
-#ifndef FCLOSE_PROVIDED
-extern int fclose (FILE *);
-#endif
-
 #ifndef atof
 extern double atof (const char *);	/* X3.159-1989  4.10.1.1 */
 #endif