diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 576e0f4e2585579184d5ec7881aa1218d9affe44..009f8abdd1584bd3f6272e3a132706ad4c75be00 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.56 1999/07/16 04:58:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.57 1999/07/17 20:16:35 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -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 be7e250dd830b76885b8f6d52fa5167a8da50a04..c300e644a769171945ebf2fb468797084f45b2d1 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.36 1999/07/16 04:58:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.37 1999/07/17 20:16:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 2313e3e6c9673d55af6ca181626fdc49ead8964b..f53113560477cea893e207dab7bce6467c0bf946 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,12 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.48 1999/07/15 22:38:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.49 1999/07/17 20:16:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index f8b4147b33c7c4ee8b030bda17483eabe68ed4a6..4bce6ee914f9b24e6f9058c4ce2cec9780d844d0 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.53 1999/07/16 04:58:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.54 1999/07/17 20:16:36 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -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 8dab9755cc8bb7edb5a22c34b0e1da4340c30928..0e4263b80eceae24733ada3166d563f93f899dec 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 f35a0f7cd37de9446c8cd12b43bf2afdfd18751d..fc18377a94a27dba6da8c7e983ac3b10d8defbc5 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 c4553094430f12bc773a821412a6a25f913a3983..e7a864985a474d4854c8547d68fa7d24d7e1de13 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 74fa62931e2a176e5ece3b02aa20c29e7a86b704..1130367b65de3c057ec8ca2566ab9447cbe4bc02 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.29 1999/07/16 04:58:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.30 1999/07/17 20:16:38 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -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 fd4d814cc9399e4f4680e1f7ce95742374ecbcb1..ea074c39099707825ab6e28b70a3920718f1dc8a 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.24 1999/07/17 20:16:38 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -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 d0c1a3006200593d97306b901d1fbc88b4b152e1..b7abaa0cb719117dc02a1eecfa4f0866fab0dc3d 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.24 1999/07/17 20:16:39 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -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 a405279d0cdf3663ca1c02b1abd8e167688ec8c5..5056e3897fd3f594b84eca0662b6c297945467ad 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 8ddfd22f6e51ccca299352decbcb8064d2db111f..9f13da34ab181a5547da8b0ca7d57b0a2103f8f5 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.21 1999/07/17 20:16:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 ca97ce46571cf127218dc2214772bb5300dc9616..5fb0367f2c6d841764af3329fcacea454d2392dd 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.51 1999/07/16 04:58:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.52 1999/07/17 20:16:39 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -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 d5fd03382ad883a50ebf8130b4f0007c54ecf8c4..349ab4a6220657d10fdb6af7d9f57f81e1f75fcf 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
  *
  * NOTES
  *	  initam should be moved someplace else.
@@ -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 cf2db25065836640cd1e835296d0cad43675129a..c1971133ce13e64dd385fdfe0b5d465da8e2bdc9 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.21 1999/07/17 20:16:40 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -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 834d510b8c768a59a0eef96fa4f5901a08e3cb08..6673d69b84a4b33696f1def8c26b6cbc7b5252c8 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.26 1999/07/15 23:02:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.27 1999/07/17 20:16:41 momjian Exp $
  *
  *	NOTES
  *		These functions are stored in pg_amproc.  For each operator class
@@ -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 23954d7fedf1d5a5e94d9d1dd01f37a262319127..b07db1d7c9bb34b71df9e458c0f78d393bb1fb8e 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.47 1999/07/16 04:58:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.48 1999/07/17 20:16:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 6bdcd43cb53253f7e8651b7a4abea6010c989ec3..2d30827368f369fe15f78e72a24268062c26577a 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.29 1999/07/16 04:58:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.30 1999/07/17 20:16:42 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -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 a38160cc1e48e0bbd53efcf1eca56cd770c723ab..c97273f10f0cc0b528f3eb5a3dddfc217351f273 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -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 2c7e3a7f7dca6693ab0d58458c38d51afa420bac..3a5eda3ad8c4e086eaa0d0c82aad4150da85e5dc 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.52 1999/07/17 16:02:50 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.53 1999/07/17 20:16:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 aeed3a29e4276ce138fd82a47c92de5b51e87378..e3b1f5a043c0022e0c2b90fd07924f5cda3a8a0c 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.45 1999/07/17 20:16:43 momjian Exp $
  *
  * NOTES
  *
@@ -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 e4b3b2500ac396a6d784fe949ee9807f511c383e..2a5e7578d2f196888b7b0b5bcba61f93448a7f8b 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.31 1999/07/16 04:58:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.32 1999/07/17 20:16:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 539d4b212ad72ecaebf1a3611989b7985ebed01c..6d1c61212e9113f09a4203e3b10e0abf25131fd2 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.18 1999/07/16 04:58:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.19 1999/07/17 20:16:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 aa24c3546dc47ed52c42a48bccb0790f1f0687fe..bb666627acf47c2448ab9e111d48da21ae2db68a 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.23 1999/07/16 04:58:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.24 1999/07/17 20:16:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 1d1891ecbbdbd0366418c60155a08cb3d183d834..37da716df1d553b0415afd8cf911c90d14e07932 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.35 1999/07/16 04:58:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.36 1999/07/17 20:16:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 6f08fa271d9f08e6f3cab16cd3f2cc20df739edc..30bf065d121b9a57367126b117cc9702b0237057 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.28 1999/07/16 04:58:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.29 1999/07/17 20:16:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 1d824cabc48ef07fd51e2c45f04f1dfa04f769c9..1bf3d405069699848f574edeabd53dfdb52f7dd7 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: xid.c,v 1.25 1999/07/15 23:03:04 momjian Exp $
+ *	$Id: xid.c,v 1.26 1999/07/17 20:16:45 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -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 b601d49cba6506ef7cb0629009296a7069ac178d..ce2d7d496ec5c8517cfb0b96feb8e4de2363dd95 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -8,12 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.26 1999/07/16 04:58:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.27 1999/07/17 20:16:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
 #include <time.h>
 
 #include "postgres.h"
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index d5a513d0198828c539f63aa36342fe10217a9561..22fd7f483d78637d7b1d16a2565aa0c4de6f0a90 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -8,18 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.13 1999/07/16 04:58:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.14 1999/07/17 20:16:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 6253bf5cd5a1d9910f51e216ed9d0f510bf94099..fc357d87a796534e66509bf9c5819c4438bfa91e 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,16 +7,14 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.64 1999/07/16 04:58:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.65 1999/07/17 20:16:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 e53599fc0ae48325c3cf8b23b18aa56da0c8fcb2..685985e79a08647af6c44d1a37b4cc9cd32fea90 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.25 1999/07/16 04:58:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.26 1999/07/17 20:16:47 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
  *
  *-------------------------------------------------------------------------
  */
-#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 abaa68f08e45dabe6f4fddd990ddd2a292f4621f..1ad931e8b21bd612e649a1ae57f40cb276cf749c 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.24 1999/07/16 04:58:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.25 1999/07/17 20:16:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 0ee9aa2cac3af5c6bd91ef99eaf36f2f5bf6186c..1592be2687b31e27dfd677c202999b7b44820b5b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.92 1999/07/16 04:58:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.93 1999/07/17 20:16:48 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -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 e7763b045b76dcf2d781d8761bb21dabc5528348..607f48fd4b613869749b9b9a121ef8ad7a049c0b 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.84 1999/07/16 04:58:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.85 1999/07/17 20:16:49 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -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 21ced7031b790a33b864f351c236cb47300b79fa..92a3385f4e982c97ddd16e82ecbbb8cb2c636eab 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,11 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.39 1999/07/15 22:38:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.40 1999/07/17 20:16:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index b96df4115486017a13a1d9f282851b505f9fb915..c8f02287cb80741545f1b69621af1abc01e3b823 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.23 1999/07/16 04:58:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.24 1999/07/17 20:16:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 06c558821fb362eba67422e24eb440aadde1bdc2..8cab520f520fa2013734b5840969063c5be752f7 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.40 1999/07/16 04:58:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.41 1999/07/17 20:16:49 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -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 30902fbb91db184b572b8e71968a68346eb0e016..f0a10cf8f89092871099f2e220c33912b98fd413 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.32 1999/07/16 04:58:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.33 1999/07/17 20:16:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 ac9d248ba80083d21d6db3622e0ba7fe142fca98..a219767858c1c225478a288aeedd461da30bb348 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.39 1999/07/16 04:58:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.40 1999/07/17 20:16:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 eddc79392daeb69fe700ab55e0ee8cbfeecd8277..1d53690c1e5cccf2b08feade0f65477ce90887c1 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -9,7 +9,7 @@
  *	doesn't work! - jolly 8/19/95
  *
  *
