--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-28  Bruno Haible  <bruno@clisp.org>
 
+	Expect rpmatch to be declared.
+	* lib/yesno.c (rpmatch): Remove declaration.
+
 	Declare rpmatch.
 	* lib/stdlib.in.h (rpmatch): New declaration.
 	* lib/rpmatch.c: Include <stdlib.h> first.

--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -1,7 +1,6 @@
 /* yesno.c -- read a yes/no response from stdin
 
-   Copyright (C) 1990, 1998, 2001, 2003, 2004, 2005, 2006, 2007 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1998, 2001, 2003-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,8 +22,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-extern int rpmatch (char const *response);
-
 /* Return true if we read an affirmative line from standard input.
 
    Since this function uses stdin, it is suggested that the caller not