diff --git a/src/bin/pg_id/pg_id.c b/src/bin/pg_id/pg_id.c
index 59c86eeb9aef6816a8619becbacf52917d99ae23..b118e5e2078e2c6beed44779bd261ed662ebab05 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 ba198d7d914665d3f5297bbb9c05e190231df9e8..a4353124cc31267002533fcf14216cae73a7389e 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 65431e9c9ecbde3f878e41d36945b3aa917d615b..4fcbf61fcedbc912ce47608a7f919de29cda5684 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 49249c27db69b7c6f8a8bd65e046bae96ef0b49b..340f053bdf5bc5df770d5a80de1e5f486d2ca718 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 b4b7d93abe9d170d209cba3925cd20f313a54c96..af6f04965da4e216c88c2f2e583267e43b34d575 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 d2d638c066471c4a64cb2c29b435f617a0bde610..b0bba40889e2c63b824e470b1145ff6099feb196 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 8a57e7a66d3870e1ebb289a6374d6977a502ecd6..cf36d324c0a80015b88f5c70b25fcc916589b4c7 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 6ab7c2f519e082bbb2564c672d60b1bcf9f308d7..0282906064c2e05f56beb9de70038d713e05eb68 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 36f4ceca4ea6a7bec8425601ab9be533deb4ba61..673f3fe48656a02ebf2bdf143b1e7c3fffc06cee 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 ac252086d429a8b653dbba60bc36aeb313d8b0de..63e4bda5d74d3eb5d50e24edab94cfd9f8c6d126 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 cbd9a81488fa90c70b5d1cc450b9ce044cd61c5d..47fed65b410aca357d0da711276c8281dcde79eb 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 560d5b2c382fd2722d832a2ad58e40227aec16b2..6d05370d21a498a06c676f003a4ec99c3c62d30d 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 d12b45bfa3058bfcf19b47bd606ad5ff5e96184a..e539ba291459a11901069c1bd5554712f2b78498 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 add2f77cfc15fc4af5ef9e4519153da76137ffae..c5b4a63477973407a2f684591652b8626ac7b82f 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 17e1c81d6dfd71970b41ebf5330b89a53b1044eb..b8fcfde04dbfada8da24bf0642369e8339020966 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 1d5023925da2abe50679a1f0f11317e849646447..8d5f53087da5cea41617d9c100cbf2f3728e0ce3 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 0664ddfcafad211bab959d980577c87f2c1bc155..72d46d76dbd935eceaea32b9a3829bbe39f54699 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 8acc18827ac7ffcee6bc257f1858178326b65010..82cb64b7cfef0e66d6d67256bf9202419ee6077e 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 1098ff8e012c5c783fabb09a4190bdb3cb2cde82..4706b8fba02e77c25ce9e441bc88e7a85e0794b6 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 1149fd65abcbcbc734dc00be68ff59ca3a752bd8..505f5fa8306381fe14abe675bbbc5ac74bcaaf9d 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 61b4b9f543aabb63daafe94ab6b0dadf9e68f90d..46d3dab93ba76db850b4fe4f00a3ccb779af0cad 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 af8171e7da526fe241ef5df55a51f6beb56a5656..d56b0c77e9b211885321faf280d9006136341016 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 2905e721449ee324b51a01cbf9278a6c5d2bdb42..ccb5f477e65e7737ca5432d309cbec35514cd9d8 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 a0d3769fd231eded14dec29f66e7b22648b7c127..95b0501027377beda4b6739816c0d70662a74660 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 8f8c2fad8c7dd0c94a1cb85e02c3ce529727d9f3..83e3041fd942209c4b73aa8e3a125ed65402e737 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 e7d67d6dc58c825520760a5366ef0e0a58f4058d..667066cbfd858b22dae860ba36d2bb4e2fcb006f 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 521efc51dde577ed9ad29f48fe4d0539cd82cbe5..d0f01a7d79174c577c44825d9352747f24ab6811 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_"