- *	$Id: version.c,v 1.21 1999/07/15 23:03:09 momjian Exp $
+ *	$Id: version.c,v 1.22 1999/07/17 20:16:55 momjian Exp $
  *
  * NOTES
  *	At the point the version is defined, 2 physical relations are created
@@ -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 7fa337c196f9fd80a8ca5d52e870346850a55e88..090acbefa58ac19041560992f8b54152927cb75b 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.52 1999/07/17 20:16:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 a02aba5fa057a9ae2916c9973a52fbc3f1d6e075..6f99a920f5a3ec5a69dda786bc090f9eda7fe2bc 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,11 +14,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.43 1999/07/16 04:58:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.44 1999/07/17 20:16:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index ef6f25efd44ef2cb9fc87c2c93e3c8fe85ad17ec..93559a55c41a0d5961b4135f07b8077d17ced6e1 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.52 1999/07/17 20:16:51 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -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 9d649fb14566e007b593f58b3d287d808543e308..98a0fb924390f37398cc738375a6739cacdc3bf2 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,12 +6,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.84 1999/07/16 04:58:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.85 1999/07/17 20:16:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 d5177d86627a03ff975315ad2cb0a26c62acedb0..b93a40e7ba326629e1f7981aa1f1f2d400c736cd 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.44 1999/07/16 04:58:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.45 1999/07/17 20:16:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 2e420d2f5185042fdae08f074f4f80f6fe1884f9..b779715fe8e3863847ffccffa656c7dc35294b8e 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.38 1999/07/16 04:58:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.39 1999/07/17 20:16:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 5bf42d182eed42f8df577241e7d177b673193160..c7dc7d3ad1c54499e93cfc3ea69f0796329b7c95 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.33 1999/07/16 04:58:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.34 1999/07/17 20:16:52 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -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 168d2037e7d62ddff02f2d04508ab9c1188ecd6f..460fdcc1f91254bf14094acd438fc8910b8c1319 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,11 +4,9 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- *	  $Id: explain.c,v 1.42 1999/07/17 19:01:21 tgl Exp $
+ *	  $Id: explain.c,v 1.43 1999/07/17 20:16:52 momjian Exp $
  *
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 69297201189f1e19b6ab9ef67215737c0dff64df..3644d1ba0426bc99b7ce0a02efaf22d148252442 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.8 1999/07/16 04:58:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.9 1999/07/17 20:16:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 194333fbe9739bde9371b49df062d609cfa04cd0..21fde2af57997bbceeb1d8280f61d6e6c2a432a0 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 0ae6b151bae653a5752bd525e5289ed2b9756ec9..af20c79f17db8a7b13a7bac6ffa5d71efe8cc30a 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.35 1999/07/16 04:58:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.36 1999/07/17 20:16:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 ec5f574e7c849cf70bdb81fcd1c7de9271f6df43..1a93027b4a3c412e47047c0461b1e50cac26dfd1 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,16 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.31 1999/07/16 05:41:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.32 1999/07/17 20:16:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 548b3311a074d9c43478d31cc87b1e2f99147535..b7f959cd65eed7a01a76cde6c2093f5a17340640 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 35b3356de4deaa0fdeacfdfd6ba83f95ed16aea2..55f67711c77514c2eae9fbe1713edcb982c66978 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 63de3aa699b076b3b5afa218ef4c83abba90d760..984fc33453f0519003b3c7a8449ecd9ffb25672b 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,12 +5,10 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.31 1999/07/16 04:58:41 momjian Exp $
+ * $Id: user.c,v 1.32 1999/07/17 20:16:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 91ce729ebda3d702dcda7fb8771260ebf057121b..de4282ccec3bcfe91904e470dc2493a442b8b828 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.113 1999/07/16 04:58:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.114 1999/07/17 20:16:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 6669eb7440e7a27f9c9629eff01d34d4f2c6ec70..d34b97c90df51698bec4a11153c7ea930d646521 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -2,12 +2,10 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.24 1999/07/16 04:58:41 momjian Exp $
+ * $Id: variable.c,v 1.25 1999/07/17 20:16:54 momjian Exp $
  *
  */
 
-#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 069d92237b84557fb9b505cc758a61fa15677ab8..5baf4eceac8cdc79a2e8c372a6ff991dd760d73e 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,12 +5,10 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.36 1999/07/16 04:58:42 momjian Exp $
+ *	$Id: view.c,v 1.37 1999/07/17 20:16:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 8a03d92abaee3d8babe6890621e66fe4a9ad28cb..40a94fd02c85021c143e85890be6a198a45be4be 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: execAmi.c,v 1.40 1999/07/16 04:58:44 momjian Exp $
+ *	$Id: execAmi.c,v 1.41 1999/07/17 20:16:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 d541f34825df59592d657c7320d2ed182afc4ec1..04847867942b6c5ec57d0f9167580c7018f428a5 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.19 1999/07/15 22:39:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.20 1999/07/17 20:16:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 5459f06be852c7af705189da7331d696da3c4949..48c0a885f3c27e1334ce8c47d3063c720935ce97 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,11 +26,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.92 1999/07/16 04:58:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.93 1999/07/17 20:16:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 3eb569acb6457f47a52beb83d12667baf6c85eb1..649c189ea97104f8804ba4a2e530cc56c400282d 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.56 1999/07/16 04:58:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.57 1999/07/17 20:16:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 bebcb17a977f37504b9ee5fdb2385ae9a4125a91..6e2e249c9a843a287bffe7748f2687139a869827 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.28 1999/07/16 04:58:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.29 1999/07/17 20:16:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 0653c048b9be2f5acda68fd5476c0c1ff16d57a5..f6b716c44caa88ffe4cdb7ddfa43c399e5bbf786 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,11 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.29 1999/07/16 04:58:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.30 1999/07/17 20:16:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 45196dfdf6cf5f20222dbf0d200aaaef94cada64..fc95d2ce5bc7042b06fb9fefc493bd3e93848348 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 3c25447e247c97761b147fa047bb6205aa2a2a5a..f856d4780bc69898b87dec9c2bbf55c73b523010 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,11 +13,10 @@
  *	  columns. (ie. tuples from the same group are consecutive)
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.29 1999/07/17 20:16:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 71da86f9c56e6ed5cc7f3a6cae12e987cade5cc3..214cc7f06964dbf8c3af866a5b27949bdb37663e 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  *
- *	$Id: nodeHash.c,v 1.37 1999/07/15 22:39:08 momjian Exp $
+ *	$Id: nodeHash.c,v 1.38 1999/07/17 20:16:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 fa46c603ecce59dbed407510aaaa058c5a87e773..439b8634cda1eb81a772129394634903f84cd729 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.25 1999/07/16 04:58:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.26 1999/07/17 20:16:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 311938a743574823b0d8520c5640a20683f5c533..f82fecf0d6f8ac26db7c720446eff050927c348d 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.22 1999/07/16 04:58:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.23 1999/07/17 20:16:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 af07ab83c0b7edf0f3a9c08dd1e4700abfd4e610..13547d4b3cd610922572fd934650b9a383ac931e 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.23 1999/07/16 04:58:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.24 1999/07/17 20:16:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 fec4f25ecb0d892372cd837209fc5a820a9c79e4..e98a5c5f4d59486c6c4a52c1b59efb97d36270b2 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -8,13 +8,11 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: stringinfo.c,v 1.19 1999/07/15 15:19:02 momjian Exp $
+ *	  $Id: stringinfo.c,v 1.20 1999/07/17 20:16:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 24def9d755c8e9b46e74bf5f27f4f13e2d4cdd69..d42503f3c1879a3da456fc69a0361f459c393eec 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.39 1999/07/16 04:58:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.40 1999/07/17 20:17:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 b15eaad617b62d0d1b866d522e44ac5d28d5a3a0..288ff70f5238ff70fa13e155392343e74ccf915d 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: be-dumpdata.c,v 1.29 1999/07/16 04:58:58 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.30 1999/07/17 20:17:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 9f020bdea29268ca9ad4ae5f8c4a960378e2431c..280fdd9410d31bf70fb95a0eb4e4117d0bb558bb 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.40 1999/07/16 04:58:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.41 1999/07/17 20:17:01 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -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 8131662a2a9c1d0008968d22a20ef18833bda3c2..e92efd503fd3a749227211db284b3217a23be12c 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.23 1999/07/16 04:59:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.24 1999/07/17 20:17:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 c10efca9ff07c678845d9ee5e9dc7cd5a13fe15b..7c3bd35e243efe02c66fa9a821d1c970cf55b94e 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,14 +9,11 @@
  * Dec 17, 1997 - Todd A. Brandys
  *	Orignal Version Completed.
  *
