diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index a7544dc2d903eaf4ffd1155fd8b889346528af74..ce22a4ae004d68c054b5f51e87b1e1a1d2e0bba6 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.27 1996/11/10 03:04:12 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.28 1996/11/11 05:55:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,7 +26,7 @@
 #include "psqlHelp.h"
 
 #ifdef NOREADLINE
-extern char *readline(char *);  /* in rlstubs.c */
+#include "rlstubs.h"
 #else
 /* from the GNU readline library */
 #ifdef OLD_READLINE
diff --git a/src/bin/psql/rlstubs.c b/src/bin/psql/rlstubs.c
index b753fab430b2dbae534cc118933422521f58c0db..98a1f6ebf10c0920f345a2a916364f9527eef579 100644
--- a/src/bin/psql/rlstubs.c
+++ b/src/bin/psql/rlstubs.c
@@ -7,12 +7,14 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.2 1996/07/30 07:47:58 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.c,v 1.3 1996/11/11 05:55:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 
+#include "rlstubs.h"
+
 char *
 readline(char *prompt)
 {
@@ -23,19 +25,19 @@ readline(char *prompt)
 }
 
 int
-write_history()
+write_history(char *dum)
 {
     return 0;
 }
 
 int
-using_history()
+using_history(void)
 {
     return 0;
 }
 
 int
-add_history()
+add_history(char *dum)
 {
     return 0;
 }
diff --git a/src/bin/psql/rlstubs.h b/src/bin/psql/rlstubs.h
new file mode 100644
index 0000000000000000000000000000000000000000..c9334eaca1c8a2d566c0a80539eead5dad89aad9
--- /dev/null
+++ b/src/bin/psql/rlstubs.h
@@ -0,0 +1,20 @@
+/*-------------------------------------------------------------------------
+ *
+ * rlstubs.h
+ *    stub routines when compiled without readline and history libraries
+ *
+ * Copyright (c) 1994-5, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/rlstubs.h,v 1.1 1996/11/11 05:55:33 momjian Exp $
+ *
+ *-------------------------------------------------------------------------
+ */
+extern char *readline(char *prompt);
+
+extern int write_history(char *dum);
+
+extern int using_history(void);
+
+extern int add_history(char *dum);