From 78693c89d77cf6443a1a98fc38a83d9d563e2aa4 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 16 Feb 2000 13:15:26 +0000
Subject: [PATCH] Clean up include files use in psql.

---
 src/bin/pg_id/pg_id.c       |  4 ++--
 src/bin/psql/command.c      | 11 ++++-------
 src/bin/psql/command.h      |  6 ++----
 src/bin/psql/common.c       | 15 ++++++---------
 src/bin/psql/common.h       |  5 ++---
 src/bin/psql/copy.c         |  9 +++------
 src/bin/psql/copy.h         |  6 ++----
 src/bin/psql/describe.c     | 10 +++-------
 src/bin/psql/describe.h     |  3 +--
 src/bin/psql/help.c         | 10 ++++------
 src/bin/psql/help.h         |  4 +---
 src/bin/psql/input.c        |  7 +++----
 src/bin/psql/input.h        |  5 +----
 src/bin/psql/large_obj.c    | 10 +++-------
 src/bin/psql/large_obj.h    |  4 +---
 src/bin/psql/mainloop.c     | 10 +++-------
 src/bin/psql/mainloop.h     |  4 +---
 src/bin/psql/print.c        | 11 ++++-------
 src/bin/psql/print.h        |  8 ++------
 src/bin/psql/prompt.c       | 10 +++-------
 src/bin/psql/prompt.h       |  4 +---
 src/bin/psql/settings.h     | 10 ++--------
 src/bin/psql/startup.c      |  7 ++-----
 src/bin/psql/stringutils.c  |  9 +++------
 src/bin/psql/tab-complete.c |  9 +++------
 src/bin/psql/variables.c    |  5 ++---
 src/bin/psql/variables.h    |  3 +--
 27 files changed, 65 insertions(+), 134 deletions(-)

diff --git a/src/bin/pg_id/pg_id.c b/src/bin/pg_id/pg_id.c
index 59c86eeb9ae..b118e5e2078 100644
--- a/src/bin/pg_id/pg_id.c
+++ b/src/bin/pg_id/pg_id.c
@@ -6,9 +6,9 @@
  *
  * Copyright (C) 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.12 2000/02/09 16:23:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/pg_id.c,v 1.13 2000/02/16 13:15:25 momjian Exp $
  */
-#include <c.h>
+#include <postgres.h>
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index ba198d7d914..a4353124cc3 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,16 +3,13 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.18 2000/02/07 23:10:04 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "command.h"
 
 #include <errno.h>
 #include <assert.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>
 #ifndef WIN32
 #include <sys/types.h>			/* for umask() */
@@ -22,8 +19,8 @@
 #include <win32.h>
 #endif
 
-#include <libpq-fe.h>
-#include <pqexpbuffer.h>
+#include "libpq-fe.h"
+#include "pqexpbuffer.h"
 
 #include "common.h"
 #include "copy.h"
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index 65431e9c9ec..4fcbf61fced 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -3,14 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.7 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include <c.h>
-
-#include <pqexpbuffer.h>
+#include "pqexpbuffer.h"
 
 #include "settings.h"
 #include "print.h"
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 49249c27db6..340f053bdf5 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -3,15 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.13 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.14 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "common.h"
 
 #include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdarg.h>
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
@@ -27,10 +24,10 @@
 #include <win32.h>
 #endif
 
-#include <libpq-fe.h>
-#include <postgres_ext.h>
-#include <pqsignal.h>
-#include <version.h>
+#include "libpq-fe.h"
+#include "postgres_ext.h"
+#include "pqsignal.h"
+#include "version.h"
 
 #include "settings.h"
 #include "variables.h"
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index b4b7d93abe9..af6f04965da 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -3,13 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.5 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/common.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <c.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 char *		xstrdup(const char *string);
 
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index d2d638c0664..b0bba40889e 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -3,14 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.9 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "copy.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include <assert.h>
 #ifndef WIN32
@@ -19,7 +16,7 @@
 #include <io.h>					/* I think */
 #endif
 
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h
index 8a57e7a66d3..cf36d324c0a 100644
--- a/src/bin/psql/copy.h
+++ b/src/bin/psql/copy.h
@@ -3,14 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.6 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/copy.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef COPY_H
 #define COPY_H
 
-#include <c.h>
-#include <stdio.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 /* handler for \copy */
 bool		do_copy(const char *args);
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 6ab7c2f519e..0282906064c 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.16 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.17 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "describe.h"
 
-#include <string.h>
-
-#include <postgres.h>			/* for VARHDRSZ, int4 type */
-#include <postgres_ext.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "common.h"
 #include "settings.h"
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index 36f4ceca4ea..673f3fe4865 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -3,12 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.7 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef DESCRIBE_H
 #define DESCRIBE_H
 
-#include <c.h>
 #include "settings.h"
 
 /* \da */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index ac252086d42..63e4bda5d74 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.18 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.19 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "help.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <signal.h>
 #include <errno.h>
 
@@ -24,8 +22,8 @@
 #include <win32.h>
 #endif
 
-#include <pqsignal.h>
-#include <libpq-fe.h>
+#include "pqsignal.h"
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/help.h b/src/bin/psql/help.h
index cbd9a81488f..47fed65b410 100644
--- a/src/bin/psql/help.h
+++ b/src/bin/psql/help.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.5 2000/01/29 16:58:48 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.h,v 1.6 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef HELP_H
 #define HELP_H
 
-#include <c.h>
-
 void		usage(void);
 
 void		slashUsage(void);
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 560d5b2c382..6d05370d21a 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -3,15 +3,14 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.9 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.10 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "input.h"
 
 #include <errno.h>
 