- * $Id: crypt.c,v 1.22 1999/07/16 04:59:00 momjian Exp $
+ * $Id: crypt.c,v 1.23 1999/07/17 20:17:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 38c49bbf01d79ea7f54a0b54bbfc6d0cc623a58d..5012d22263a49828868aa3bc4b3a4e952a107499 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,12 +5,10 @@
  *	  wherein you authenticate a user by seeing what IP address the system
  *	  says he comes from and possibly using ident).
  *
- *	$Id: hba.c,v 1.46 1999/07/16 04:59:01 momjian Exp $
+ *	$Id: hba.c,v 1.47 1999/07/17 20:17:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 831e80c66afb5f48f696e4136f34859a9b580a70..3e3b8401e15c98b942c3468716256a2c6f2831b4 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.24 1999/07/16 04:59:01 momjian Exp $
+ * $Id: password.c,v 1.25 1999/07/17 20:17:02 momjian Exp $
  *
  */
 
-#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 f8a6db735899135ede3f3fb7a4d327022282173f..abc69686e6de115030fa0d0887cd0a419b065e5e 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.26 1999/07/16 04:59:02 momjian Exp $
+ *	$Id: portal.c,v 1.27 1999/07/17 20:17:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 a9c3e9506be467377989e327397f77fc944b4351..b61c7a7b73137fbe72b141e57d718f0860903f3a 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.20 1999/07/16 04:59:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.21 1999/07/17 20:17:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 062488184e59f1d37faa7df3191b9b66b8738193..e8361b85353482108ae0b2c93d4ccc7f2d736f10 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.79 1999/07/17 05:16:15 momjian Exp $
+ *	$Id: pqcomm.c,v 1.80 1999/07/17 20:17:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 7bb502b984e43ebb0b6eec1c49f2a4bc13a36022..e5da571886dc4bb33e9c10b102f2a39c862d857c 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.6 1999/07/16 04:59:04 momjian Exp $
+ *	$Id: pqformat.c,v 1.7 1999/07/17 20:17:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 febfb37436734074693e3e5a9442a7eb9f470425..160944cc5fb49835de173ffbd07ba65699d1f8e0 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,14 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.21 1999/07/15 23:03:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.22 1999/07/17 20:17:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 3d9ba30b496d12536178aa35a85e616b85e3fd02..c331298dbd54ab1242dd6e96f71a3dfd11415905 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: util.c,v 1.12 1999/07/16 03:12:57 momjian Exp $
+ *	$Id: util.c,v 1.13 1999/07/17 20:17:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 77b6bc035b14692e84bbf2e5b5b82cd5bda7749c..de85b5469e5746da5e794a3e0347157b41b9280d 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.26 1999/07/16 03:12:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.27 1999/07/17 20:17:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 1e93c93e9774f6e3fff0ec8f0a5aa3eea94887da..217bfc54471cd97df0dc61cacb6cbe45774a32cf 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.85 1999/07/16 04:59:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.86 1999/07/17 20:17:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 1ac318980b86aa4122e6cb09dcbb03195baecda7..9f16875f343fc94cfeb5f589b5eac11a65907699 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.42 1999/07/16 04:59:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.43 1999/07/17 20:17:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 457072150b1db7630c401ddab8d95390c6b30910..066f7704e0844d9979bf3986040106a6f4bab248 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.21 1999/07/15 22:39:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.22 1999/07/17 20:17:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index 623d34d7b2d64770fe092879b8c86ed0a9cfee99..549be7571ba95fc581cb5e8ca06b0fd7998ee4fa 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.24 1999/07/15 22:39:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.25 1999/07/17 20:17:06 momjian Exp $
  *
  * NOTES
  *	  XXX a few of the following functions are duplicated to handle
@@ -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 c8c335df125f4c71f5a2a49130da734083131aed..0e60597949d848d43c1128bf5c6a98b9755e759e 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.9 1999/07/15 15:19:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodes.c,v 1.10 1999/07/17 20:17:07 momjian Exp $
  *
  * HISTORY
  *	  Andrew Yu			Oct 20, 1994	file creation
  *
  *-------------------------------------------------------------------------
  */
-#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 bdcd0dc39def99a6f42345876e2d7ece85858b5e..6d389eef18478ebbd179388423c746359a405848 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: outfuncs.c,v 1.88 1999/07/16 04:59:05 momjian Exp $
+ *	$Id: outfuncs.c,v 1.89 1999/07/17 20:17:07 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -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 bf3d584f8af2c6a1d17c6eedeb1fef57e6c0c88f..995e226c1633b3d6d4b5fd6a43780e09db4ddc84 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.30 1999/07/16 04:59:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.31 1999/07/17 20:17:08 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -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 d86450a9429980dfa7a5d7e7759bf865ab02a2ca..e80385e6e17e12264f4f2cc18599014497573bff 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.17 1999/07/16 04:59:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.18 1999/07/17 20:17:08 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -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 f0859598215e582f276700c3a4199167df724948..9d46b7e39da2df8616618e92b13b5a1b4b38d4b6 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.68 1999/07/16 04:59:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.69 1999/07/17 20:17:08 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -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 21e438958b4f06a8edd9f1defe5784032b0b524c..615c4354611c273a007c4de195e7206401452328 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.c,v 1.22 1999/07/16 04:59:09 momjian Exp $
+ * $Id: geqo_misc.c,v 1.23 1999/07/17 20:17:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 26b23f9791f0fbe678dd5efd22f23c169633d6b4..da2e5178ac4eee85183ad21026afadf25fb60ca6 100644
--- a/src/backend/optimizer/geqo/geqo_params.c
+++ b/src/backend/optimizer/geqo/geqo_params.c
@@ -5,7 +5,7 @@
 *
 * Copyright (c) 1994, Regents of the University of California
 *
