--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,5 +1,7 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999, 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 1986, 1991, 1998, 1999, 2002, 2003 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
@@ -35,9 +37,6 @@
 #  endif
 # endif
 
-/* Avoid collision with readline() from libreadline.  */
-#define readline readlinebuffer
-
 /* Initialize linebuffer LINEBUFFER for use. */
 void initbuffer PARAMS ((struct linebuffer *linebuffer));
 
@@ -45,8 +44,8 @@
    Keep the newline; append a newline if it's the last line of a file
    that ends in a non-newline character.  Do not null terminate.
    Return LINEBUFFER, except at end of file return 0.  */
-struct linebuffer *readline PARAMS ((struct linebuffer *linebuffer,
-				     FILE *stream));
+struct linebuffer *readlinebuffer PARAMS ((struct linebuffer *linebuffer,
+					   FILE *stream));
 
 /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
 void freebuffer PARAMS ((struct linebuffer *));