From ae643747b16a6ffed88323338dcd3b7ed918e3d0 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 14 Jul 2006 05:28:29 +0000
Subject: [PATCH] Fix a passel of recently-committed violations of the rule
 'thou shalt have no other gods before c.h'.  Also remove some demonstrably
 redundant #include lines, mostly of <errno.h> which was added to c.h years
 ago.

---
 contrib/btree_gist/btree_numeric.c          | 3 ++-
 contrib/btree_gist/btree_utils_num.h        | 4 ++--
 contrib/btree_gist/btree_utils_var.c        | 3 ++-
 contrib/btree_gist/btree_utils_var.h        | 4 ++--
 contrib/chkpass/chkpass.c                   | 4 +---
 contrib/fuzzystrmatch/dmetaphone.c          | 8 ++++----
 contrib/pg_trgm/trgm.h                      | 2 --
 contrib/tsearch2/common.c                   | 1 -
 contrib/tsearch2/gendict/dict_snowball.c.IN | 5 +----
 contrib/tsearch2/gendict/dict_tmpl.c.IN     | 6 +-----
 contrib/tsearch2/ispell/regis.c             | 4 ----
 contrib/tsearch2/ispell/spell.c             | 7 ++-----
 contrib/tsearch2/ispell/spell.h             | 4 +++-
 src/backend/executor/nodeSubplan.c          | 6 +++---
 src/backend/libpq/auth.c                    | 3 +--
 src/backend/libpq/pqcomm.c                  | 3 +--
 src/backend/libpq/pqformat.c                | 3 +--
 src/backend/port/dynloader/aix.c            | 1 -
 src/backend/port/ipc_test.c                 | 3 +--
 src/backend/port/posix_sema.c               | 3 +--
 src/backend/port/sysv_sema.c                | 3 +--
 src/backend/port/sysv_shmem.c               | 3 +--
 src/backend/port/win32/shmem.c              | 5 +----
 src/backend/storage/file/buffile.c          | 4 +---
 src/backend/storage/freespace/freespace.c   | 3 +--
 src/backend/storage/ipc/ipc.c               | 3 +--
 src/backend/storage/smgr/md.c               | 3 +--
 src/backend/utils/adt/datetime.c            | 3 +--
 src/backend/utils/adt/float.c               | 3 +--
 src/backend/utils/adt/numeric.c             | 3 +--
 src/backend/utils/adt/pg_lzcompress.c       | 3 +--
 src/backend/utils/adt/tid.c                 | 3 +--
 src/bin/psql/help.c                         | 3 +--
 src/bin/psql/mainloop.h                     | 3 +--
 src/interfaces/ecpg/ecpglib/error.c         | 4 +---
 src/interfaces/ecpg/ecpglib/execute.c       | 3 +--
 src/interfaces/ecpg/preproc/pgc.l           | 3 +--
 src/interfaces/libpq/fe-misc.c              | 3 +--
 src/interfaces/libpq/fe-protocol2.c         | 3 +--
 src/timezone/pgtz.c                         | 3 +--
 40 files changed, 48 insertions(+), 93 deletions(-)

diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index a6a03c8995..639b575cb3 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -1,7 +1,8 @@
+#include "btree_gist.h"
+
 #include <math.h>
 #include <float.h>
 
-#include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/builtins.h"
 #include "utils/numeric.h"
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 1ea022e90f..dcaa94bbee 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -1,11 +1,11 @@
 #ifndef __BTREE_UTILS_NUM_H__
 #define __BTREE_UTILS_NUM_H__
 
+#include "btree_gist.h"
+
 #include <math.h>
 #include <float.h>
 
-#include "btree_gist.h"
-
 typedef char GBT_NUMKEY;
 
 /* Better readable key */
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 1a6f1fdadf..1f5ea12692 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -1,8 +1,9 @@
+#include "btree_gist.h"
+
 #include <math.h>
 #include <limits.h>
 #include <float.h>
 
-#include "btree_gist.h"
 #include "btree_utils_var.h"
 #include "utils/pg_locale.h"
 #include "utils/builtins.h"
diff --git a/contrib/btree_gist/btree_utils_var.h b/contrib/btree_gist/btree_utils_var.h
index 21a6cbd8e2..0c723e91ac 100644
--- a/contrib/btree_gist/btree_utils_var.h
+++ b/contrib/btree_gist/btree_utils_var.h
@@ -1,10 +1,10 @@
 #ifndef __BTREE_UTILS_VAR_H__
 #define __BTREE_UTILS_VAR_H__
 
-#include "mb/pg_wchar.h"
-
 #include "btree_gist.h"
 