-* $Id: geqo_params.c,v 1.20 1999/07/16 04:59:11 momjian Exp $
+* $Id: geqo_params.c,v 1.21 1999/07/17 20:17:10 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
@@ -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 f6330a637b321701dc03d4694233160d0732250d..16957495328f0faca3d1229bd7bb81d502671f95 100644
--- a/src/backend/optimizer/path/_deadcode/xfunc.c
+++ b/src/backend/optimizer/path/_deadcode/xfunc.c
@@ -9,14 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.8 1999/07/16 04:59:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/xfunc.c,v 1.9 1999/07/17 20:17:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 cf93248f91e854c27a87d3b00e32339515dd5699..220b3cd0471e6be40392614f495fa1ea4ebf0edd 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.49 1999/07/16 04:59:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.50 1999/07/17 20:17:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 e12ca3f60e377644580f70da33f14a96b6fda528..1dc0e9a0d5d39273f62b10557dab544b4681f256 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.61 1999/07/16 04:59:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.62 1999/07/17 20:17:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 218777fa4c6e072d72cb3f6d32ef87fb33114efe..41bb025e286f279b9c27d9633c056fe2e610b686 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.60 1999/07/16 04:59:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.61 1999/07/17 20:17:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 914779b4f69c28dc2398a90dedb131be7b6f3056..9a8ef5da4f55a5de386a3489eff553d9a22c3887 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 a0df069b2ffeb8861196e48ed2cc8b33a55387f0..035d6fe6bb3528271e75a560ecef82a7ed0691e4 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,17 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.26 1999/07/16 04:59:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.27 1999/07/17 20:17:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 db928519e5163a33cdf3fda1b127493595f595bd..931faabe13fbd88b3082d6183fdcb548a8958097 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,18 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.36 1999/07/16 04:59:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.37 1999/07/17 20:17:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 73ba86e6a09178379cb8a4f6d24e9dae7b8cb8c8..deb1d021165a9495a31ed374a75a54e0a5a041a8 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,18 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.34 1999/07/16 04:59:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.35 1999/07/17 20:17:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 c2b3889a0dbadcf8df389e789e4bb10d86893973..40a66b487389e4a6582d9796e1c67154acc686ff 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,15 +5,11 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: analyze.c,v 1.114 1999/07/16 04:59:28 momjian Exp $
+ *	$Id: analyze.c,v 1.115 1999/07/17 20:17:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 b4e089fb07afe1f1b310f5c275e02baa207c48e4..5749e484065fe1c66879ff99d84814440ab1df9d 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.92 1999/07/16 22:29:42 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.93 1999/07/17 20:17:21 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -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 22b21f7056c9d6f79acc0dd403683a4d6c480bbd..bd5b43ad1fd0b17d3a085ca6c892635f8ff3e2df 100644
--- a/src/backend/parser/keywords.c
+++ b/src/backend/parser/keywords.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.59 1999/07/15 15:19:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/keywords.c,v 1.60 1999/07/17 20:17:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 7470476aaa33ece1b9b3528a933313d7efaee78c..a075766643191e906107caa30d552f1a877464ce 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.25 1999/07/16 04:59:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.26 1999/07/17 20:17:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 4fb6369951c98d9ea77c59166ccd3758e860722d..ce9583c174a23b9190921aa4e0442db5ca750887 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.40 1999/07/16 04:59:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.41 1999/07/17 20:17:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 c8208da3fc323d1ae9674a3710b11f4fc72054ca..df1bb3f2c21d14f9e16b9f75d06d0a1fcd7daa5e 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.20 1999/07/16 04:59:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.21 1999/07/17 20:17:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 049605348c4ec286488feafa18928b829a391328..a936554ad9d221343ab937b32525541842e2085a 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.53 1999/07/16 22:32:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.54 1999/07/17 20:17:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 1116304500d4ae3c92bf13afa94341aa156b838e..33d93fc9eb88c3b6625c89cda4527e15e6db0801 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.49 1999/07/16 04:59:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.50 1999/07/17 20:17:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 25c34a4e8a99fe2c925016d615967e2b6229edab..53c756670c34b61390711cbc0e4674f94108fc44 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.27 1999/07/16 04:59:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.28 1999/07/17 20:17:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 cfb822f40e945389953569ec6f315fc4bc1ef14c..9a5ab042da68a413237f26164b9b0f7897ef6886 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.28 1999/07/16 04:59:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.29 1999/07/17 20:17:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 219d4ff35ec49dfae895dbfff10d55195d8c578d..d3662aea8263226945fbfd1411e8db2a604e2555 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.24 1999/07/16 04:59:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.25 1999/07/17 20:17:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 4ebb28a05bcd477c820f039ca50e5539990a903b..35d064b09808d5c44a8a26afb7a00fb7a9c2c053 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.44 1999/07/16 04:59:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.45 1999/07/17 20:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 6e8529ee78ee02d2613f7376a16fc2767cadaf7c..ae826adcd90eea5dcc59bbcb5bf4c0da110df463 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,14 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.23 1999/07/15 22:39:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.24 1999/07/17 20:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 50e633a750adc78c15700acc44997eb9e50565c8..1f6b99f759d50a2502a60979f1e337fc5daca041 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,12 +6,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.41 1999/07/16 04:59:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.42 1999/07/17 20:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 881c7132c708a6abbf233ab5ded2514ae0c01dea..35d42356bb47d3f506a14ff5ce77c03ed1a0ff91 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.51 1999/07/16 04:59:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.52 1999/07/17 20:17:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 160b05329b77f219ab6e8e87162d74f41051413d..df3ea1d931aff68f8ed580b0b2246a999446232c 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -8,13 +8,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.15 1999/07/17 04:00:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.16 1999/07/17 20:17:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #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 3cac00d117dca5a82383f3fda27e1c98d6e6a9fd..a8a833e84fa857e540a73da53ff041c191490b2c 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 caf5bea95f31dc42479eb2046c506f6dd98766b4..71ac793ef8b8f4ebac287a5313c78435f1cf4f36 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 64a26c3e02012c0cbcb5fc10a0d739b29cd1bec4..76f7b970bd44c90633cf4f6b96a01dd01d48dc96 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.10 1999/07/16 04:59:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.11 1999/07/17 20:17:30 momjian Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
@@ -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 8e042a24bd2ca9d5f5d0b399d69e0c781c3a1609..cd89fdfded33935a4c5538e6f8cfe54273697cea 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,12 +10,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.14 1999/07/16 04:59:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.15 1999/07/17 20:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 b9b988de18207e97358d5bc6f5f707040b155cd9..851362c1599a59076f9802e928b6206b86a75b31 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,11 +9,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.8 1999/07/16 04:59:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.9 1999/07/17 20:17:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 17e8eb9a1d616e9b81a42bec0302e84d79664e2a..e6ee698e66da24e3079519e1f6b33dd65a79f849 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).
@@ -77,7 +74,7 @@ typedef unsigned long ulong_long;
  * causing nast effects.
  **************************************************************/
 
-/*static char _id[] = "$Id: snprintf.c,v 1.24 1999/07/16 04:59:36 momjian Exp $";*/
+/*static char _id[] = "$Id: snprintf.c,v 1.25 1999/07/17 20:17:28 momjian Exp $";*/
 static char *end;
 static int	SnprfOverflow;
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index a84742e741a3a9b3936bb7a33905f5e6b03e4efc..15a21773e962b89ae2c878a8bf8ffa52f11b4e66 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.113 1999/07/16 05:41:17 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.114 1999/07/17 20:17:32 momjian Exp $
  *
  * NOTES
  *
@@ -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 a684212f384117c99adab0c79452385002185d1a..eee8ef09ae3a24c0e4c041deefb0221c44d347a9 100644
--- a/src/backend/regex/retest.c
+++ b/src/backend/regex/retest.c
@@ -1,11 +1,9 @@
 /*
  * a simple regexp debug program
  *
- * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.3 1999/07/15 23:03:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.4 1999/07/17 20:17:34 momjian Exp $
  */
 
-#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 971fecb72b6ae70b4d5833eaf13110ee94ecad53..2916c22bba79a086bc15358ea4b15622adf1f714 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.33 1999/07/16 03:13:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.34 1999/07/17 20:17:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 2130cb7878d2af9cde0b0831bfa0b55aa01d59a6..88bef2237aa65724fa88d91c11aedb10626e9982 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,17 +6,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.53 1999/07/16 04:59:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.54 1999/07/17 20:17:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 5d04add6fee393c6896687d4a38c4945d92db5d8..38464d343872b245ec09bea75330044ec322dac0 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,11 +6,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.37 1999/07/16 04:59:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.38 1999/07/17 20:17:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 b2fefcf20ed5567b9c31f609fc1d7bc0dadf3a58..14ceeead8486e5068ad685fda9b74f171da0a6ad 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,17 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.27 1999/07/16 04:59:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.28 1999/07/17 20:17:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 66c1e0077cb8719f218ac0d8ec9ef7175800f7f1..88f6416e84043d3d7986b5e6bf513694bb4b2235 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.28 1999/07/17 04:00:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_init.c,v 1.29 1999/07/17 20:17:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 e0b441f2957886b6a6bbd9b18d07ff6cbbf63dc2..de0d803efe23215870a2d0d24a5df977e51506b2 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.60 1999/07/16 04:59:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.61 1999/07/17 20:17:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 eed312900434306949bb301aa6710ab87ce4ef7c..d8f70a3287e1f856e66907c572f66093fb11792a 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.17 1999/07/16 04:59:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.18 1999/07/17 20:17:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 81ffdb640cbe9b6d14e1a06d69d73fb605854136..a6a2d456b26c6ef920bed9e2da9f114427e6ecc3 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,14 +15,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.25 1999/07/16 04:59:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.26 1999/07/17 20:17:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 0d02a1f6841ea2456b12116be19b99ca8e40115a..34a049026e6daedd697f9fd20b6bebbbedf0d854 100644
--- a/src/backend/storage/buffer/s_lock.c
+++ b/src/backend/storage/buffer/s_lock.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.22 1999/07/13 20:12:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/Attic/s_lock.c,v 1.23 1999/07/17 20:17:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 10a8f83dc90fbfaf7368f8f6589254ab7e26d6f8..c279528974cd797dd9031988dbb4ee50ed26b1b0 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Id: fd.c,v 1.46 1999/07/16 03:13:31 momjian Exp $
+ *	  $Id: fd.c,v 1.47 1999/07/17 20:17:42 momjian Exp $
  *
  * NOTES:
  *