-#include <pqexpbuffer.h>
-
+#include "pqexpbuffer.h"
 #include "settings.h"
 #include "tab-complete.h"
 #include "common.h"
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
index d12b45bfa30..e539ba29145 100644
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@@ -3,14 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.7 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef INPUT_H
 #define INPUT_H
 
-#include <c.h>
-#include <stdio.h>
-
 /*
  * If some other file needs to have access to readline/history, include this
  * file and save yourself all this work.
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index add2f77cfc1..c5b4a634779 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.8 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "large_obj.h"
 
-#include <stdio.h>
-#include <string.h>
-
-#include <libpq-fe.h>
-#include <postgres.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "variables.h"
diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h
index 17e1c81d6df..b8fcfde04db 100644
--- a/src/bin/psql/large_obj.h
+++ b/src/bin/psql/large_obj.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.7 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/large_obj.h,v 1.8 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef LARGE_OBJ_H
 #define LARGE_OBJ_H
 
-#include <c.h>
-
 bool		do_lo_export(const char *loid_arg, const char *filename_arg);
 bool		do_lo_import(const char *filename_arg, const char *comment_arg);
 bool		do_lo_unlink(const char *loid_arg);
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 1d5023925da..8d5f53087da 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.19 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.c,v 1.20 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "mainloop.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <pqexpbuffer.h>
+#include "pqexpbuffer.h"
 
 #include "settings.h"
 #include "prompt.h"
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index 0664ddfcafa..72d46d76dbd 100644
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.6 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/mainloop.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef MAINLOOP_H
 #define MAINLOOP_H
 
-#include <stdio.h>
-
 int MainLoop(FILE *source);
 
 #endif	 /* MAINLOOP_H */
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 8acc18827ac..82cb64b7cfe 100644
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.11 2000/02/09 16:23:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.12 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "print.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <math.h>
 #include <signal.h>
 #ifndef WIN32
@@ -20,9 +18,8 @@
 #define pclose(x) _pclose(x)
 #endif
 
-#include <pqsignal.h>
-#include <libpq-fe.h>
-#include <postgres_ext.h>		/* for Oid type */
+#include "pqsignal.h"
+#include "libpq-fe.h"
 
 #ifndef __CYGWIN__
 #define DEFAULT_PAGER "more"
diff --git a/src/bin/psql/print.h b/src/bin/psql/print.h
index 1098ff8e012..4706b8fba02 100644
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.6 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef PRINT_H
 #define PRINT_H
 
-#include <config.h>
-#include <c.h>
-
-#include <stdio.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 enum printFormat
 {
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 1149fd65abc..505f5fa8306 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -3,16 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.8 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.c,v 1.9 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "prompt.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "settings.h"
 #include "common.h"
diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h
index 61b4b9f543a..46d3dab93ba 100644
--- a/src/bin/psql/prompt.h
+++ b/src/bin/psql/prompt.h
@@ -3,13 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.6 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/prompt.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef PROMPT_H
 #define PROMPT_H
 
-#include <c.h>
-
 typedef enum _promptStatus
 {
 	PROMPT_READY,
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index af8171e7da5..d56b0c77e9b 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -3,18 +3,12 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/settings.h,v 1.8 2000/01/29 16:58:49 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/settings.h,v 1.9 2000/02/16 13:15:26 momjian Exp $
  */
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <c.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <libpq-fe.h>
-#include <postgres_ext.h>
+#include "libpq-fe.h"
 
 #include "variables.h"
 #include "print.h"
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 2905e721449..ccb5f477e65 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -3,14 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.23 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.24 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 
 #include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 
 #ifndef WIN32
 #include <unistd.h>
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index a0d3769fd23..95b05010273 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -3,18 +3,15 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.24 2000/02/07 23:10:06 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.25 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "stringutils.h"
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
 #include <assert.h>
-#include <stdio.h>
 
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 
 
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 8f8c2fad8c7..83e3041fd94 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.11 2000/02/15 20:49:22 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.12 2000/02/16 13:15:26 momjian Exp $
  */
 
 /*-----------
@@ -32,7 +32,7 @@
     gracefully.
 -------------*/
 
-#include <c.h>
+#include "postgres.h"
 #include "tab-complete.h"
 
 #include "input.h"
@@ -40,15 +40,12 @@
 /* If we don't have this, we might as well forget about the whole thing: */
 #ifdef USE_READLINE
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h> /* toupper */
-#include <stdlib.h> /* malloc, free */
 #ifdef USE_ASSERT_CHECKING
 #include <assert.h>
 #endif
 
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 #include "common.h"
 #include "settings.h"
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index e7d67d6dc58..667066cbfd8 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -3,12 +3,11 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/variables.c,v 1.6 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/variables.c,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
-#include <c.h>
+#include "postgres.h"
 #include "variables.h"
 
-#include <stdlib.h>
 #include <assert.h>
 
 
diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h
index 521efc51dde..d0f01a7d791 100644
--- a/src/bin/psql/variables.h
+++ b/src/bin/psql/variables.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.6 2000/02/13 21:45:14 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/variables.h,v 1.7 2000/02/16 13:15:26 momjian Exp $
  */
 
 /*
@@ -14,7 +14,6 @@
 
 #ifndef VARIABLES_H
 #define VARIABLES_H
-#include <c.h>
 
 #define VALID_VARIABLE_CHARS "abcdefghijklmnopqrstuvwxyz"\
                              "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789_"
-- 
GitLab