+#include "mb/pg_wchar.h"
+
 /* Variable length key */
 typedef bytea GBT_VARKEY;
 
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
index 04591bd154..0842291eaf 100644
--- a/contrib/chkpass/chkpass.c
+++ b/contrib/chkpass/chkpass.c
@@ -4,14 +4,12 @@
  * darcy@druid.net
  * http://www.druid.net/darcy/
  *
- * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.16 2006/05/30 22:12:12 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/chkpass/chkpass.c,v 1.17 2006/07/14 05:28:27 tgl Exp $
  * best viewed with tabs set to 4
  */
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <unistd.h>
 #ifdef HAVE_CRYPT_H
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 3fe247e922..ee1944c393 100644
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -1,7 +1,7 @@
 /*
  * This is a port of the Double Metaphone algorithm for use in PostgreSQL.
  *
- * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.7 2006/03/11 04:38:29 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/fuzzystrmatch/dmetaphone.c,v 1.8 2006/07/14 05:28:27 tgl Exp $
  *
  * Double Metaphone computes 2 "sounds like" strings - a primary and an
  * alternate. In most cases they are the same, but for foreign names
@@ -50,8 +50,8 @@
 
 
 /*
- * $Revision: 1.7 $
- * $Id: dmetaphone.c,v 1.7 2006/03/11 04:38:29 momjian Exp $
+ * $Revision: 1.8 $
+ * $Id: dmetaphone.c,v 1.8 2006/07/14 05:28:27 tgl Exp $
  */
 
 
@@ -106,8 +106,8 @@ The remaining code is authored by Andrew Dunstan <amdunstan@ncshp.org> and
 #ifndef DMETAPHONE_MAIN
 
 #include "postgres.h"
+
 #include "fmgr.h"
-#include "utils/elog.h"
 
 /* turn off assertions for embedded function */
 #define NDEBUG
diff --git a/contrib/pg_trgm/trgm.h b/contrib/pg_trgm/trgm.h
index d6ba040505..b7674c52b5 100644
--- a/contrib/pg_trgm/trgm.h
+++ b/contrib/pg_trgm/trgm.h
@@ -6,8 +6,6 @@
 #include "access/gist.h"
 #include "access/itup.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "storage/bufpage.h"
 
 /* options */
diff --git a/contrib/tsearch2/common.c b/contrib/tsearch2/common.c
index 35fb9ffcb8..6192821344 100644
--- a/contrib/tsearch2/common.c
+++ b/contrib/tsearch2/common.c
@@ -1,6 +1,5 @@
 #include "postgres.h"
 
-#include "postgres.h"
 #include "fmgr.h"
 #include "catalog/pg_namespace.h"
 #include "catalog/pg_proc.h"
diff --git a/contrib/tsearch2/gendict/dict_snowball.c.IN b/contrib/tsearch2/gendict/dict_snowball.c.IN
index 6a0fce9a3e..7136ee19dd 100644
--- a/contrib/tsearch2/gendict/dict_snowball.c.IN
+++ b/contrib/tsearch2/gendict/dict_snowball.c.IN
@@ -1,13 +1,10 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_snowball.c.IN,v 1.4 2006/03/11 04:38:30 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_snowball.c.IN,v 1.5 2006/07/14 05:28:27 tgl Exp $ */
 
 /* 
  * example of Snowball dictionary
  * http://snowball.tartarus.org/ 
  * Teodor Sigaev <teodor@sigaev.ru>
  */
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"
diff --git a/contrib/tsearch2/gendict/dict_tmpl.c.IN b/contrib/tsearch2/gendict/dict_tmpl.c.IN
index 694b7363e0..a47720aa10 100644
--- a/contrib/tsearch2/gendict/dict_tmpl.c.IN
+++ b/contrib/tsearch2/gendict/dict_tmpl.c.IN
@@ -1,13 +1,9 @@
-/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_tmpl.c.IN,v 1.5 2006/03/11 04:38:30 momjian Exp $ */
+/* $PostgreSQL: pgsql/contrib/tsearch2/gendict/dict_tmpl.c.IN,v 1.6 2006/07/14 05:28:27 tgl Exp $ */
 
 /* 
  * example of dictionary 
  * Teodor Sigaev <teodor@sigaev.ru>
  */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "postgres.h"
 
 #include "dict.h"
diff --git a/contrib/tsearch2/ispell/regis.c b/contrib/tsearch2/ispell/regis.c
index 20b6bddecf..4be863431d 100644
--- a/contrib/tsearch2/ispell/regis.c
+++ b/contrib/tsearch2/ispell/regis.c
@@ -1,7 +1,3 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "regis.h"
 #include "ts_locale.h"
 #include "common.h"
diff --git a/contrib/tsearch2/ispell/spell.c b/contrib/tsearch2/ispell/spell.c
index 28f38eefd3..4e199f4bc0 100644
--- a/contrib/tsearch2/ispell/spell.c
+++ b/contrib/tsearch2/ispell/spell.c
@@ -1,10 +1,7 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #include "postgres.h"
 