@@ -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 b9ec1d171f5989a13a2baa6cf74e5ba0f21fd7f5..59c991bd0a7164f9ee083a562017262aeb12b534 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.37 1999/05/25 16:11:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.38 1999/07/17 20:17:43 momjian Exp $
  *
  * NOTES
  *
@@ -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 97bf1a3ee7d71fa7c9d61dca4c9ccde0f7a7fa6d..16c5266c6cde9d6fe1c521d857d30ce26fda6b98 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.29 1999/07/16 04:59:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.30 1999/07/17 20:17:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 2b785251c5961b9f973c5f652f38da7fb3712795..b057aaa578a8d7fd9f6a8f0624fde84ce007e457 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.44 1999/07/15 22:39:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.45 1999/07/17 20:17:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 317af7f02438ce97f94f90fca4c62602c23a2bb2..bf57b27652ab7c4bd1f0237e8503e7422e7d7766 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.11 1999/07/16 03:13:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmqueue.c,v 1.12 1999/07/17 20:17:44 momjian Exp $
  *
  * NOTES
  *
@@ -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 fb6170faf436a5c1ab1c4d87bf9e4af561ffea80..cffc4aac229a0ab5f8240302bcd8147ca94ca352 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.22 1999/07/15 22:39:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.23 1999/07/17 20:17:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 b6ba758849cffa735586745fbd5689ddc3380605..7740b5fc53ae953e17de6f741318bd6f715ee962 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,13 +8,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.56 1999/07/16 04:59:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.57 1999/07/17 20:17:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 032abac1ad96c73f25e72c28969c6c5e187d4fce..df8f991fae76ebe900def00d593687eab44ffd2d 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.32 1999/07/16 04:59:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.33 1999/07/17 20:17:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 711f56efb8fe795139933f9da361f4eb80cd08b1..427cc749c84079879b50221c886063816084a9b5 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.60 1999/07/16 04:59:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.61 1999/07/17 20:17:46 momjian Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -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 d8897cd4d0db49f548381654d37d1c0dd3e2520a..6f138f5784ab3c68d0bcaa05e872d626b6f0ebc4 100644
--- a/src/backend/storage/lmgr/multi.c
+++ b/src/backend/storage/lmgr/multi.c
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.32 1999/07/16 04:59:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c,v 1.33 1999/07/17 20:17:47 momjian Exp $
  *
  * NOTES:
  *	 (1) The lock.c module assumes that the caller here is doing
@@ -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 2fca5a4e3e6a8ef5b1169571c614ef674bfd5ae8..6186904ad455640c9476a8d2c3693afd1190ca7f 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.60 1999/07/17 20:17:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,11 +46,10 @@
  *		This is so that we can support more backends. (system-wide semaphore
  *		sets run out pretty fast.)				  -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.59 1999/07/16 04:59:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.60 1999/07/17 20:17:47 momjian Exp $
  */
 #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 11b9a262cd89b829204dc348c6769414c929f915..47e19bd09da4899afcd2129723368e8b7d865cf0 100644
--- a/src/backend/storage/lmgr/single.c
+++ b/src/backend/storage/lmgr/single.c
@@ -13,11 +13,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.11 1999/07/16 03:13:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c,v 1.12 1999/07/17 20:17:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index cb3d2f8dce658e1fd8cf8417c5a0d24d3f79d44d..d67fb0018c315f7667416973d79378aea474021c 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.25 1999/07/15 22:39:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.26 1999/07/17 20:17:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 3c5dd55e79c02e39faa96da57a4691c10f9520c5..a6b2a586705ebf8f3e20f30259221534655171fd 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.50 1999/07/16 04:59:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.51 1999/07/17 20:17:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 2eeb0a0eae17ef0a6d64b1c6761f7b02913fdc01..ef2818e16ec5d1d8e49f3ddd354e1949aa6c7e76 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,11 +10,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.27 1999/07/15 22:39:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.28 1999/07/17 20:17:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 a695903a547fccfe29c97c46b1e4fc77b6c48806..5035c8e38bda5fc2785f3ff18b74fc366880f813 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.14 1999/07/15 22:39:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.15 1999/07/17 20:17:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 2e76d7862ed3539d859438926327317c7829e622..3e08c726d8f40a0ed78e350129eda0cd331339bd 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.35 1999/07/16 04:59:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.36 1999/07/17 20:17:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 fa7045a9d972a22ecc6cac9acd7d4e1af00a54a9..8bc5b28ee9228365d49978ec405d4793c09d0540 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.28 1999/07/16 04:59:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.29 1999/07/17 20:17:50 momjian Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -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 777641477ee7731cb87191676c242a4e8b6d9576..6dfd32f6b107cca6ed713aaa399896be31a30436 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.124 1999/07/16 05:23:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.125 1999/07/17 20:17:51 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -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 6e08ed82fe6e6e075c899ad513051836a92f1d87..6307f0cd6a30ba09a7bd96afe81c4ebe555481e4 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.26 1999/07/16 04:59:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.27 1999/07/17 20:17:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/tioga/tgRecipe.c b/src/backend/tioga/tgRecipe.c
index 8b77db4fa26464190840c4947240a7beb1b949dd..d64b874873dac436c03aad2ce39e23982f7e711b 100644
--- a/src/backend/tioga/tgRecipe.c
+++ b/src/backend/tioga/tgRecipe.c
@@ -11,12 +11,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.14 1999/07/16 04:59:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tioga/Attic/tgRecipe.c,v 1.15 1999/07/17 20:17:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 9f64a77a3eefba4692e45ab3ef62eef31cbedbde..c3fa3396ef69654c6485de8b080925ef870f8365 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.39 1999/07/16 04:59:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.40 1999/07/17 20:17:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 8e09385ba4f79af82bc0d59f26237a84bc99d37f..c604ff852227820b7ad5c6092b977d658515af6b 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,15 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.46 1999/07/16 05:00:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.47 1999/07/17 20:17:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #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 3f2ac134f15a0a1fe36ffb8b8112874bd49a7fc2..5ed0d4b02705abc40644f33355efeda094e8cdcc 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.19 1999/07/16 03:13:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/bool.c,v 1.20 1999/07/17 20:17:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 df8175692697fb46d68a96231e2654ee0a8f3d1a..0bc44f4b95b93bbf2f0d933eb01b7b30c70a8d0a 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -9,11 +9,9 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.31 1999/07/16 05:00:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.32 1999/07/17 20:17:54 momjian Exp $
  */
 
-#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 cbef5655f0c43a282881951490d8949357de8a98..c3a4746978d21e217a8debcf207f398e033e5c40 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -8,12 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.25 1999/07/16 05:00:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/char.c,v 1.26 1999/07/17 20:17:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 00924009895ccda4bc326134826fe0bf4e30c9a3..d64ed0cf02d5e8c832c35399da66234c408f2b3b 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.22 1999/07/16 05:00:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.23 1999/07/17 20:17:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 e4255ebeb51bc4af0c1dedbe69c2f2b5718f5d89..6d98fe6ffff86f767ed78754a1108c3e97910e49 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.36 1999/07/16 05:00:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.37 1999/07/17 20:17:54 momjian Exp $
  *
  * NOTES
  *	 This code is actually (almost) unused.
