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

27 years ago · 3406901a29
parent c62b8a68bf
commit 3406901a29
262 changed files with 265 additions and 883 deletions
--- 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 */
--- 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
--- 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"

--- 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
--- 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,
--- 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,
--- 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);
--- 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;

--- 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);
--- 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);
--- 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
--- 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)
--- 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
--- 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);

--- 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
--- 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"

--- 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);
--- 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"
--- 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"
--- 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,
--- 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]
--- 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)
--- 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,
--- 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
 		   *
--- 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
 {
--- 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 */
--- 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"
--- 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"
--- 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"
--- 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 */

--- 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"
--- 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"

--- 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,
--- 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"
--- 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"

--- 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
--- 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,
--- 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
--- 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);
--- 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"

--- 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>
--- 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"

--- 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"
--- 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>

--- 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"

--- 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>

--- 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"
--- 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"

--- 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"

--- 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"

--- 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
--- 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"
--- 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"

--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@ -5,7 +5,6 @@
 *
 *-------------------------------------------------------------------------
 */
-#include <string.h>
 #include "postgres.h"


--- 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>
--- 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>
--- 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>

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@ -15,7 +15,6 @@
 *
 *-------------------------------------------------------------------------
 */
-#include <string.h>

 #include "postgres.h"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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"
--- 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 */
--- 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"

--- 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"

--- 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);

--- 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"
--- 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>
--- 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"
--- 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"

--- 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"
--- 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"
--- 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
--- 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>
--- 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"
--- 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>
--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"

--- a/Show More
+++ b/Show More