Move some system includes into c.h, and remove duplicates.

author: Bruce Momjian 1999-07-17 20:18:55 +0000
committer: Bruce Momjian 1999-07-17 20:18:55 +0000
commit: 161fd6f1cda4c5147a01ad4aff877dd94824da4a (patch)
tree: d65f72031d8bb037c88d2caa67430a61f3cd3982
parent: ce88aa654d517409882e967eada6dd732d7ffb7b (diff)
262 files changed, 30 insertions, 648 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 3a122ae1a1..8446d4d830 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -22,12 +22,6 @@
 #include "access/heapam.h"
 #include "catalog/pg_type.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
-
 /* Used by heap_getattr() macro, for speed */
 long		heap_sysoffset[] = {
 /* Only the first one is pass-by-ref, and is handled specially in the macro */
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index eaef82005a..c5077a0e50 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -19,11 +19,6 @@
 #include "access/itup.h"
 #include "catalog/pg_type.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *				  index_ tuple interface routines
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index 4505e44023..3162f929be 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -13,7 +13,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index a0418bcc59..e69a409fdc 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -16,8 +16,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
@@ -26,11 +24,6 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *		CreateTemplateTupleDesc
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 8dab9755cc..0e4263b80e 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -22,11 +22,6 @@
 #include "executor/executor.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* non-export function prototypes */
 static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index f35a0f7cd3..fc18377a94 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -16,11 +16,6 @@
 #include "access/gist.h"
 #include "executor/execdebug.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n,
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index c455309443..e7a864985a 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -16,11 +16,6 @@
 #include "access/gist.h"
 #include "access/gistscan.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* routines defined and used here */
 static void gistregscan(IndexScanDesc s);
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 997d8f4cd4..56d3c0fb98 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -24,11 +24,6 @@
 #include "executor/executor.h"
 #include "miscadmin.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 bool		BuildingHash = false;
 
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 0a4d7fb40f..4a4c103fbf 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -18,11 +18,6 @@
 
 #include "access/hash.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static OverflowPageAddress _hash_getovfladdr(Relation rel, Buffer *metabufp);
 static uint32 _hash_firstfreebit(uint32 map);
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 554e7ac0e4..399f29ee09 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -29,11 +29,6 @@
 #include "access/hash.h"
 #include "miscadmin.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static void _hash_setpagelock(Relation rel, BlockNumber blkno, int access);
 static void _hash_unsetpagelock(Relation rel, BlockNumber blkno, int access);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 8e5f236d1e..e46f742fa2 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -16,11 +16,6 @@
 
 #include "access/hash.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /*
  *	_hash_search() -- Finds the page/bucket that the contains the
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index ebc2e35f67..8860baaf7b 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -17,11 +17,6 @@
 #include "access/hash.h"
 #include "access/iqual.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 ScanKey
 _hash_mkscankey(Relation rel, IndexTuple itup, HashMetaPage metap)
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 80c0067318..ee2cc4a509 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -85,11 +85,6 @@
 #include "utils/inval.h"
 #include "utils/relcache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *						 heap support routines
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 70512da52d..e19bef9e3e 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -15,18 +15,12 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <time.h>
 
 #include "postgres.h"
 
 #include "access/heapam.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static void InitHeapAccessStatistics(void);
 
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 0203d2a3e7..f0bdf33941 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -47,11 +47,6 @@
 #include "postgres.h"
 #include "access/genam.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *		general access method routines
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 951d3661e9..63ec4c3aa0 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -20,7 +20,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index bf844106b6..e958987535 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -17,11 +17,6 @@
 #include "access/heapam.h"
 #include "access/nbtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static InsertIndexResult _bt_insertonpg(Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem afteritem);
 static Buffer _bt_split(Relation rel, Buffer buf, OffsetNumber firstright);
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index ba0702f4cf..239394d46b 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -19,15 +19,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <time.h>
 
 #include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #include "access/nbtree.h"
 #include "miscadmin.h"
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 44d76f4cf0..0a31db9e59 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -17,11 +17,6 @@
  */
 
 #include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #include "access/genam.h"
 #include "access/heapam.h"
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 4489bf0152..23695391d4 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -17,11 +17,6 @@
 #include "access/genam.h"
 #include "access/nbtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 static BTStack _bt_searchr(Relation rel, int keysz, ScanKey scankey,
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 33c85fa71f..88ee326848 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -53,11 +53,6 @@
 
 #include "access/nbtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #ifdef BTREE_BUILD_STATS
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 380579e059..64910dcb79 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -22,11 +22,6 @@
 extern int	NIndexTupleProcessed;
 
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 ScanKey
 _bt_mkscankey(Relation rel, IndexTuple itup)
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 70cb8b1f51..990b16d6a4 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -17,11 +17,6 @@
 #include "access/iqual.h"
 #include "access/rtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 35af87194c..9069739c4a 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -16,11 +16,6 @@
 
 #include "utils/builtins.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 BOX
 		   *
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 7a4286c35e..45d02c54fd 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -21,11 +21,6 @@
 #include "executor/executor.h"
 #include "utils/geo_decls.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 typedef struct SPLITVEC
 {
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 401def5a67..3317543adc 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -17,11 +17,6 @@
 #include "access/genam.h"
 #include "access/rtree.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 /* routines defined and used here */
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 77518c788e..49e8e3e51c 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -18,7 +18,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 
 #include "postgres.h"
 #include "access/xact.h"
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 9b5e285eb9..91068457ac 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -13,7 +13,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <time.h>
 
 #include "postgres.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 91ce973dff..5622650b80 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -13,13 +13,9 @@
  *-------------------------------------------------------------------------
  */
 #include <time.h>
-#include <string.h>
 
 #include "postgres.h"
 
-
-
-
 #include "access/attnum.h"
 #include "access/funcindex.h"
 #include "access/htup.h"
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index dc580ffaca..621c76cb36 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -13,10 +13,8 @@
  */
 #include <unistd.h>
 #include <time.h>
-#include <stdio.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <string.h>
 #ifdef __CYGWIN32__
 #include <getopt.h>
 #endif
@@ -39,10 +37,6 @@
 #include "utils/lsyscache.h"
 #include "utils/portal.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#endif
-
 #define ALLOC(t, c)		(t *)calloc((unsigned)(c), sizeof(t))
 #define FIRST_TYPE_OID 16		/* OID of the first type */
 
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index 16b35a11e4..73a05aeed3 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -14,7 +14,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index f1ce2b4462..da82bbce3d 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index ec8f3f6dc2..701aa9bf6b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -52,11 +52,6 @@
 #include "utils/syscache.h"
 #include "utils/temprel.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static void AddNewRelationTuple(Relation pg_class_desc,
 				  Relation new_rel_desc, Oid new_rel_oid, unsigned natts,
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 89af9e0529..93a881d744 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -19,11 +19,6 @@
  */
 #include "postgres.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #include "access/genam.h"
 #include "access/heapam.h"
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index f1b3b1a32b..7066077542 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -12,7 +12,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index dde0232e82..824b820849 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -21,11 +21,6 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------
  * AggregateCreate
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index 47c6d2a02e..22bfa6e224 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -26,11 +26,6 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static Oid OperatorGetWithOpenRelation(Relation pg_operator_desc,
 							const char *operatorName,
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 90bf96a773..7370a63918 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -28,11 +28,6 @@
 #include "utils/sets.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /* ----------------------------------------------------------------
  *		ProcedureCreate
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 657ca300f3..941f79e5c0 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -22,11 +22,6 @@
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static Oid TypeShellMakeWithOpenRelation(Relation pg_type_desc,
 							  char *typeName);
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index cab351fa38..28235e8c69 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -20,8 +20,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 7de6b653ac..e1bbfd2b36 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -78,7 +78,6 @@
 
 #include <unistd.h>
 #include <signal.h>
-#include <string.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 4964252145..d3e038424a 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -18,7 +18,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index fcc68a9b17..42ff4ab2be 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -20,7 +20,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 6aaa18c90a..7578a4e203 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -11,7 +11,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 713a667940..4bea080ca7 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 962712c319..bf9d745b13 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <signal.h>
 #include <sys/stat.h>
 
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 03bde72387..0d151f9d82 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -32,9 +32,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
 #include <math.h>
 
 #include "postgres.h"
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 25947ab909..b4d6766768 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -7,8 +7,6 @@
  *	  $Id$
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index c8db9422ba..8622f514b0 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 194333fbe9..21fde2af57 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -6,7 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index f15e356e11..9358532f40 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -24,11 +24,6 @@
 #include "utils/acl.h"
 #include "utils/syscache.h"
 
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 /*
  * RemoveOperator
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index 16cebadc25..261763c0bf 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -12,11 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #include "access/heapam.h"
 #include "catalog/catname.h"
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 548b3311a0..b7f959cd65 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -5,8 +5,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 35b3356de4..55f67711c7 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -5,7 +5,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index c342cf9591..325306c279 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -9,8 +9,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index be89ed930f..fb3ac244cd 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,6 @@
  */
 #include <sys/types.h>
 #include <sys/file.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 2ded6655f5..6116ce8702 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -6,8 +6,6 @@
  *
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <time.h>
 
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 330b78a5c9..6ebfb294ee 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -9,8 +9,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 24f334a128..c9afd549cb 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -24,7 +24,6 @@
  *		ExecCreatR		function to create temporary relations
  *
  */
-#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index 1f243587c6..2480191b84 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index ba886ea868..a5fc6a5291 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -30,7 +30,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 3602abb326..804e9d8f19 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -29,7 +29,6 @@
  *		instead of doing needless copying.	-cim 5/31/91
  *
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 549877ee8f..b6fe082eef 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -116,7 +116,6 @@
  *		and the TupleTableSlot node in execnodes.h.
  *
  */
-#include <string.h>
 
 #include "postgres.h"
 #include "executor/executor.h"
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 0a01c9ae76..2d7cf495e9 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -12,7 +12,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 45196dfdf6..fc95d2ce5b 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -15,7 +15,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index 04cac61d2b..821ac1d099 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -17,7 +17,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 8abe808afa..e8337c1897 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -19,9 +19,7 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
 #include <math.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "executor/execdebug.h"
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index 8bf843513b..9a80b65848 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <sys/types.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 056fa7f029..397e45867b 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 #include "executor/executor.h"
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index fb3e216c55..4e335f7255 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -22,7 +22,6 @@
  *		sorted order.
  *
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index 2247357e9b..e999522994 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -13,8 +13,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "lib/stringinfo.h"
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 438f1695ac..6fc1bfe73d 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -17,8 +17,6 @@
  *	   backend (postmaster) routines:
  *		be_recvauth				receive authentication information
  */
-#include <stdio.h>
-#include <string.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
 #ifndef  MAXHOSTNAMELEN
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index a6db7aa4f9..92aa8674db 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -27,7 +27,6 @@
  *		puts portals on the stack and the PQ functions remove them.
  *
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 0cd132748e..3fc030f433 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -33,7 +33,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index eab9acc670..64e5df3097 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -26,11 +26,6 @@
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 static char *strmake(char *str, int len);
 
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 42f35fc51c..c52f2608ac 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -14,9 +14,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
 
 #include "postgres.h"
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 781e5cfa68..d58d38e3fb 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -9,8 +9,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 #include <pwd.h>
 #include <sys/types.h>
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 7108deb53a..78980e1792 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -5,8 +5,8 @@
  *
  */
 
-#include <string.h>
 #include <unistd.h>
+
 #include "postgres.h"
 #ifdef HAVE_CRYPT_H
 #include "crypt.h"
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 34f4948de8..46c8670f97 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -50,8 +50,6 @@
  *		see utils/mmgr/portalmem.c for why. -cim 2/22/91
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 4e82df6a0f..1388fcf1ce 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -47,7 +47,6 @@
  *		see utils/mmgr/portalmem.c for why. -cim 2/22/91
  *
  */
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 373f4372df..2f77a44239 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -58,7 +58,6 @@
  *
  *------------------------
  */
-#include <stdio.h>
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -74,12 +73,6 @@
 
 #include "postgres.h"
 
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
 #include "libpq/libpq.h"
 #include "utils/trace.h" /* needed for HAVE_FCNTL_SETLK */
 #include "miscadmin.h"
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 99096e43a3..0b2ca7d04c 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -51,8 +51,8 @@
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
-#include <string.h>
 #ifdef HAVE_ENDIAN_H
+#include "endian.h"
 #endif
 
 #ifndef BYTE_ORDER
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index ab8aec278f..e910bd2a50 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -13,9 +13,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <unistd.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 96ba332169..dde94d062c 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -17,8 +17,6 @@
  *		PQuntrace		- turn off pqdebug() tracing
  */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "libpq/libpq.h"
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 68bea70312..ac35580315 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <unistd.h>
 
 #if defined(__alpha__) && !defined(linux)
@@ -22,6 +20,7 @@
 #include <sys/proc.h>
 #undef ASSEMBLER
 #endif
+
 #include "postgres.h"
 #ifdef USE_LOCALE
 #include <locale.h>
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 477694437d..5a3af439ac 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 4db54b24c0..37be0795ae 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 06e49b964e..97ab4331b6 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index d5882bc162..09f7da8486 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -21,7 +21,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdarg.h>
 #include "postgres.h"
 #include "nodes/parsenodes.h"
 
diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c
index c4f5f9ce45..a7c1eb78e2 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -15,7 +15,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 #include "nodes/nodes.h"
 
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index aa77582606..a9a50e8a2b 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -19,9 +19,8 @@
  *	  representation plus some other information (string length, etc.)
  *
  */
-#include <stdio.h>
-#include "postgres.h"
 
+#include "postgres.h"
 #include "access/heapam.h"
 #include "access/htup.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index ac2fb387b6..aae9b19d14 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -15,8 +15,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index 474180fd07..c9087f689f 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -16,8 +16,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "postgres.h"
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 74603a9874..4bad319dc0 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -22,9 +22,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <math.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 6bdc602d93..7895a5f322 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -19,7 +19,6 @@
  */
 
 
-#include <stdio.h>
 
 #include "postgres.h"
 #include "optimizer/geqo_misc.h"
diff --git a/src/backend/optimizer/geqo/geqo_params.c b/src/backend/optimizer/geqo/geqo_params.c
index 8de56e2b82..9c25c0d759 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -18,11 +18,9 @@
    =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=
  */
 
-#include <stdio.h>
 #include <time.h>
 #include <math.h>
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "miscadmin.h"
diff --git a/src/backend/optimizer/path/_deadcode/xfunc.c b/src/backend/optimizer/path/_deadcode/xfunc.c
index 03f94390af..0a069bf71d 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -16,7 +16,6 @@
 #include <math.h>
 
 #include <values.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 07ac81b845..90eaf5a7c4 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 77c36bba4c..39dcdeabc3 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 86e3970baa..0c13c49679 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <sys/types.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c
index 914779b4f6..9a8ef5da4f 100644
--- a/src/backend/optimizer/prep/prepkeyset.c
+++ b/src/backend/optimizer/prep/prepkeyset.c
@@ -7,8 +7,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "optimizer/planmain.h"
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index b48005cfd8..46023aa886 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -11,13 +11,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
-
-
-
-
 #include "catalog/pg_type.h"
 #include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index d2955ccb27..7251192db6 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -11,14 +11,10 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
 
-
-
-
 #include "optimizer/plancat.h"
 #include "optimizer/planmain.h"
 #include "optimizer/planner.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index ba4e73aac9..fcaafbd8b5 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -12,14 +12,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <math.h>
-#include "postgres.h"
-
-
-
-
 
+#include "postgres.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
@@ -29,11 +24,6 @@
 #include "optimizer/plancat.h"
 #include "parser/parsetree.h"
 #include "utils/syscache.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 static void IndexSelectivity(Oid indexrelid, Oid indrelid, int32 nIndexKeys,
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 39c0b0d47c..a0f327371a 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -10,10 +10,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index be5c1e78f6..1990663170 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -32,7 +32,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <ctype.h>
 
 #include "postgres.h"
diff --git a/src/backend/parser/keywords.c b/src/backend/parser/keywords.c
index d3508ce042..35e0536e28 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "nodes/parsenodes.h"
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 16d50e5eae..8a83e1afb0 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "catalog/pg_aggregate.h"
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index c8f234c2f1..5d5730167e 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "access/heapam.h"
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index e06345f6a0..b6b1aa4e03 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 5985ea5256..abb459a030 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "nodes/makefuncs.h"
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index cd92fd1e8b..71bf690f39 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index da43dc7ee5..ddd7572008 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "access/heapam.h"
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index d51a230744..5dab20189d 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 316bbbccf2..8e7212afaa 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "access/heapam.h"
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 2ab482c52f..3a0e973cad 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "nodes/makefuncs.h"
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 5b5a22c413..679d626aa3 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -11,10 +11,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
-
 #include "catalog/pg_type.h"
 #include "parser/parse_type.h"
 #include "utils/syscache.h"
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index f4f13f88d6..98839d4330 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -10,8 +10,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
 
 #include "postgres.h"
 #include "parser/analyze.h"
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 80342dfb69..29b6e18653 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -16,10 +16,7 @@
 #include <unistd.h>
 #ifndef __linux__
 #include <math.h>
-#else
-#include <stdlib.h>
-#endif /* __linux__ */
-#include <string.h>
+#endif
 #include <errno.h>
 
 #include "postgres.h"
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 90b5a35baf..ed5d7d10ec 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -14,7 +14,6 @@
  */
 
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "miscadmin.h"
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 3cac00d117..a8a833e84f 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -4,14 +4,12 @@
  * 30159 Hannover, Germany
  */
 
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include "sys/ldr.h"
 #include <a.out.h>
 #include "ldfcn.h"
+
 #include "postgres.h"
 #include "dynloader.h"
 
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index caf5bea95f..71ac793ef8 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -15,7 +15,6 @@
  *-------------------------------------------------------------------------
  */
 #ifdef PRE_BSDI_2_1
-#include <stdio.h>
 #include "postgres.h"
 
 extern char *pg_pathname;
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index d54c542ee5..a52f39a717 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -16,7 +16,6 @@
  *-------------------------------------------------------------------------
  */
 /* System includes */
-#include <stdio.h>
 #include <a.out.h>
 
 #include "postgres.h"
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 1c7259c5df..1212c91a0a 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -14,8 +14,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #ifdef HAVE_DLD_H
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index 48668e753f..281ba1d619 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -13,7 +13,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include "postgres.h"
 #include "dl.h"
 #include "fmgr.h"
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 5a46b55363..8f4c68f7f3 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -32,15 +32,12 @@
  * SUCH DAMAGE.
  */
 
-#include "postgres.h"
-
-
-#include <stdio.h>
-#include <stdarg.h>
-
 #include <sys/ioctl.h>
 #include <sys/param.h>
 
+#include "postgres.h"
+
+
 /*
  * We do all internal arithmetic in the widest available integer type,
  * here called long_long (or ulong_long for unsigned).
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 29d48accf2..340db29d88 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -49,8 +49,6 @@
 #endif	 /* !NO_UNISTD_H */
 
 #include <signal.h>
-#include <string.h>
-#include <stdlib.h>
 #include <time.h>
 
 
@@ -68,7 +66,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio.h>
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
diff --git a/src/backend/regex/retest.c b/src/backend/regex/retest.c
index b91d0ba232..aa49acff30 100644
--- a/src/backend/regex/retest.c
+++ b/src/backend/regex/retest.c
@@ -4,8 +4,6 @@
  * $Header$
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "postgres.h"
 #include "regex/regex.h"
 
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 7c358ab7c8..86a1d9e92c 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index e02634c446..a469001b07 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -10,13 +10,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
-
-
-
-
 #include "access/heapam.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index 45d01b30aa..3f3e5962a7 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -10,7 +10,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "optimizer/clauses.h"
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index f1ac76ba9e..6e3d63f030 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -12,12 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
-
-
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_rewrite.h"
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 0a5bb02923..8c34438fc0 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -13,7 +13,6 @@
  */
 #include <sys/types.h>
 #include <sys/file.h>
-#include <stdio.h>
 #include <math.h>
 #include <signal.h>
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 45b4aafab9..dd4c07caeb 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -42,8 +42,6 @@
  */
 #include <sys/types.h>
 #include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
 #include <math.h>
 #include <signal.h>
 
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index e6f4d21b87..24864f0912 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -23,7 +23,6 @@
  * Sync: all routines in this file assume that the buffer
  *		semaphore has been acquired by the caller.
  */
-#include <stdio.h>
 
 #include "postgres.h"
 #include "storage/bufmgr.h"
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 2deff2699e..8452092dbc 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -21,8 +21,6 @@
  */
 #include <sys/types.h>
 #include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
 #include <math.h>
 #include <signal.h>
 
diff --git a/src/backend/storage/buffer/s_lock.c b/src/backend/storage/buffer/s_lock.c
index 853151a544..d6041011c0 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <sys/time.h>
 #include <unistd.h>
 
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 508b1a91ae..de5a0db206 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -37,13 +37,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 337fb61975..753dcdad07 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -26,8 +26,6 @@
  */
 #include <sys/types.h>
 #include <sys/file.h>
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 
 
@@ -42,7 +40,6 @@
 #include "utils/trace.h"
 
 #if defined(solaris_sparc)
-#include <string.h>
 #include <sys/ipc.h>
 #endif
 
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 312496219b..00db8c22cb 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 7585bc348a..bece6c905a 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -57,8 +57,6 @@
  *	shmem index.
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "storage/proc.h"
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 0058b4558d..0d9813bcc1 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -22,7 +22,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
+
 #include "postgres.h"
 #include "storage/shmem.h"
 
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 4fecd8af9d..042c1dd623 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
 
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 77227c24da..f81800252a 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -13,8 +13,6 @@
  *-------------------------------------------------------------------------
  */
 #include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index e28487d0e4..2f8cd5324e 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -18,14 +18,8 @@
 #define LOCKDEBUG		1
 #endif	 /* LOCKDEBUGALL */
 
-#include <string.h>
 
 #include "postgres.h"
-
-
-
-
-
 #include "access/transam.h"
 #include "catalog/catalog.h"
 
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 0cd08d1bd7..559c3a7379 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -29,8 +29,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/src/backend/storage/lmgr/multi.c b/src/backend/storage/lmgr/multi.c
index 71813ace74..d7a88a18d0 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -20,8 +20,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include "postgres.h"
 
 #include "miscadmin.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 512e0dae49..f2ab4ff469 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -50,7 +50,6 @@
  */
 #include <sys/time.h>
 #include <unistd.h>
-#include <string.h>
 #include <signal.h>
 #include <sys/types.h>
 
diff --git a/src/backend/storage/lmgr/single.c b/src/backend/storage/lmgr/single.c
index 4ec02fefcd..18e318d3b7 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -17,7 +17,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 901c2a9ea9..c80796731e 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/types.h>
 #include <sys/file.h>
 
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 49897e2369..c46688d69e 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -12,8 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <unistd.h>
-#include <stdio.h>
-#include <string.h>
 #include <fcntl.h>
 #include <sys/file.h>
 
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index a9fb019c0a..a2196605f4 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -14,7 +14,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "storage/smgr.h"
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index d37789cb04..8ed09b23c6 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "storage/smgr.h"
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 1aa67eb8d6..6280d4c72d 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -32,8 +32,6 @@
  *		versa --- so I think I'll just leave 'em alone for now.  tgl 1/99.
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 9e5b662e0c..f8e85070e9 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -57,7 +57,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index f4563b7a63..9bd0557d60 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -17,8 +17,6 @@
  */
 
 #include <unistd.h>
-#include <stdio.h>
-#include <string.h>
 #include <signal.h>
 #include <time.h>
 #include <sys/time.h>
@@ -1496,7 +1494,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.124 $ $Date: 1999/07/16 05:23:18 $\n");
+		puts("$Revision: 1.125 $ $Date: 1999/07/17 20:17:51 $\n");
 	}
 
 	/* ----------------
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index f897fa4424..b8c4e4084e 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index c0a0205f2a..520e260551 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -16,7 +16,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdlib.h>
 #include "postgres.h"
 
 #include "catalog/catalog.h"
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index d50c3ba8a2..c5ebbbdf8a 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 #include "postgres.h"
 
 #include "catalog/catalog.h"
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index b07c5efa0d..ec65adf56e 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -13,9 +13,6 @@
  */
 
 #include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index 09a7c856b4..3ea29bfafd 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 #include "postgres.h"
 
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index 46f3bcc939..32a57e17d6 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -12,8 +12,6 @@
  * $Header$
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <limits.h>
 #include <ctype.h>
 #include <locale.h>
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index e17ea08c7b..0fb3d036f3 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -12,8 +12,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>				/* for sprintf() */
-#include <string.h>
 #include "postgres.h"
 #include "utils/builtins.h"
 
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index e1852d38c3..7a6be85467 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -15,11 +15,6 @@
 #include <fcntl.h>
 
 #include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
-#else
-#include <string.h>
-#endif
 
 #include "catalog/pg_type.h"
 #include "fmgr.h"
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index aa2cb0ec78..5fe849379a 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -24,11 +24,9 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <stdio.h>
 #include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <string.h>
 
 #include "postgres.h"
 #ifdef HAVE_FLOAT_H
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index c7834033db..74c75630ce 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <limits.h>
 
 #include "postgres.h"
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index d0e76b7d21..78789b3217 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -27,7 +27,6 @@
  * particular instance of the type and about its value.
  *
  */
-#include <string.h>
 #include "postgres.h"
 #include "utils/datum.h"
 
diff --git a/src/backend/utils/adt/dt.c b/src/backend/utils/adt/dt.c
index 54585b8c10..e688068216 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -11,12 +11,11 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <ctype.h>
 #include <math.h>
-#include <string.h>
 #include <sys/types.h>
 #include <errno.h>
+
 #include "postgres.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index 31bdad7c00..8d81ff4452 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -12,8 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-#include <stdio.h>
 #include <pwd.h>
 
 #include <sys/param.h>
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 45ee85416f..46f662ceb4 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -45,10 +45,7 @@
  *		 for calls to pow(), exp() since on some machines (my Linux box
  *		 included) these routines do not set errno. - tgl 97/05/10
  */
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <errno.h>
 
 #include <float.h>				/* faked on sunos4 */
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 6d00819b00..f4bd4fa389 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -14,9 +14,6 @@
 #include <math.h>
 #include <limits.h>
 #include <float.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "postgres.h"
diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c
index 5b18c24755..f2324ed036 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -26,9 +26,6 @@ static const char rcsid[] = "$Id$";
 #include <arpa/inet.h>
 
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index 0114690252..46c75ea108 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -28,9 +28,6 @@ static const char rcsid[] = "$Id$";
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index af36e073ea..5f3e3688c4 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -28,8 +28,6 @@
  * XXX makes massive and possibly unwarranted type promotion assumptions.
  * fix me when we figure out what we want to do about ANSIfication...
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #ifdef HAVE_LIMITS_H
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 1c930fb5fa..2e5e4ebf77 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -5,9 +5,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <time.h>
 #include <math.h>
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 9d13b2c42a..73115522f2 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -17,7 +17,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
@@ -110,7 +109,7 @@ textnlike(struct varlena * s, struct varlena * p)
 }
 
 
-/*	$Revision: 1.29 $
+/*	$Revision: 1.30 $
 **	"like.c" A first attempt at a LIKE operator for Postgres95.
 **
 **	Originally written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 6ba837e6ab..613599a3a1 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -4,8 +4,6 @@
  *	$Id$
  */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 387f013bd6..6cad0c812d 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,9 +7,7 @@
  *	  $Id$
  *
  */
-#include <stdio.h>
 #include <ctype.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 013bec6b16..19392c6979 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -15,7 +15,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 #include "utils/builtins.h"
 
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index c7ac726bf6..05f7a68288 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -10,8 +10,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <errno.h>
 
 #include <netinet/in.h>
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 376ba98b98..e03e8ccd7f 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -22,8 +22,7 @@
  * columns are ******REALLY****** implemented!!!!!!!!!!!
  *
  */
-#include <stdio.h>
-#include <string.h>
+
 #include "postgres.h"
 #include "access/heapam.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 30c904664f..0c5d37cf44 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -10,9 +10,6 @@
  * ----------
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <float.h>
 #include <math.h>
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 1e82d42ef2..e748499e43 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -14,7 +14,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <errno.h>
 #include <math.h>
 
@@ -22,11 +21,6 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 #include "utils/builtins.h"
 
 #ifndef INT_MAX
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 5525d67b05..736ad9eeca 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -12,8 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index ffc11f7ffa..79d9f7b0c4 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -27,7 +27,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index e078f29e0a..baf97b7097 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/genam.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index d837d99cae..96cd15fd0a 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -35,13 +35,10 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <string.h>
 
+#include "postgres.h"
 #include "executor/spi.h"
 #include "optimizer/clauses.h"
 #include "utils/lsyscache.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 3d8e8920ee..41f0a373e3 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -16,12 +16,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
-
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_statistic.h"
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 095af4a54b..0616ae5727 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -13,8 +13,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index ed7faf8c4c..32ca3ba2e9 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -14,10 +14,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
-#include "postgres.h"
 
+#include "postgres.h"
 #include "utils/builtins.h"
 
 #define LDELIM			'('
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 4ad2ab3dea..cdbac4c7f1 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -1,7 +1,6 @@
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <ctype.h>
+
 #include "postgres.h"
 #include "access/xact.h"
 #include "miscadmin.h"
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index b98bcf603f..0c457ec717 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "access/htup.h"
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index ce4e644efa..6edf147af0 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
index 6897a87ece..d4a9c8c6d3 100644
--- a/src/backend/utils/adt/version.c
+++ b/src/backend/utils/adt/version.c
@@ -10,7 +10,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 #include "version.h"
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 2f03644a22..19da193ddb 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 #include "access/genam.h"
 #include "access/heapam.h"
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index 27fa32d6a3..c797348c6e 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -12,11 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 #include "catalog/pg_language.h"
 #include "catalog/pg_proc.h"
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index e5337a4a7b..80a7b3fa96 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -13,7 +13,6 @@
  *	  Eventually, the index information should go through here, too.
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index b89d1f1a19..20c54d8935 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -30,11 +30,9 @@
  *
  */
 #include <sys/types.h>
-#include <stdio.h>
 #include <errno.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index af22100fc6..549648b15a 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -17,7 +17,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 9f66816a10..82b9486919 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -22,8 +22,6 @@
  */
 
 #include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "access/heapam.h"
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 199de1bff3..41748e9405 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -14,7 +14,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <unistd.h>
 
 #include "postgres.h"
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 8f5f1ba291..8319115454 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -11,15 +11,12 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <time.h>
 #include <fcntl.h>
 #ifndef O_RDONLY
 #include <sys/file.h>
 #endif	 /* O_RDONLY */
 #include <sys/types.h>
-#include <stdarg.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 9a986ec498..98059fd351 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -15,9 +15,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <errno.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 7a193aa49d..896ed39087 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdarg.h>
 #include "postgres.h"
 
 #define FormMaxSize		1024
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 4ed2aa792f..7e32ec5659 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -13,8 +13,6 @@
  */
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 0926fd0a3a..a9ed1a194a 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 50a0f748cb..f5b2db3af9 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -39,9 +39,8 @@
  * Modified by [email protected] April 1990
  *		changed ctl structure for shared memory
  */
-#include <stdio.h>
 #include <sys/types.h>
-#include <string.h>
+
 #include "postgres.h"
 #include "utils/dynahash.h"
 #include "utils/hsearch.h"
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 465b34a8d1..090833e8ea 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "utils/hsearch.h"
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index aff4c9f521..8879210e70 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -10,10 +10,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include <grp.h>
 #include <pwd.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 9b5af543e8..95acc158fc 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -16,8 +16,6 @@
  *-------------------------------------------------------------------------
  */
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <math.h>
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 5398111c5a..805b17d143 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -11,20 +11,15 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <grp.h>
 #include <pwd.h>
 
 #include "postgres.h"
-
-
-
 #include "catalog/catname.h"
 #include "catalog/pg_shadow.h"
 #include "miscadmin.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 4b96ade024..a70129493e 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -27,8 +27,6 @@
  *-------------------------------------------------------------------------
  */
 #include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <math.h>
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index e6f47b3e67..7aed7f2fda 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -5,8 +5,6 @@
  * Tatsuo Ishii
  * $Id$ */
 
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "miscadmin.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index f1212d5250..ba8a0c59d2 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 
diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c
index 27fbf486cc..baf8ce6121 100644
--- a/src/backend/utils/misc/trace.c
+++ b/src/backend/utils/misc/trace.c
@@ -9,9 +9,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/time.h>
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 6378a1f11d..41f86ba939 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -21,14 +21,8 @@
  *				Jan Wieck
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 #include "postgres.h"
 #include "utils/memutils.h"
-#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
-#else
-#include <string.h>
-#endif
 
 
 #undef AllocSetReset
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 7d3bc3990c..e2c58300ba 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -11,7 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index b2ab0fc409..e8d88404ef 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -12,11 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
-
 #include "nodes/memnodes.h"
 
 
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index bf1cbc832e..9d1f2d12ec 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -73,13 +73,9 @@
  * PortalHeapMemory				y				y				y *
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
-
-
 #include "lib/hasht.h"
 #include "utils/module.h"
 #include "utils/portal.h"
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index 88d9b1fe90..66d6ba3c4a 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -12,8 +12,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index e16e6ebcb4..984718dd5b 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -30,9 +30,7 @@
  *				MAXMERGE, MAXTAPES
  *
  */
-#include <stdio.h>
 #include <math.h>
-#include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 866fa42c45..1dcfd4dc41 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -19,9 +19,6 @@
  */
 
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
 #ifdef solaris_sparc
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index fc144bd442..12a13f34f7 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -51,10 +51,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdlib.h>
 #include <unistd.h>				/* for getopt() */
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
 #ifdef solaris_sparc
diff --git a/src/bin/pg_encoding/pg_encoding.c b/src/bin/pg_encoding/pg_encoding.c
index 710bbedb83..d9e4d54f12 100644
--- a/src/bin/pg_encoding/pg_encoding.c
+++ b/src/bin/pg_encoding/pg_encoding.c
@@ -11,8 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdlib.h>
-#include <stdio.h>
 #include "postgres.h"
 #include "mb/pg_wchar.h"
 
diff --git a/src/bin/pg_passwd/pg_passwd.c b/src/bin/pg_passwd/pg_passwd.c
index 4acdc3054b..001ce9a772 100644
--- a/src/bin/pg_passwd/pg_passwd.c
+++ b/src/bin/pg_passwd/pg_passwd.c
@@ -1,15 +1,7 @@
 /*
  * @(#) pg_passwd.c 1.8 09:13:16 97/07/02		Y. Ichikawa
  */
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "postgres.h"
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 048b85a627..523e61758f 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -11,9 +11,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <signal.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -29,6 +26,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <ctype.h>
+
 #include "postgres.h"
 #include "libpq-fe.h"
 #include "pqsignal.h"
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index b1612d93c7..b1463ed91f 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -11,10 +11,7 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 
 #include "postgres.h"
 #ifndef HAVE_STRDUP
diff --git a/src/include/c.h b/src/include/c.h
index a3622bbf39..19effc960a 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -50,7 +50,9 @@
 #include "config.h"
 
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef STDC_HEADERS
 #include <stddef.h>
 #include <stdarg.h>
@@ -789,12 +791,14 @@ extern char *vararg_format(const char *fmt,...);
 
 #ifndef HAVE_SNPRINTF
 extern int	snprintf(char *str, size_t count, const char *fmt,...);
-
 #endif
 
 #ifndef HAVE_VSNPRINTF
 extern int	vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+#endif
 
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #endif
 
 /* ----------------
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 79928559c0..bafc4d9d0d 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -13,7 +13,6 @@
 #ifndef EXECUTOR_H
 #define EXECUTOR_H
 
-#include <stdio.h>
 #include "executor/execdesc.h"
 
 /* ----------------
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index 80af87f16a..9c5f8d5cfc 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -8,7 +8,6 @@
 #ifndef SPI_H
 #define SPI_H
 
-#include <string.h>
 #include "postgres.h"
 
 /*
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 89b5b40231..cde7806a28 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -14,7 +14,6 @@
 #ifndef LIBPQ_BE_H
 #define LIBPQ_BE_H
 
-#include <stdio.h>
 #include <sys/types.h>
 
 #include "libpq/hba.h"
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 59c7dd1ff7..7a2307c76d 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -17,7 +17,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include "winsock.h"
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 2f49257264..b300a94c40 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -21,8 +21,6 @@
 #ifndef GEQO_MISC_H
 #define GEQO_MISC_H
 
-#include <stdio.h>
-
 #include "optimizer/geqo_recombination.h"
 #include "nodes/relation.h"
 
diff --git a/src/include/regex/utils.h b/src/include/regex/utils.h
index de36c6ffb5..bf51a8b8e7 100644
--- a/src/include/regex/utils.h
+++ b/src/include/regex/utils.h
@@ -37,7 +37,7 @@
  *		@(#)utils.h		8.3 (Berkeley) 3/20/94
  */
 
-#include "config.h"				/* HAVE_MEMMOVE */
+#include "config.h"
 
 /* utility definitions */
 #define DUPMAX			100000000		/* xxx is this right? */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 6adab4e6a9..aaea8a53ba 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -13,7 +13,6 @@
 #ifndef BUFMGR_H
 #define BUFMGR_H
 
-#include <stdio.h>
 
 #include "storage/ipc.h"
 #include "storage/block.h"
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 5da2bada74..f07c974ddf 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -38,8 +38,6 @@
 #ifndef FD_H
 #define FD_H
 
-#include <stdio.h>
-
 /*
  * FileSeek uses the standard UNIX lseek(2) flags.
  */
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index 9a8cfdc6eb..8682bd0672 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -22,7 +22,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include <stdio.h>
 #include "utils/memutils.h"
 
 typedef struct
diff --git a/src/include/utils/lselect.h b/src/include/utils/lselect.h
index db0d2b5e55..5399d56230 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -13,8 +13,6 @@
 #ifndef LSELECT_H
 #define LSELECT_H
 
-#include <stdio.h>
-
 #include "utils/syscache.h"
 
 struct leftist
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 43941fd648..63f9b137c4 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -13,7 +13,6 @@
 
 #ifdef linux
 
-#include <stdio.h>
 #include <string.h>
 
 extern char *ps_status_buffer;
diff --git a/src/include/utils/trace.h b/src/include/utils/trace.h
index dcfaf16e95..4bcdee3ae5 100644
--- a/src/include/utils/trace.h
+++ b/src/include/utils/trace.h
@@ -12,10 +12,8 @@
 #ifndef TRACE_H
 #define TRACE_H
 
-#include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <stdarg.h>
 
 #ifdef ELOG_TIMESTAMPS
 char	   *tprintf_timestamp(void);
diff --git a/src/interfaces/ecpg/preproc/c_keywords.c b/src/interfaces/ecpg/preproc/c_keywords.c
index 9a8b94bd25..4d04c00dd9 100644
--- a/src/interfaces/ecpg/preproc/c_keywords.c
+++ b/src/interfaces/ecpg/preproc/c_keywords.c
@@ -6,7 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index aa6c2c274b..6bfabd338d 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -4,7 +4,6 @@
 
 #include "postgres.h"
 
-#include <stdio.h>
 #if HAVE_GETOPT_H
 #include <getopt.h>
 #else
@@ -13,12 +12,6 @@ extern int	optind;
 extern char *optarg;
 
 #endif
-#include <stdlib.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 
 #include "extern.h"
 
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 8ecd9a92e9..c5c2f93652 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -6,7 +6,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "extern.h"
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 948db6fdc7..af05594c1d 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -12,7 +12,6 @@
  *-------------------------------------------------------------------------
  */
 #include <ctype.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 1585e395b0..493d6e3c70 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -1,24 +1,15 @@
 /* This is a modified version of src/backend/parser/scan.l */
 %{
-#include "config.h"
-
 #include <ctype.h>
 #include <sys/types.h>
 #include <limits.h>
+#include <errno.h>
 
+#include "postgres.h"
 #ifndef PATH_MAX
 #include <sys/param.h>
 #define PATH_MAX MAXPATHLEN
 #endif
-
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <errno.h>
-
-#include "postgres.h"
 #include "miscadmin.h"
 #include "nodes/pg_list.h"
 #include "nodes/parsenodes.h"
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index ff1f9907f9..04b27c5f1f 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,9 +1,5 @@
 /* Copyright comment */
 %{
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
 #include "postgres.h"
 #include "access/htup.h"
 #include "catalog/catname.h"
diff --git a/src/interfaces/libpgtcl/pgtcl.c b/src/interfaces/libpgtcl/pgtcl.c
index 37d95413e8..f6f2eca401 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -14,8 +14,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdlib.h>
-
 #include "postgres.h"
 #include "libpgtcl.h"
 #include "pgtclCmds.h"
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
index 036660f8b5..6e23776699 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -12,9 +12,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "postgres.h"
diff --git a/src/interfaces/libpgtcl/pgtclId.c b/src/interfaces/libpgtcl/pgtclId.c
index 376763f863..a5e5bd4985 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -17,8 +17,6 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 
 #include "postgres.h"
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 5c2d8835e4..93f9fa4ad5 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -33,7 +33,6 @@
 #ifdef WIN32
 #include "win32.h"
 #else
-#include <string.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
 #ifndef  MAXHOSTNAMELEN
 #include <netdb.h>				/* for MAXHOSTNAMELEN on some */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 8f97bc9647..df337fa2f4 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -17,7 +17,6 @@
 #include "fe-auth.h"
 #include "postgres.h"
 
-#include <stdlib.h>
 #ifdef WIN32
 #include "win32.h"
 #else
@@ -28,7 +27,6 @@
 #include <netinet/tcp.h>
 #endif
 #include <fcntl.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>				/* for isspace() */
 
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 9a791d8bbc..4db3ce1aef 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -22,8 +22,6 @@
 #include <unistd.h>
 #endif
 #endif
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <ctype.h>
 
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 8b82ec5e82..5577ca4779 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #endif
 #endif
-#include <string.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index 759c658d3e..daa1bfcd6c 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -31,11 +31,10 @@
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
+
 #include "postgres.h"
 #include "pqsignal.h"
 
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <signal.h>
 #include <time.h>
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index ce9ed5002a..1491cccb8d 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -31,9 +31,7 @@
 #include <termios.h>
 #endif
 #endif	 /* WIN32 */
-#include <stdlib.h>
 #include <signal.h>
-#include <string.h>
 
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index e1458c3b89..238702d6e7 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -37,8 +37,6 @@
 #ifndef PLPGSQL_H
 #define PLPGSQL_H
 
-#include <stdio.h>
-#include <stdarg.h>
 #include "postgres.h"
 #include "executor/spi.h"
 #include "commands/trigger.h"
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index cb5d35bacf..da19fa49aa 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -26,8 +26,6 @@ tuple 1: got
 
  *
  */
-#include <stdio.h>
-#include <string.h>
 #include "postgres.h"			/* -> "c.h" -> int16, in access/attnum.h */
 #include "libpq-fe.h"
 #include "utils/geo_decls.h"	/* for the POLYGON type */
diff --git a/src/test/locale/test-pgsql-locale.c b/src/test/locale/test-pgsql-locale.c
index 560962a612..8369e671dd 100644
--- a/src/test/locale/test-pgsql-locale.c
+++ b/src/test/locale/test-pgsql-locale.c
@@ -1,5 +1,4 @@
 
-#include <stdio.h>
 #include "postgres.h"
 
 int
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 0625429d71..a72d91e720 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -3,10 +3,8 @@
  */
 
 #include <float.h>				/* faked on sunos */
-#include <stdio.h>
-#include <string.h>				/* for MemSet() */
 
-#include <postgres.h>
+#include "postgres.h"
 
 #include "utils/geo_decls.h"	/* includes <math.h> */
 #include "executor/executor.h"	/* For GetAttributeByName */
diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c
index b44bbc067d..0a8f140827 100644
--- a/src/tutorial/complex.c
+++ b/src/tutorial/complex.c
@@ -4,9 +4,6 @@
   format for these routines is dictated by Postgres architecture.
 ******************************************************************************/
 
-#include <stdio.h>
-/* do not include libpq-fe.h for backend-loaded functions*/
-/* #include "libpq-fe.h"  */
 #include "postgres.h"
 
 typedef struct Complex
diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c
index 8da815c2fe..5cb8d95c73 100644
--- a/src/tutorial/funcs.c
+++ b/src/tutorial/funcs.c
@@ -6,8 +6,6 @@
   SQL statement that binds them to the backend.
 *****************************************************************************/
 
-#include <string.h>
-#include <stdio.h>
 #include "postgres.h"			/* for variable length type */
 #include "executor/executor.h"	/* for GetAttributeByName() */
 #include "utils/geo_decls.h"	/* for point type */
diff --git a/src/utils/version.c b/src/utils/version.c
index 18e0b1c032..54f5b855c7 100644
--- a/src/utils/version.c
+++ b/src/utils/version.c
@@ -22,8 +22,6 @@
 #include <fcntl.h>				/* For open() flags */
 #include <sys/stat.h>
 #include <ctype.h>
-#include <string.h>
-#include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
author	Bruce Momjian	1999-07-17 20:18:55 +0000
committer	Bruce Momjian	1999-07-17 20:18:55 +0000
commit	161fd6f1cda4c5147a01ad4aff877dd94824da4a (patch)
tree	d65f72031d8bb037c88d2caa67430a61f3cd3982
parent	ce88aa654d517409882e967eada6dd732d7ffb7b (diff)