@@ -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 cd1f0327de35e2d9bd9f5857594de97934fb391e..218ee74b9629bb92a335acb150c356e8104adc5b 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.37 1999/07/16 03:13:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.38 1999/07/17 20:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 84d33049c5fedb6a8584f36145484a87b2117259..3c0d4a53000d46baf87e1202f798b4fc885a8ac4 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.15 1999/07/15 22:39:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.16 1999/07/17 20:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 ba32e0a97432490187a0c7ff7ed773ff16131098..43da134d97c978f0a06db9e22976c503730351cd 100644
--- a/src/backend/utils/adt/dt.c
+++ b/src/backend/utils/adt/dt.c
@@ -7,16 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.75 1999/07/16 05:00:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/dt.c,v 1.76 1999/07/17 20:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 b6cefbab1feb7c944142e32e36e5e1ca278b1ea8..eb705b9f6b4b6de0c23d5d8f9bac90b232904a4f 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.21 1999/07/16 03:14:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.22 1999/07/17 20:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 e9bbe719895fbfcb316ab2379d82c683ba2b5873..7738e99a57783dad86f3e8543704a4385d3297fd 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.46 1999/07/16 03:14:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.47 1999/07/17 20:17:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 a3f0179212c45717acc28e0b125eca98fea5ef5a..7bb2aba7adc4bfd32b4fc34a2bd6942a2c540f41 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,16 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.44 1999/07/16 03:14:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.45 1999/07/17 20:17:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 45f8978a1ed8b3f924fa29a851dd9952f60b3d0d..c38ecc5a6f2150181052657bc7ad965ce2f3a4e7 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.7 1999/07/15 23:03:26 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.8 1999/07/17 20:17:56 momjian Exp $";
 
 #endif
 
@@ -26,9 +26,6 @@ static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.7 1999/07/15 23:03:26 momj
 #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 f5687f2533009a9f8b3b55b529d1ad1000b488ce..977c7ed4ed5a0f591d6fd7d6b67458e68e3c22bc 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.9 1999/07/15 23:03:27 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 1999/07/17 20:17:56 momjian Exp $";
 
 #endif
 
@@ -28,9 +28,6 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.9 1999/07/15 23:03:27 momj
 #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 1f971ff97a7d77b70d8dd7a11db864812f988262..3d37054d7ccf470d4f5daba8b3448bd414acc8e4 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.26 1999/07/16 05:00:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.27 1999/07/17 20:17:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 1c930fb5fab8d72e7bf29a6c77499e82a2e5e930..2e5e4ebf776d99339f64db21ba12c7faf8e8b473 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 9d13b2c42a9fb92a3169cf3bfa1d975e379b8cc1..73115522f2a70ec2e11abe0f499291fe7ee547bb 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 631fa75e69929b76a1fcf47ad936d573cb8e752d..28fa20057e2c9eeafa9df15c060318b4e4a54185 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,11 +1,9 @@
 /*
  *	PostgreSQL type definitions for MAC addresses.
  *
- *	$Id: mac.c,v 1.12 1999/07/15 23:03:27 momjian Exp $
+ *	$Id: mac.c,v 1.13 1999/07/17 20:17:57 momjian Exp $
  */
 
-#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 4fe29a46d38eeefb1a5631f303e30d7f0191222e..13d1e1565dd659a6b58ad1e2d1e6796a2f4d9f82 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -4,12 +4,10 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: nabstime.c,v 1.60 1999/07/16 05:23:19 momjian Exp $
+ *	  $Id: nabstime.c,v 1.61 1999/07/17 20:17:57 momjian Exp $
  *
  */
-#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 b2941d0617efdf79551025b1821359fa8503a9d2..b4d0a7da72887a1314f6c7fba183d92f6f109569 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -11,11 +11,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.22 1999/07/16 05:00:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/name.c,v 1.23 1999/07/17 20:17:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 889fc260c86d3986d4a7405e5e7973e562f98731..92580cfe965fc77fea35637a7977ee344e064f0d 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,15 +3,13 @@
  *	is for IP V4 CIDR notation, but prepared for V6: just
  *	add the necessary bits where the comments indicate.
  *
- *	$Id: network.c,v 1.14 1999/07/15 23:03:27 momjian Exp $
+ *	$Id: network.c,v 1.15 1999/07/17 20:17:58 momjian Exp $
  *	Jon Postel RIP 16 Oct 1998
  */
 
 #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 107824eada5359479a7957adfa70c941bf25bc8f..2ef45f63e425059d369c1af2f5896c12fe7a030f 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.19 1999/07/16 05:00:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.20 1999/07/17 20:17:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 cfe6beaff76698686cde240f3c3857932f38912f..97a03d23b832e7d69a850c517726f9ef70a7c86a 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -5,14 +5,11 @@
  *
  *	1998 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.18 1999/07/15 15:20:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.19 1999/07/17 20:17:58 momjian Exp $
  *
  * ----------
  */
 
-#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 b31dad564ca59b61df99643e23a66d640ed5f822..c28e2d367be6afbd8843d91f58217e8b25fae47c 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,11 +10,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.37 1999/07/16 05:00:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.38 1999/07/17 20:17:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 74422d4e3fe7c6f9761a665ee39ce36fbd17d2d1..ab53a4e86c0a9d79f5b3d20b7ae1a962741af76a 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -7,13 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.27 1999/07/16 05:00:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/oid.c,v 1.28 1999/07/17 20:17:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 1861115fcfffa6e9893c1f9bec6bc487e42e8b7a..082b1dba62a538bfb3c24f01d1ec7f15433c4838 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.27 1999/07/16 05:00:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.28 1999/07/17 20:17:59 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -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 bc2fcebc068825fe1f87f9b593035f0127250fff..754eea3a96e933522b9ca007a38b243660cc2991 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.41 1999/07/16 05:00:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.42 1999/07/17 20:17:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 53763414f44a83c3e8cd55da30f59f291e94f96c..8f365f2efbe9ae1b7c158d8e08eaedd11cb33ca0 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
  *			  out of it's tuple
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.20 1999/07/15 22:40:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.21 1999/07/17 20:17:59 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -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 2e57e2a1b94e6a0e9f60ed6268b0a60dd83cf442..db78c48525649537e49dea428040a276a08c8182 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,16 +12,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.34 1999/07/16 05:00:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.35 1999/07/17 20:17:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 15084778a49e0105c97919ffe5012f4db82f7ae7..05bc16b92aff49c566fb863de9886cf8befc911d 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,12 +9,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.24 1999/07/16 05:00:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.25 1999/07/17 20:18:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 383dcbbdd9ca388b854b3a1d7417321b1bdf6e58..9e4b81ec095be9abaf9b6c15a51e5f6edec6311f 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,17 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.10 1999/07/16 03:14:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.11 1999/07/17 20:18:00 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
  *
  *-------------------------------------------------------------------------
  */
-#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 4ad2ab3dea7efa7a0a6093504e18a62bf17d0351..cdbac4c7f13a6ddf00c647e6f75747aa4cba6cf8 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 7fa2480acd9c67610361e1b2182308fbc2597fee..8d27a1ca6d84e71742a92a245f3941a35e8fc6ad 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.53 1999/07/17 16:25:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.54 1999/07/17 20:18:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 94011f04fa1e705c122955e9a372e1d5024e5cd0..08eac37460a24aa39035d7076a982975f0e5660d 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.52 1999/07/16 05:00:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.53 1999/07/17 20:18:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 a756a2ca9c857e19f8135e2af0a7c3539199f6fe..2d4dd5cf273f6af4146987f96fefe5844129ce34 100644
--- a/src/backend/utils/adt/version.c
+++ b/src/backend/utils/adt/version.c
@@ -5,12 +5,11 @@
  *
  * IDENTIFICATION
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.8 1999/07/15 15:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/version.c,v 1.9 1999/07/17 20:18:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 137d3ceed4733ce9adb3f84bb53cf087132fb4fb..f6ef0fecac266eb116cb82eff2759c0a49045e6d 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.47 1999/07/16 05:00:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.48 1999/07/17 20:18:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 312b92571736dca298d4e9d66e6b8cb3dfb466de..33ba637b13c01d0a0ba1600f3f9c846533b1c55b 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,16 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.25 1999/07/16 05:00:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.26 1999/07/17 20:18:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 871699ee7d7f278ed74666ff14af5503f6079705..07583a4b72a3a4069741b2c6b74b4ac35f5f45c2 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.30 1999/07/16 05:23:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.31 1999/07/17 20:18:01 momjian Exp $
  *
  * NOTES
  *	  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 4e147035606919790b74e17cbccbeccf05f608a3..b6802d71f73d8ccb8202e98a0dec06645b369a9e 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.66 1999/07/16 05:23:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.67 1999/07/17 20:18:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 be33936a7eb9d56504ab26dbfdc8da9f4c6853a8..3a7f524ccce1abcb7a244c38b7b77a5179c89888 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.30 1999/07/16 05:23:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.31 1999/07/17 20:18:02 momjian Exp $
  *
  * NOTES
  *	  These routines allow the parser/planner/executor to perform