+#include <ctype.h>
+
 #include "spell.h"
 #include "common.h"
 #include "ts_locale.h"
diff --git a/contrib/tsearch2/ispell/spell.h b/contrib/tsearch2/ispell/spell.h
index fe79888bf3..5734881947 100644
--- a/contrib/tsearch2/ispell/spell.h
+++ b/contrib/tsearch2/ispell/spell.h
@@ -1,9 +1,11 @@
 #ifndef __SPELL_H__
 #define __SPELL_H__
 
+#include "c.h"
+
 #include <sys/types.h>
+
 #include "regex/regex.h"
-#include "c.h"
 
 #include "regis.h"
 #include "dict.h"
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index 528408aae6..a4fa759250 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.77 2006/07/13 16:49:15 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.78 2006/07/14 05:28:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,10 +17,10 @@
  *		ExecInitSubPlan - initialize a subselect
  *		ExecEndSubPlan	- shut down a subselect
  */
-#include <math.h>
-
 #include "postgres.h"
 
+#include <math.h>
+
 #include "access/heapam.h"
 #include "executor/executor.h"
 #include "executor/nodeSubplan.h"
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index bc708a4509..45b87f9716 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.137 2006/07/13 16:49:15 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.138 2006/07/14 05:28:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 #if defined(HAVE_STRUCT_CMSGCRED) || defined(HAVE_STRUCT_FCRED) || defined(HAVE_STRUCT_SOCKCRED)
 #include <sys/uio.h>
 #include <sys/ucred.h>
-#include <errno.h>
 #endif
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index a7700370e0..de672cc868 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.185 2006/07/13 16:49:15 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.186 2006/07/14 05:28:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -66,7 +66,6 @@
 #include "postgres.h"
 
 #include <signal.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
 #include <unistd.h>
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index aead05bbde..0a2589fdb4 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -24,7 +24,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/libpq/pqformat.c,v 1.41 2006/03/05 15:58:27 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/libpq/pqformat.c,v 1.42 2006/07/14 05:28:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -69,7 +69,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 3ace7fc391..64aca56ee2 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -6,7 +6,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
 #include "sys/ldr.h"
 #include <a.out.h>
 #include "ldfcn.h"
diff --git a/src/backend/port/ipc_test.c b/src/backend/port/ipc_test.c
index 1ac75daa71..46d507ccce 100644
--- a/src/backend/port/ipc_test.c
+++ b/src/backend/port/ipc_test.c
@@ -21,13 +21,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.20 2006/03/05 15:58:34 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/ipc_test.c,v 1.21 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <unistd.h>
 
 #include "miscadmin.h"
diff --git a/src/backend/port/posix_sema.c b/src/backend/port/posix_sema.c
index 90584aa6b6..2f0c84c1a0 100644
--- a/src/backend/port/posix_sema.c
+++ b/src/backend/port/posix_sema.c
@@ -11,13 +11,12 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/posix_sema.c,v 1.16 2006/03/05 15:58:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/posix_sema.c,v 1.17 2006/07/14 05:28:27 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index 0fc4e500e6..74620d8f1f 100644
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -8,13 +8,12 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/sysv_sema.c,v 1.19 2006/03/05 15:58:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/sysv_sema.c,v 1.20 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index f58ae55830..f3ff878db6 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -10,13 +10,12 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.46 2006/03/05 15:58:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/sysv_shmem.c,v 1.47 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/file.h>
diff --git a/src/backend/port/win32/shmem.c b/src/backend/port/win32/shmem.c
index cbc02d4b83..6f7a661d4e 100644
--- a/src/backend/port/win32/shmem.c
+++ b/src/backend/port/win32/shmem.c
@@ -6,16 +6,13 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/port/win32/shmem.c,v 1.12 2006/03/05 15:58:35 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/port/win32/shmem.c,v 1.13 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include <stdio.h>
-#include <errno.h>
-
 static DWORD s_segsize = 0;
 
 /* Detach from a shared mem area based on its address */
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index 969ffd3065..7609628434 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/file/buffile.c,v 1.23 2006/03/05 15:58:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/file/buffile.c,v 1.24 2006/07/14 05:28:28 tgl Exp $
  *
  * NOTES:
  *
@@ -34,8 +34,6 @@
 
 #include "postgres.h"
 
-#include <errno.h>
-
 #include "storage/fd.h"
 #include "storage/buffile.h"
 
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index 0ae3ef6319..6ddcfecc66 100644
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.52 2006/03/05 15:58:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/freespace/freespace.c,v 1.53 2006/07/14 05:28:28 tgl Exp $
  *
  *
  * NOTES:
@@ -58,7 +58,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <limits.h>
 #include <math.h>
 #include <unistd.h>
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index a90722520c..515e2da067 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -13,13 +13,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/ipc/ipc.c,v 1.93 2006/03/05 15:58:37 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/ipc/ipc.c,v 1.94 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <unistd.h>
 
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 95e81f1a4c..928b64410e 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.120 2006/03/05 15:58:39 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/smgr/md.c,v 1.121 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/file.h>
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index c02ae2a172..b5478ac337 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.167 2006/06/07 22:32:31 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.168 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <math.h>
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 132e6a11e4..f395b61e88 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.125 2006/06/07 22:24:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/float.c,v 1.126 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,6 @@
 #include "postgres.h"
 
 #include <ctype.h>
-#include <errno.h>
 #include <float.h>
 #include <math.h>
 #include <limits.h>
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 1407ad8662..fb15a6222f 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -14,7 +14,7 @@
  * Copyright (c) 1998-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.93 2006/03/10 20:15:26 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/numeric.c,v 1.94 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,6 @@
 #include <float.h>
 #include <limits.h>
 #include <math.h>
-#include <errno.h>
 
 #include "catalog/pg_type.h"
 #include "libpq/pqformat.h"
diff --git a/src/backend/utils/adt/pg_lzcompress.c b/src/backend/utils/adt/pg_lzcompress.c
index dc3708deb3..962d6edaaa 100644
--- a/src/backend/utils/adt/pg_lzcompress.c
+++ b/src/backend/utils/adt/pg_lzcompress.c
@@ -1,7 +1,7 @@
 /* ----------
  * pg_lzcompress.c -
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/pg_lzcompress.c,v 1.21 2005/11/22 18:17:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/pg_lzcompress.c,v 1.22 2006/07/14 05:28:28 tgl Exp $
  *
  *		This is an implementation of LZ compression for PostgreSQL.
  *		It uses a simple history table and generates 2-3 byte tags
@@ -175,7 +175,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <errno.h>
 
 #include "utils/pg_lzcompress.h"
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index d44f5aa372..658108f56c 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.52 2006/03/05 15:58:44 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tid.c,v 1.53 2006/07/14 05:28:28 tgl Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -17,7 +17,6 @@
  */
 #include "postgres.h"
 
-#include <errno.h>
 #include <math.h>
 #include <limits.h>
 
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 6bc0b73d08..d5a5230a8a 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.111 2006/06/11 23:06:00 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/help.c,v 1.112 2006/07/14 05:28:28 tgl Exp $
  */
 #include "postgres_fe.h"
 #include "common.h"
@@ -12,7 +12,6 @@
 #include "help.h"
 
 #include <signal.h>
-#include <errno.h>
 
 #ifndef WIN32
 #ifdef HAVE_PWD_H
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index eedb48f3e7..90814c30a7 100644
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -3,13 +3,12 @@
  *
  * Copyright (c) 2000-2006, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/mainloop.h,v 1.19 2006/06/14 16:49:02 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/mainloop.h,v 1.20 2006/07/14 05:28:28 tgl Exp $
  */
 #ifndef MAINLOOP_H
 #define MAINLOOP_H
 
 #include "postgres_fe.h"
-#include <stdio.h>
 
 int			MainLoop(FILE *source);
 
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index df131ffa69..935452b46d 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -1,10 +1,8 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.12 2006/03/17 15:46:13 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/error.c,v 1.13 2006/07/14 05:28:28 tgl Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
 
-#include <stdio.h>
-
 #include "ecpgerrno.h"
 #include "ecpgtype.h"
 #include "ecpglib.h"
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 348b652f8a..e2bd5a68f3 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.51 2006/07/05 10:49:56 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.52 2006/07/14 05:28:28 tgl Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -16,7 +16,6 @@
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
 
-#include <stdio.h>
 #include <locale.h>
 
 #include "pg_type.h"
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index a835a1da69..ee20840581 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.146 2006/05/11 19:15:36 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.147 2006/07/14 05:28:28 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,7 +21,6 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
-#include <errno.h>
 
 #include "extern.h"
 
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 011e57120c..2c76dfdde3 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -23,14 +23,13 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.128 2006/06/07 22:24:46 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.129 2006/07/14 05:28:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres_fe.h"
 
-#include <errno.h>
 #include <signal.h>
 #include <time.h>
 
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index 3cd5be70c9..101d9595f7 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.24 2006/07/14 04:59:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-protocol2.c,v 1.25 2006/07/14 05:28:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres_fe.h"
 
-#include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 65de3c0dfc..8d369695cc 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.42 2006/07/14 04:59:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.43 2006/07/14 05:28:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,6 @@
 #include "storage/fd.h"
 #include "tzfile.h"
 #include "utils/datetime.h"
-#include "utils/elog.h"
 #include "utils/guc.h"
 #include "utils/hsearch.h"
 
-- 
2.40.0