@@ -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 54ca5844584532aaea97196f8049dd3fc7983b4f..015737d4b77acfba13943b469e2784a0bf1daaa3 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.9 1999/07/16 05:23:21 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.10 1999/07/17 20:18:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 0f7b6eb8a6c710d2dd970be5cc66c3a136e28e73..a642203e0ca2dd6a502f01797b3a76d94c201c7c 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.15 1999/07/16 03:14:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.16 1999/07/17 20:18:03 momjian Exp $
  *
  * NOTE
  *	  This should eventually work with elog(), dlog(), etc.
  *
  *-------------------------------------------------------------------------
  */
-#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 06dad245db565387e8dc0908e3f32886e1fbeb48..056795457001fd32b63e4931c2ebd5125749d25e 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,19 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.46 1999/07/16 05:23:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.47 1999/07/17 20:18:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 bc246eedf5819e297eb8039e7f50680e099c4c89..d15715a8e67866174c390c31bcdcb5dfb2f2d4a8 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.27 1999/07/16 05:23:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.28 1999/07/17 20:18:04 momjian Exp $
  *
  * NOTE
  *	  XXX this code needs improvement--check for state violations and
@@ -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 0f64a0c9098ad6b3f3f79d172034ebce621666c3..99a9c0004d57231b2f9ff56adc2edc30e3bd8045 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.13 1999/06/19 05:00:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.14 1999/07/17 20:18:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 c6772ae7c59453ccc65ec60255aea3b97035a641..d48d8b8840aefc08b77fe7b2678430831f44f044 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,14 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.30 1999/07/16 23:05:45 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.31 1999/07/17 20:18:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 7575ae7d8639c967124de5803b81ca01f010f015..6b95c4c11e3a479d746694dd717ab49a53aa3c95 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.31 1999/07/16 05:23:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.32 1999/07/17 20:18:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 4d9b339cd84df1c432a79b2cd60a9ae912348c46..5e7fcd0fdfae95c4d257de767d7cde6ec77b539c 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.26 1999/07/16 05:23:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.27 1999/07/17 20:18:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,9 +39,8 @@
  * Modified by sullivan@postgres.berkeley.edu 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 34f0966b8a7ecc44700fe7d226a85f692a6a4b86..4541023f1927f5ebfef331dcb4ab226de8a72fb7 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.9 1999/02/13 23:19:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/hashfn.c,v 1.10 1999/07/17 20:18:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 baef1f6fffdaace4b9548e8815fa3e74313922dd..fc22d0da2d2c3a66622d41fe42febd12dbd56a0f 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -6,14 +6,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.15 1999/07/16 03:14:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.16 1999/07/17 20:18:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 ae27be31ba391152d415fb20816f79a9c5cda26c..1cde72e6b2f9ccfac1660fe2ef91394ed260514a 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.35 1999/07/16 05:23:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.36 1999/07/17 20:18:08 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -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 0198850d29525cd1ca9bc866b1480f1e8fb1c13c..88baaf4a8915d11a332913515c7496e242d71ca1 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,24 +7,19 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.33 1999/07/16 05:23:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.34 1999/07/17 20:18:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 022866b0a430e207a9f0832d37475e2c8b58851b..4118fe16a181971a8cc39aab194dbb19f9342b50 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.47 1999/07/17 16:25:25 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.48 1999/07/17 20:18:08 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -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 aa5b01ad569a1b3119143c25ff0b450d10c725d3..a63cd37332d23e598841c57ce753bcf20c77bd72 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -3,10 +3,8 @@
  * client encoding and server internal encoding.
  * (currently mule internal code (mic) is used)
  * Tatsuo Ishii
- * $Id: mbutils.c,v 1.7 1999/07/17 16:25:26 momjian Exp $ */
+ * $Id: mbutils.c,v 1.8 1999/07/17 20:18:10 momjian Exp $ */
 
-#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 eb097e1b8108873046ef32b9afeedf0e9c233b9f..39270f35c0c4292a9d0ef3ea064f62011a68677e 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.27 1999/07/16 05:23:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.28 1999/07/17 20:18:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 27fbf486cc24bb3cb135a55fba1f8652b537aa05..baf8ce6121868bc050835f4322c372e701ea7067 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 bb5dedd6854767c95b72f41793fbd9b2c91d2759..28f4417525d7b74b1504bdc9d93c1a33f6ef1359 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.19 1999/07/16 05:23:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.20 1999/07/17 20:18:13 momjian Exp $
  *
  * NOTE:
  *	This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -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 6a5f32b19e82ce77ef90c41684cf9c00906b9331..6954452ce75431eb1e8243523bbbb85d4991bc63 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,11 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.18 1999/07/16 05:23:28 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.19 1999/07/17 20:18:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/utils/mmgr/palloc.c b/src/backend/utils/mmgr/palloc.c
index 4eb27ccbc6f80cde79e15a5866ad2ac61a9b6580..5b2cc419e84a73cfef5c0d7374b1f54bf4f36e69 100644
--- a/src/backend/utils/mmgr/palloc.c
+++ b/src/backend/utils/mmgr/palloc.c
@@ -7,16 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.13 1999/07/15 15:20:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/Attic/palloc.c,v 1.14 1999/07/17 20:18:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 606e5839edb363562f889096af9a9c65acb7daf7..a49dca40b6a437be3a192361122530e447737d8a 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.27 1999/07/16 05:23:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.28 1999/07/17 20:18:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 afabb4165f330a9de0cb26c50fafcb8e090471db..7f521b821f4645aa3c6f90eb762c732b8eae6375 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,12 +8,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.18 1999/07/16 05:23:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.19 1999/07/17 20:18:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 40805818a70c24e382faf72609937a18aa1208d4..b1ac25280756552f089488c2d5778cc475bb45ff 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: psort.c,v 1.55 1999/07/16 05:23:30 momjian Exp $
+ *	  $Id: psort.c,v 1.56 1999/07/17 20:18:16 momjian Exp $
  *
  * NOTES
  *		Sorts the first relation into the second relation.
@@ -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 d0737b4b114bede376fc4fec0ca59961a681a809..73aae724a3d056e9ade3d0400defa06aeeec93f9 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.32 1999/05/27 16:29:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.33 1999/07/17 20:18:18 momjian Exp $
  *
  * Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
  *
@@ -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 f7e4ad21c032e7eac754a4599a04ed7958caa0df..c1597d7f26c85eefcb00c42d7dc976502a22bf66 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.116 1999/07/15 15:20:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.117 1999/07/17 20:18:18 momjian Exp $
  *
  * Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
  *
@@ -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 a6b16e0d6f4ae19768760c8d8c24b6aa702f1e1f..e03005338a7ae02e2c7964a454ac6469d0e2e55e 100644
--- a/src/bin/pg_encoding/pg_encoding.c
+++ b/src/bin/pg_encoding/pg_encoding.c
@@ -7,12 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.3 1999/02/13 23:20:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_encoding/Attic/pg_encoding.c,v 1.4 1999/07/17 20:18:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 4acdc3054b2a8ceaf4d1a2872eea167e19a4114f..001ce9a7720b9dc6ca34a94fec8449fb64570dc4 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 e0108ba65cbbe0ded7f70a3b5d27618d62416c57..5b042bdab6ba8d970ab277fd740b48041bfac3fd 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,13 +7,10 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.182 1999/06/04 21:21:13 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.183 1999/07/17 20:18:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 bf6bece7dab6520435ab00b977b2984844797301..f3cedd39a684987cdf8deb43fb1840f00f49f35a 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -7,14 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.16 1999/02/13 23:20:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/psql/stringutils.c,v 1.17 1999/07/17 20:18:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#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 1fd1aa0421ea1ac132d749691a503eb44fe24009..174d20cb1c41bc8a52c1dc16bc4afbe8928d87db 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.60 1999/07/17 04:12:09 momjian Exp $
+ * $Id: c.h,v 1.61 1999/07/17 20:18:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 20ce01a250123716d1d812175c7b71d274948cfe..a23c81227e645aa1829454c111ed6633ff444300 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.36 1999/07/15 23:03:47 momjian Exp $
+ * $Id: executor.h,v 1.37 1999/07/17 20:18:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 80af87f16a47492bdff76a69dfdd5b6a3d22f12a..9c5f8d5cfc239e48e19aa21af837f1c9721e0d17 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 fe979ebdd56effe2d5bc65b42c7bc92bcd806ed5..9b38673d41ecf96d6fe7df1c34379c505d5e49e1 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -7,14 +7,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $
+ * $Id: libpq-be.h,v 1.16 1999/07/17 20:18:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 31a2db542224611fc79f6f5bd3f59f5a8e3c7ab9..d9481970372a9b53485310093d75d2ef3a7c3ca7 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.37 1999/07/15 23:03:50 momjian Exp $
+ * $Id: pqcomm.h,v 1.38 1999/07/17 20:18:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 abb6398a70af285c218678a4105b1abe38a97726..434b90fae21683867c1d663e3c41b61d05620088 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $
+ * $Id: geqo_misc.h,v 1.13 1999/07/17 20:18:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 de36c6ffb5623a5ab097aae1b93ed2b167e77f29..bf51a8b8e74873b3b843c2f0004a33f040f44c80 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 c434d1beec40b09fcd549164599dbc6a2fed371d..195401e23fc13a8503450be6300409b72a03be5d 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.28 1999/07/15 23:04:09 momjian Exp $
+ * $Id: bufmgr.h,v 1.29 1999/07/17 20:18:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 361b8c15ebc624dc4d84ec8c666e1c186a67c5ad..beb93bf699c69d9f2817592cf1a1e6803cdb2770 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.16 1999/05/26 12:56:53 momjian Exp $
+ * $Id: fd.h,v 1.17 1999/07/17 20:18:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 ed4705184dbc6687eb590dcd7b1b9fb2ac25c21d..f31c9d385d032d29786e84713981ed95ca5c353b 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $
+ * $Id: array.h,v 1.20 1999/07/17 20:18:35 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -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 71154579f5c59cb8eb6665110215d63b42989b8e..4598c2ab86c5e15cf41861ee7c737a04ee2a1385 100644
--- a/src/include/utils/lselect.h
+++ b/src/include/utils/lselect.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $
+ * $Id: lselect.h,v 1.14 1999/07/17 20:18:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 43941fd6481adf0df3f52a22d330f70189faa57f..63f9b137c4696c474b1aa1a71805f9a40caec79b 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 dcfaf16e95fdc9f49e166de9a4532a0b98ae8280..4bcdee3ae575a220c5f84529741067ce0475a36e 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 9a8b94bd256d0b0311f2a6ffcc83602f3d19b5e6..4d04c00dd9cae5b5c996ac00bf9cb50fb223236d 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 aa6c2c274b3066e0d7927879b5e694e4fc0fd45f..6bfabd338dee22d3ed363c5007f47b3bddf94054 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
@@ -12,12 +11,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 8ecd9a92e9fa9f529f3624163a1ec0da33bc7895..c5c2f93652738dd5133efd902746d4129576a55a 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 70865ff3ee400c012bb954eae8b6a49459ad44ed..fe72134a98ac3bbfdc24a5a4d37c4e0a6419b529 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -7,12 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.15 1999/07/15 15:21:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/keywords.c,v 1.16 1999/07/17 20:18:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #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 1585e395b0cb729932a717df41c4866775115080..493d6e3c70607afe80f2b5180bc0bde49357e39c 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 ff1f9907f9c207062f765e7231f4fb1b2a8f8744..04b27c5f1fefe8967b2c23a696b14916b0686c98 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 0a8f3265a8f24f8ecfe700f4f3c9a2850ac645bb..724a69b369187484f0f3e37d5a4743783331f8c8 100644
--- a/src/interfaces/libpgtcl/pgtcl.c
+++ b/src/interfaces/libpgtcl/pgtcl.c
@@ -9,13 +9,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.15 1999/05/25 22:43:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtcl.c,v 1.16 1999/07/17 20:18:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 e8a1e09ef5043d205fc944c5dfda4ac7df297d0f..dbe81771b3bbf395e4fb80a36e9ed41856dd91db 100644
--- a/src/interfaces/libpgtcl/pgtclCmds.c
+++ b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,14 +7,11 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.44 1999/05/25 22:43:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.45 1999/07/17 20:18:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 2dee00573fb118e3f35d7fdf66e98349f9ba1037..1efd6bf7968698328c1ed6aefd018a7b0bd5bc2b 100644
--- a/src/interfaces/libpgtcl/pgtclId.c
+++ b/src/interfaces/libpgtcl/pgtclId.c
@@ -12,13 +12,11 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.20 1999/05/25 22:43:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclId.c,v 1.21 1999/07/17 20:18:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#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 534e8eda58d37450a2459777af7d2e7d0b6fcd2e..62f5ad4f8eb479e0203b88d9f71a465002295226 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.29 1999/05/25 16:15:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.30 1999/07/17 20:18:43 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 aac114635228b48245b0c8d20a808359fcd71f73..8f7540d57e6ee2ed4dbaab998b92e5499cbcbd37 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.98 1999/06/17 15:16:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.99 1999/07/17 20:18:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 446a70c821a0d2c048d6f4680f0914f0aaadb79d..1ca2440c635d1d850bf51f389df36bd97dc04a20 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.81 1999/05/28 01:54:53 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.82 1999/07/17 20:18:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 e618615d140b7fd1b63c5986d08a400d1d21187b..b5757a0b9febd0c3c34b96798b14a11b390ecad8 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.20 1999/05/10 00:46:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.21 1999/07/17 20:18:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 a16b89e5c3a36bbd2895ea172f9605712dc27709..d31ee45647d4120294357f086c1788d7bbaeea09 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -24,18 +24,17 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.25 1999/05/28 01:54:53 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.26 1999/07/17 20:18:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #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 d5793af085294507c7dc6dd57df6f96b86dd9975..1b8c73b07fcd6f320bfcaa3e5f789780b7865c28 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -9,7 +9,7 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.23 1999/05/25 16:15:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.24 1999/07/17 20:18:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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 2d0a57cd2d04324d6f7c7e35339a651b21775d8c..9d0573bcd7fa3dcfb5c173a72e47757a177aa901 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -3,7 +3,7 @@
  *			  procedural language
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.3 1999/01/27 16:15:22 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/pl/plpgsql/src/plpgsql.h,v 1.4 1999/07/17 20:18:47 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -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 cb5d35bacf6892962fd9b17b67a9d985543b42f9..da19fa49aaea056f747789eb60c3170f1acbc8bf 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 560962a61295907a31c7f1c55f82e49c8eefcef2..8369e671ddd568768c8b69e990206e9756a1216b 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 6cfa26017e4f3a55fb73553da4295d4f5f9ee593..3f3b0ede4bce69fb6b2c4cdc1092c63a93a19fe7 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -1,12 +1,10 @@
 /*
- * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.32 1999/05/25 16:15:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/test/regress/regress.c,v 1.33 1999/07/17 20:18:52 momjian Exp $
  */
 
 #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 b44bbc067dafbfe7e947b443f1432572142e5856..0a8f1408271656cede0493ef3c48c63b0d24b108 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 8da815c2feffaedb7647958ac7c8949ae7fb847b..5cb8d95c7368560dcac79461663415975cdafb1d 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 9ed16feb60c2c512d8ed16da23028f74471a9ac3..2284093eab878bab3516e4850068344e34d37b7f 100644
--- a/src/utils/version.c
+++ b/src/utils/version.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.11 1999/02/13 23:22:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/utils/Attic/version.c,v 1.12 1999/07/17 20:18:55 momjian Exp $
  *
  * NOTES
  *		XXX eventually, should be able to handle version identifiers
@@ -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>