Final cleanup.

src/backend/access/common/heaptuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.55 1999/07/15 23:02:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.56 1999/07/16 04:58:21 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -23,6 +23,7 @@
 #include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/common/indextuple.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.35 1999/07/15 23:02:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.36 1999/07/16 04:58:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/common/tupdesc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.52 1999/07/15 23:02:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.53 1999/07/16 04:58:22 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -27,6 +27,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/gist/gist.c

@@ -13,16 +13,17 @@
 
 #include "postgres.h"
 
-#include "catalog/pg_index.h"
 #include "access/genam.h"
 #include "access/gist.h"
 #include "access/gistscan.h"
 #include "access/heapam.h"
 #include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "executor/executor.h"
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/gist/gistget.c

@@ -17,6 +17,7 @@
 #include "executor/execdebug.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/gist/gistscan.c

@@ -12,11 +12,12 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/gist.h"
 #include "access/gistscan.h"
-#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/hash/hash.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.28 1999/07/15 23:02:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.29 1999/07/16 04:58:24 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -17,14 +17,15 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/hash.h"
-#include "executor/executor.h"
 #include "access/heapam.h"
-#include "access/genam.h"
 #include "catalog/index.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/hash/hashovfl.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.22 1999/07/15 23:02:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
@@ -19,6 +19,7 @@
 #include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/hash/hashpage.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.22 1999/07/15 23:02:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.23 1999/07/16 04:58:25 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -25,11 +25,12 @@
 
 #include "postgres.h"
 
+#include "access/genam.h"
 #include "access/hash.h"
 #include "miscadmin.h"
-#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/hash/hashsearch.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.19 1999/07/15 23:02:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/hash/hashutil.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.19 1999/07/15 23:02:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.20 1999/07/16 04:58:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/iqual.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/heap/heapam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.50 1999/07/15 23:02:57 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.51 1999/07/16 04:58:26 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -76,16 +76,17 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "miscadmin.h"
-#include "utils/relcache.h"
-#include "access/valid.h"
 #include "access/hio.h"
-#include "storage/smgr.h"
+#include "access/valid.h"
 #include "catalog/catalog.h"
-#include "utils/inval.h"
+#include "miscadmin.h"
+#include "storage/smgr.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/relcache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/heap/hio.c

@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.24 1999/07/15 23:02:57 momjian Exp $
+ *	  $Id: hio.c,v 1.25 1999/07/16 04:58:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/hio.h"
 #include "access/heapam.h"
+#include "access/hio.h"
 
 /*
  * amputunique	- place tuple at tid

src/backend/access/heap/stats.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.19 1999/07/15 23:02:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
  *
  * NOTES
  *	  initam should be moved someplace else.
@@ -23,6 +23,7 @@
 #include "access/heapam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/index/genam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.19 1999/07/15 23:02:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.20 1999/07/16 04:58:27 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -45,10 +45,10 @@
  */
 
 #include "postgres.h"
-
 #include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/index/indexam.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.34 1999/07/15 23:02:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.35 1999/07/16 04:58:28 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -66,8 +66,8 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "utils/relcache.h"
 #include "access/heapam.h"
+#include "utils/relcache.h"
 
 /* ----------------
  *	 undefine macros we aren't going to use that would otherwise

src/backend/access/index/istrat.c

@@ -8,14 +8,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.34 1999/07/15 22:38:44 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.35 1999/07/16 04:58:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
 #include "catalog/catname.h"
@@ -23,6 +22,7 @@
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_index.h"
 #include "catalog/pg_operator.h"
+#include "miscadmin.h"
 #include "utils/syscache.h"
 
 #ifdef USE_ASSERT_CHECKING

src/backend/access/nbtree/nbtinsert.c

@@ -7,17 +7,18 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.46 1999/07/15 23:03:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.47 1999/07/16 04:58:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/nbtree.h"
 #include "access/heapam.h"
+#include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/nbtree/nbtpage.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.28 1999/07/15 23:03:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.29 1999/07/16 04:58:29 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -23,15 +23,15 @@
 #include <time.h>
 
 #include "postgres.h"
-
-#include "access/nbtree.h"
-#include "miscadmin.h"
-
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif
 
+#include "access/nbtree.h"
+#include "miscadmin.h"
+
 #define BTREE_METAPAGE	0
 #define BTREE_MAGIC		0x053162
 

src/backend/access/nbtree/nbtree.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.43 1999/07/15 23:03:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -17,19 +17,19 @@
  */
 
 #include "postgres.h"
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
 
 #include "access/genam.h"
-#include "access/nbtree.h"
-#include "executor/executor.h"
 #include "access/heapam.h"
+#include "access/nbtree.h"
 #include "catalog/index.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
 
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
-
 #ifdef BTREE_BUILD_STATS
 #define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
 #endif

src/backend/access/nbtree/nbtsearch.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.49 1999/07/15 23:03:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.50 1999/07/16 04:58:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/nbtree/nbtsort.c

@@ -5,7 +5,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: nbtsort.c,v 1.43 1999/07/15 22:38:49 momjian Exp $
+ *	  $Id: nbtsort.c,v 1.44 1999/07/16 04:58:30 momjian Exp $
  *
  * NOTES
  *
@@ -54,6 +54,7 @@
 #include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/nbtree/nbtutils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.30 1999/07/15 22:38:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.31 1999/07/16 04:58:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@ extern int	NIndexTupleProcessed;
 
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/rtree/rtget.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.17 1999/07/15 23:03:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.18 1999/07/16 04:58:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/rtree/rtproc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.22 1999/07/15 23:03:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.23 1999/07/16 04:58:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 #include "utils/builtins.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/rtree/rtree.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.34 1999/07/15 23:03:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.35 1999/07/16 04:58:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,14 @@
 #include "postgres.h"
 
 #include "access/genam.h"
-#include "catalog/index.h"
+#include "access/heapam.h"
 #include "access/rtree.h"
-#include "utils/geo_decls.h"
+#include "catalog/index.h"
 #include "executor/executor.h"
-#include "access/heapam.h"
+#include "utils/geo_decls.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/rtree/rtscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.27 1999/07/15 23:03:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.28 1999/07/16 04:58:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/access/rtree/rtstrat.c

@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.13 1999/07/15 23:03:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.14 1999/07/16 04:58:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/rtree.h"
 #include "access/istrat.h"
+#include "access/rtree.h"
 
 static StrategyNumber RelationGetRTStrategy(Relation r,
 					  AttrNumber attnum, RegProcedure proc);

src/backend/access/transam/transsup.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.23 1999/07/15 23:03:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.24 1999/07/16 04:58:33 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -18,8 +18,8 @@
 
 #include "postgres.h"
 
-#include "utils/bit.h"
 #include "access/xact.h"
+#include "utils/bit.h"
 
 static XidStatus TransBlockGetXidStatus(Block tblock,
 					   TransactionId transactionId);

src/backend/access/transam/xact.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.45 1999/07/15 23:03:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.46 1999/07/16 04:58:33 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -144,14 +144,14 @@
  */
 #include "postgres.h"
 
-#include "utils/inval.h"
-#include "utils/portal.h"
-#include "storage/proc.h"
 #include "catalog/heap.h"
-#include "utils/relcache.h"
 #include "commands/async.h"
 #include "commands/sequence.h"
 #include "libpq/be-fsstubs.h"
+#include "storage/proc.h"
+#include "utils/inval.h"
+#include "utils/portal.h"
+#include "utils/relcache.h"
 
 extern bool	SharedBufferChanged;
 

src/backend/bootstrap/bootparse.y

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.25 1999/05/10 00:44:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.26 1999/07/16 04:58:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 
 #include "access/attnum.h"
 #include "access/funcindex.h"
@@ -34,6 +33,7 @@
 #include "catalog/pg_attribute.h"
 #include "catalog/pg_class.h"
 #include "commands/defrem.h"
+#include "miscadmin.h"
 #include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"

src/backend/bootstrap/bootscanner.l

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.12 1999/02/13 23:14:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootscanner.l,v 1.13 1999/07/16 04:58:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,31 +17,32 @@
 
 #include "postgres.h"
 
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
-#include "catalog/pg_attribute.h"
+
+
+
 #include "access/attnum.h"
-#include "nodes/pg_list.h"
-#include "access/tupdesc.h"
-#include "access/itup.h"
 #include "access/funcindex.h"
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_class.h"
-#include "nodes/nodes.h"
-#include "rewrite/prs2lock.h"
+#include "access/htup.h"
+#include "access/itup.h"
 #include "access/skey.h"
 #include "access/strat.h"
-#include "utils/rel.h"
+#include "access/tupdesc.h"
 #include "bootstrap/bootstrap.h"
-
-#include "nodes/primnodes.h"
-#include "utils/nabstime.h"
-#include "access/htup.h"
+#include "catalog/pg_am.h"
+#include "catalog/pg_attribute.h"
+#include "catalog/pg_class.h"
+#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
-
+#include "nodes/pg_list.h"
+#include "nodes/primnodes.h"
 #include "parser/scansup.h"
+#include "rewrite/prs2lock.h"
+#include "storage/block.h"
+#include "storage/fd.h"
+#include "storage/itemptr.h"
+#include "storage/off.h"
+#include "utils/nabstime.h"
+#include "utils/rel.h"
 
 #include "bootstrap_tokens.h"
 

src/backend/bootstrap/bootstrap.c

@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.63 1999/07/16 03:12:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.64 1999/07/16 04:58:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,13 +18,13 @@
 #include <setjmp.h>
 #include <string.h>
 #ifdef __CYGWIN32__
+#include <getopt.h>
 #endif
 
 #define BOOTSTRAP_INCLUDE		/* mask out stuff in tcop/tcopprot.h */
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 
 #include "access/genam.h"
 #include "access/heapam.h"
@@ -33,12 +33,14 @@
 #include "catalog/index.h"
 #include "catalog/pg_type.h"
 #include "libpq/pqsignal.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #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))

src/backend/catalog/aclchk.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.24 1999/07/16 03:12:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.25 1999/07/16 04:58:35 momjian Exp $
  *
  * NOTES
  *	  See acl.h.
@@ -17,21 +17,21 @@
 #include <string.h>
 #include "postgres.h"
 
-#include "utils/acl.h"
 #include "access/heapam.h"
-#include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
 #include "catalog/pg_group.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
+#include "miscadmin.h"
 #include "parser/parse_agg.h"
 #include "parser/parse_func.h"
+#include "utils/acl.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
 
 static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode);
 

src/backend/catalog/catalog.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.23 1999/07/16 03:12:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.24 1999/07/16 04:58:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,12 +15,12 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
-#include "utils/syscache.h"
+#include "access/transam.h"
+#include "catalog/catalog.h"
 #include "catalog/catname.h"
 #include "catalog/pg_type.h"
-#include "catalog/catalog.h"
-#include "access/transam.h"
+#include "miscadmin.h"
+#include "utils/syscache.h"
 
 /*
  * relpath				- path to the relation

src/backend/catalog/heap.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.91 1999/07/15 22:38:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.92 1999/07/16 04:58:36 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -42,8 +42,8 @@
 #include "catalog/pg_relcheck.h"
 #include "commands/trigger.h"
 #include "optimizer/tlist.h"
-#include "parser/parse_expr.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_expr.h"
 #include "rewrite/rewriteRemove.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
@@ -53,6 +53,7 @@
 #include "utils/temprel.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/catalog/index.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.83 1999/07/15 22:38:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.84 1999/07/16 04:58:37 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -19,6 +19,12 @@
  */
 #include "postgres.h"
 
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/istrat.h"
@@ -41,11 +47,6 @@
 #include "utils/syscache.h"
 #include "utils/temprel.h"
 
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
-
 /*
  * macros used in guessing how many tuples are on a page.
  */

src/backend/catalog/pg_aggregate.c

@@ -7,21 +7,22 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.22 1999/07/15 23:03:04 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.23 1999/07/16 04:58:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "utils/builtins.h"
 #include "catalog/catname.h"
-#include "utils/syscache.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_aggregate.h"
 #include "miscadmin.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/catalog/pg_operator.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.39 1999/07/15 22:38:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.40 1999/07/16 04:58:37 momjian Exp $
  *
  * NOTES
  *	  these routines moved here from commands/define.c and somewhat cleaned up.
@@ -21,12 +21,13 @@
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "parser/parse_func.h"
 #include "miscadmin.h"
+#include "parser/parse_func.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/catalog/pg_proc.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.31 1999/07/15 22:38:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.32 1999/07/16 04:58:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,15 +20,16 @@
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
 #include "optimizer/planner.h"
+#include "parser/parse_type.h"
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 #include "utils/fmgrtab.h"
 #include "utils/lsyscache.h"
 #include "utils/sets.h"
 #include "utils/syscache.h"
-#include "parser/parse_type.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/catalog/pg_type.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.38 1999/07/15 22:38:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.39 1999/07/16 04:58:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/commands/_deadcode/recipe.c

@@ -7,28 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.6 1999/07/16 03:12:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.7 1999/07/16 04:58:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/makefuncs.h"
 #include "catalog/pg_type.h"
 #include "commands/recipe.h"
+#include "executor/executor.h"
 #include "libpq/libpq-be.h"
+#include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+#include "optimizer/planner.h"
 #include "parser/parse_node.h"
-#include "utils/builtins.h"
-#include "utils/relcache.h"
 #include "rewrite/rewriteHandler.h"
 #include "rewrite/rewriteManip.h"
-#include "tcop/pquery.h"
 #include "tcop/dest.h"
-#include "optimizer/planner.h"
-#include "executor/executor.h"
+#include "tcop/pquery.h"
+#include "utils/builtins.h"
+#include "utils/relcache.h"
 
 /* from tcop/postgres.c */
 extern CommandDest whereToSendOutput;

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.50 1999/07/16 03:12:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -85,17 +85,17 @@
 
 #include "postgres.h"
 
-#include "commands/async.h"
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_listener.h"
+#include "commands/async.h"
 #include "lib/dllist.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
+#include "utils/ps_status.h"
 #include "utils/syscache.h"
 #include "utils/trace.h"
-#include "utils/ps_status.h"
 
 /* stuff that we really ought not be touching directly :-( */
 extern TransactionState CurrentTransactionState;

src/backend/commands/cluster.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.42 1999/07/15 23:03:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.43 1999/07/16 04:58:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,19 +22,17 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "access/heapam.h"
 #include "access/genam.h"
-#include "utils/syscache.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "catalog/index.h"
+#include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/cluster.h"
 #include "commands/rename.h"
-#include "utils/builtins.h"
-#include "catalog/pg_proc.h"
 #include "optimizer/internal.h"
-#ifndef NO_SECURITY
-#endif	 /* !NO_SECURITY */
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static Relation copy_heap(Oid OIDOldHeap);
 static void copy_index(Oid OIDOldIndex, Oid OIDNewHeap);

src/backend/commands/command.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.50 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.51 1999/07/16 04:58:38 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -20,23 +20,23 @@
  *
  *-------------------------------------------------------------------------
  */
+#include <string.h>
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "catalog/indexing.h"
 #include "catalog/catalog.h"
 #include "catalog/catname.h"
+#include "catalog/indexing.h"
 #include "catalog/pg_type.h"
 #include "commands/command.h"
 #include "executor/execdefs.h"
 #include "executor/executor.h"
+#include "miscadmin.h"
 #include "optimizer/prep.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/temprel.h"
 #include "utils/syscache.h"
-#include "miscadmin.h"
-#include <string.h>
+#include "utils/temprel.h"
 
 /* ----------------
  *		PortalExecutorHeapMemory stuff

src/backend/commands/copy.c

@@ -6,34 +6,35 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.83 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.84 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
 
 #include "postgres.h"
 
-#include "access/heapam.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include <sys/stat.h>
-#include "catalog/pg_index.h"
-#include "utils/syscache.h"
-#include "executor/executor.h"
-#include "catalog/index.h"
 #include "access/genam.h"
-#include "catalog/pg_type.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
+#include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "catalog/pg_shadow.h"
+#include "catalog/pg_type.h"
 #include "commands/copy.h"
 #include "commands/trigger.h"
+#include "executor/executor.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 
 #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))

src/backend/commands/creatinh.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.43 1999/07/15 23:03:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.44 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,14 +16,14 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
-#include "commands/creatinh.h"
 #include "access/heapam.h"
-#include "utils/syscache.h"
 #include "catalog/catname.h"
-#include "catalog/pg_type.h"
+#include "catalog/heap.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_ipl.h"
+#include "catalog/pg_type.h"
+#include "commands/creatinh.h"
+#include "utils/syscache.h"
 
 /* ----------------
  *		local stuff

src/backend/commands/dbcommands.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.37 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.38 1999/07/16 04:58:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,9 @@
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/dbcommands.h"
 #include "miscadmin.h"
 #include "tcop/tcopprot.h"
-#include "commands/dbcommands.h"
 #include "utils/syscache.h"
 
 

src/backend/commands/define.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.32 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.33 1999/07/16 04:58:40 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -42,17 +42,17 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
+#include "catalog/pg_shadow.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_language.h"
-#include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
 #include "commands/defrem.h"
-#include "tcop/dest.h"
-#include "catalog/pg_shadow.h"
+#include "fmgr.h"
 #include "optimizer/cost.h"
+#include "tcop/dest.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);

src/backend/commands/explain.c

@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- *	  $Id: explain.c,v 1.40 1999/07/15 23:03:08 momjian Exp $
+ *	  $Id: explain.c,v 1.41 1999/07/16 04:58:40 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -12,13 +12,13 @@
 
 #include "postgres.h"
 
-#include "nodes/print.h"
-#include "lib/stringinfo.h"
 #include "commands/explain.h"
-#include "parser/parsetree.h"
+#include "lib/stringinfo.h"
+#include "nodes/print.h"
 #include "optimizer/planner.h"
-#include "utils/relcache.h"
+#include "parser/parsetree.h"
 #include "rewrite/rewriteHandler.h"
+#include "utils/relcache.h"
 
 typedef struct ExplainState
 {

src/backend/commands/indexcmds.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.7 1999/07/16 03:12:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.8 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,18 +17,18 @@
 
 #include "access/genam.h"
 #include "access/heapam.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "catalog/heap.h"
 #include "catalog/index.h"
 #include "catalog/pg_index.h"
+#include "catalog/pg_opclass.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_opclass.h"
 #include "commands/defrem.h"
-#include "parser/parsetree.h"
-#include "optimizer/prep.h"
 #include "optimizer/clauses.h"
+#include "optimizer/prep.h"
+#include "parser/parsetree.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 

src/backend/commands/remove.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.34 1999/07/15 22:39:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.35 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,6 +25,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/commands/rename.c

@@ -7,10 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.29 1999/07/16 03:12:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.30 1999/07/16 04:58:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
+#else
+#include <string.h>
+#endif
+
 #include "postgres.h"
 
 #include "access/heapam.h"
@@ -22,13 +28,7 @@
 #include "commands/rename.h"
 #include "miscadmin.h"
 #include "optimizer/prep.h"
-#ifndef NO_SECURITY
 #include "utils/acl.h"
-#endif	 /* !NO_SECURITY */
-#ifndef HAVE_MEMMOVE
-#else
-#include <string.h>
-#endif
 
 /*
  *		renameatt		- changes the name of a attribute in a relation

src/backend/commands/sequence.c

@@ -9,13 +9,13 @@
 #include <string.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "access/heapam.h"
 #include "commands/creatinh.h"
 #include "commands/sequence.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "utils/acl.h"
+#include "utils/builtins.h"
 
 #define SEQ_MAGIC	  0x1717
 

src/backend/commands/trigger.c

@@ -8,6 +8,7 @@
 #include <string.h>
 #include "postgres.h"
 
+
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -17,15 +18,12 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_trigger.h"
 #include "commands/trigger.h"
-#include "utils/inval.h"
-#include "utils/builtins.h"
-#include "utils/syscache.h"
 #include "executor/executor.h"
-
-#ifndef NO_SECURITY
 #include "miscadmin.h"
 #include "utils/acl.h"
-#endif
+#include "utils/builtins.h"
+#include "utils/inval.h"
+#include "utils/syscache.h"
 
 DLLIMPORT TriggerData *CurrentTriggerData = NULL;
 

src/backend/commands/user.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.30 1999/07/15 23:03:08 momjian Exp $
+ * $Id: user.c,v 1.31 1999/07/16 04:58:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,16 +18,16 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
+#include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/pg_database.h"
 #include "catalog/pg_shadow.h"
+#include "commands/user.h"
 #include "libpq/crypt.h"
-#include "access/heapam.h"
+#include "miscadmin.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
-#include "commands/user.h"
 
 static void CheckPgUserAclNotNull(void);
 

src/backend/commands/vacuum.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.112 1999/07/15 22:39:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.113 1999/07/16 04:58:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
 
 #include "postgres.h"
 
-#include "miscadmin.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "catalog/catalog.h"
@@ -30,6 +29,7 @@
 #include "catalog/pg_statistic.h"
 #include "catalog/pg_type.h"
 #include "commands/vacuum.h"
+#include "miscadmin.h"
 #include "parser/parse_oper.h"
 #include "storage/smgr.h"
 #include "utils/builtins.h"
@@ -39,6 +39,7 @@
 #include "utils/syscache.h"
 
 #ifndef HAVE_GETRUSAGE
+#include "rusagestub.h"
 #else
 #include <sys/time.h>
 #include <sys/resource.h>

src/backend/commands/variable.c

@@ -2,7 +2,7 @@
  * Routines for handling of 'SET var TO',
  *	'SHOW var' and 'RESET var' statements.
  *
- * $Id: variable.c,v 1.23 1999/07/07 09:36:45 momjian Exp $
+ * $Id: variable.c,v 1.24 1999/07/16 04:58:41 momjian Exp $
  *
  */
 
@@ -10,16 +10,19 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
+
 #include "postgres.h"
-#include "miscadmin.h"
+#include "access/xact.h"
 #include "commands/variable.h"
-#include "utils/builtins.h"
+#include "miscadmin.h"
 #include "optimizer/internal.h"
-#include "access/xact.h"
+#include "utils/builtins.h"
 #include "utils/tqual.h"
+
 #ifdef MULTIBYTE
 #include "mb/pg_wchar.h"
 #endif
+
 static bool show_date(void);
 static bool reset_date(void);
 static bool parse_date(const char *);

src/backend/commands/view.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.35 1999/07/15 23:03:08 momjian Exp $
+ *	$Id: view.c,v 1.36 1999/07/16 04:58:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,15 +14,15 @@
 
 #include "postgres.h"
 
-#include "catalog/heap.h"
 #include "access/xact.h"
+#include "catalog/heap.h"
+#include "commands/creatinh.h"
+#include "commands/view.h"
 #include "parser/parse_relation.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteDefine.h"
 #include "rewrite/rewriteManip.h"
 #include "rewrite/rewriteRemove.h"
-#include "commands/creatinh.h"
-#include "commands/view.h"
 
 /*---------------------------------------------------------------------
  * DefineVirtualRelation

src/backend/executor/_deadcode/nodeTee.c

@@ -14,7 +14,7 @@
  *		ExecInitTee
  *		ExecEndTee
  *
- *	$Id: nodeTee.c,v 1.4 1999/07/15 15:19:02 momjian Exp $
+ *	$Id: nodeTee.c,v 1.5 1999/07/16 04:58:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,16 +23,16 @@
 #include <sys/file.h>
 #include "postgres.h"
 
-#include "utils/relcache.h"
-#include "storage/bufmgr.h"
-#include "storage/smgr.h"
-#include "optimizer/internal.h"
-#include "executor/executor.h"
-#include "executor/nodeTee.h"
+#include "access/heapam.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
+#include "executor/executor.h"
+#include "executor/nodeTee.h"
+#include "optimizer/internal.h"
+#include "storage/bufmgr.h"
+#include "storage/smgr.h"
 #include "tcop/pquery.h"
-#include "access/heapam.h"
+#include "utils/relcache.h"
 
 /* ------------------------------------------------------------------
  *		ExecInitTee

src/backend/executor/execAmi.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: execAmi.c,v 1.39 1999/07/16 03:12:50 momjian Exp $
+ *	$Id: execAmi.c,v 1.40 1999/07/16 04:58:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -28,28 +28,28 @@
 
 #include "postgres.h"
 
+
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "catalog/heap.h"
+#include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/nodeSeqscan.h"
+#include "executor/nodeAgg.h"
+#include "executor/nodeAppend.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeGroup.h"
+#include "executor/nodeHash.h"
+#include "executor/nodeHashjoin.h"
 #include "executor/nodeIndexscan.h"
-#include "executor/nodeSort.h"
 #include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
 #include "executor/nodeNestloop.h"
-#include "executor/nodeHashjoin.h"
-#include "executor/nodeHash.h"
-#include "executor/nodeGroup.h"
-
-#include "executor/nodeAgg.h"
-#include "executor/nodeGroup.h"
 #include "executor/nodeResult.h"
-#include "executor/nodeUnique.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeAppend.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
-#include "executor/execdebug.h"
+#include "executor/nodeUnique.h"
 #include "optimizer/internal.h"
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/heap.h"
 
 static Pointer ExecBeginScan(Relation relation, int nkeys, ScanKey skeys,
 			  bool isindex, ScanDirection dir, Snapshot snapshot);

src/backend/executor/execFlatten.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.10 1999/07/15 22:39:05 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.11 1999/07/16 04:58:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,8 +26,8 @@
  *	 node does the actual flattening work.
  */
 #include "postgres.h"
-#include "executor/executor.h"
 #include "executor/execFlatten.h"
+#include "executor/executor.h"
 
 #ifdef SETS_FIXED
 static bool FjoinBumpOuterNodes(TargetEntry *tlist, ExprContext *econtext,

src/backend/executor/execMain.c

@@ -26,26 +26,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.91 1999/07/16 03:12:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.92 1999/07/16 04:58:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
-#include "miscadmin.h"
 
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/execdebug.h"
-#include "utils/builtins.h"
-#include "utils/acl.h"
-#include "utils/syscache.h"
-#include "parser/parsetree.h"
-/* #include "access/localam.h" */
-#include "optimizer/var.h"
 #include "access/heapam.h"
 #include "catalog/heap.h"
 #include "commands/trigger.h"
+#include "executor/execdebug.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "miscadmin.h"
+#include "optimizer/var.h"
+#include "parser/parsetree.h"
+#include "utils/acl.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
 			   Query *parseTree);

src/backend/executor/execProcnode.c

@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.14 1999/03/23 16:50:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.15 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,23 +74,23 @@
  */
 #include "postgres.h"
 
-#include "miscadmin.h"
-#include "tcop/tcopprot.h"
 #include "executor/executor.h"
-#include "executor/nodeResult.h"
+#include "executor/nodeAgg.h"
 #include "executor/nodeAppend.h"
-#include "executor/nodeSeqscan.h"
-#include "executor/nodeIndexscan.h"
-#include "executor/nodeNestloop.h"
-#include "executor/nodeMergejoin.h"
-#include "executor/nodeMaterial.h"
-#include "executor/nodeSort.h"
-#include "executor/nodeUnique.h"
 #include "executor/nodeGroup.h"
-#include "executor/nodeAgg.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
+#include "executor/nodeIndexscan.h"
+#include "executor/nodeMaterial.h"
+#include "executor/nodeMergejoin.h"
+#include "executor/nodeNestloop.h"
+#include "executor/nodeResult.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/nodeSubplan.h"
+#include "executor/nodeUnique.h"
+#include "miscadmin.h"
+#include "tcop/tcopprot.h"
 
 /* ------------------------------------------------------------------------
  *		ExecInitNode

src/backend/executor/execQual.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.55 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.56 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,9 +35,9 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_language.h"
+#include "executor/execFlatten.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "executor/execFlatten.h"
 #include "executor/functions.h"
 #include "executor/nodeSubplan.h"
 #include "utils/builtins.h"

src/backend/executor/execTuples.c

@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.27 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.28 1999/07/16 04:58:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,9 +119,8 @@
 #include <string.h>
 
 #include "postgres.h"
-
-
 #include "executor/executor.h"
+
 #undef ExecStoreTuple
 
 #include "catalog/pg_type.h"

src/backend/executor/execUtils.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.47 1999/07/15 22:39:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.48 1999/07/16 04:58:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,9 +46,9 @@
 #include "access/heapam.h"
 #include "catalog/catname.h"
 #include "catalog/index.h"
+#include "catalog/pg_index.h"
 #include "executor/execdebug.h"
 #include "executor/executor.h"
-#include "catalog/pg_index.h"
 
 static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
 					AttrNumber **attsOutP, FuncIndexInfoPtr fInfoP);

src/backend/executor/functions.c

@@ -8,22 +8,21 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.29 1999/07/16 04:58:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include "postgres.h"
 
-
+#include "access/heapam.h"
+#include "executor/execdefs.h"
+#include "executor/executor.h"
+#include "executor/functions.h"
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
 #include "utils/datum.h"
-#include "access/heapam.h"
-#include "executor/executor.h"
-#include "executor/execdefs.h"
-#include "executor/functions.h"
 
 #undef new
 

src/backend/executor/nodeAgg.c

@@ -21,11 +21,11 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_aggregate.h"
-#include "parser/parse_type.h"
 #include "executor/executor.h"
 #include "executor/nodeAgg.h"
-#include "utils/syscache.h"
 #include "optimizer/clauses.h"
+#include "parser/parse_type.h"
+#include "utils/syscache.h"
 
 /*
  * AggFuncInfo -

src/backend/executor/nodeAppend.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.22 1999/07/16 03:12:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.23 1999/07/16 04:58:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -57,8 +57,8 @@
 
 
 #include "access/heapam.h"
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeAppend.h"
 #include "parser/parsetree.h"
 

src/backend/executor/nodeHashjoin.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.24 1999/07/16 03:12:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.25 1999/07/16 04:58:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/executor/nodeIndexscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.39 1999/07/16 03:12:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.40 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,16 +30,16 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/execdebug.h"
-#include "executor/nodeIndexscan.h"
 
-#include "optimizer/clauses.h"
-#include "parser/parsetree.h"
 
-#include "access/heapam.h"
 #include "access/genam.h"
+#include "access/heapam.h"
+#include "executor/execdebug.h"
+#include "executor/executor.h"
+#include "executor/nodeIndexscan.h"
 #include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "parser/parsetree.h"
 
 /* ----------------
  *		Misc stuff to move to executor.h soon -cim 6/5/90

src/backend/executor/nodeMaterial.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.24 1999/07/16 03:12:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.25 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,11 +21,11 @@
 #include "postgres.h"
 
 
+#include "access/heapam.h"
+#include "catalog/heap.h"
 #include "executor/executor.h"
 #include "executor/nodeMaterial.h"
-#include "catalog/heap.h"
 #include "optimizer/internal.h"
-#include "access/heapam.h"
 
 /* ----------------------------------------------------------------
  *		ExecMaterial

src/backend/executor/nodeMergejoin.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.27 1999/05/25 16:08:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeMergejoin.c,v 1.28 1999/07/16 04:58:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -68,10 +68,10 @@
 
 #include "access/heapam.h"
 #include "catalog/pg_operator.h"
-#include "executor/executor.h"
+#include "executor/execdebug.h"
 #include "executor/execdefs.h"
+#include "executor/executor.h"
 #include "executor/nodeMergejoin.h"
-#include "executor/execdebug.h"
 #include "utils/lsyscache.h"
 #include "utils/psort.h"
 

src/backend/executor/nodeNestloop.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.12 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.13 1999/07/16 04:58:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeNestloop.h"
 
 /* ----------------------------------------------------------------

src/backend/executor/nodeSeqscan.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.19 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.20 1999/07/16 04:58:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,10 +24,10 @@
  */
 #include "postgres.h"
 
-#include "executor/executor.h"
+#include "access/heapam.h"
 #include "executor/execdebug.h"
+#include "executor/executor.h"
 #include "executor/nodeSeqscan.h"
-#include "access/heapam.h"
 #include "parser/parsetree.h"
 
 static Oid InitScanRelation(SeqScan *node, EState *estate,

src/backend/executor/nodeSort.c

@@ -7,13 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.21 1999/07/15 22:39:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.22 1999/07/16 04:58:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 #include <string.h>
 
+#include "postgres.h"
 #include "executor/executor.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"

src/backend/executor/nodeSubplan.c

@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 #include "access/heapam.h"
-#include "tcop/pquery.h"
 #include "executor/executor.h"
 #include "executor/nodeSubplan.h"
+#include "tcop/pquery.h"
 
 /* ----------------------------------------------------------------
  *		ExecSubPlan(node)

src/backend/executor/nodeUnique.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.22 1999/07/16 03:12:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.23 1999/07/16 04:58:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,10 +26,10 @@
 
 #include "postgres.h"
 
-#include "executor/executor.h"
-#include "executor/nodeUnique.h"
 #include "access/heapam.h"
 #include "access/printtup.h"
+#include "executor/executor.h"
+#include "executor/nodeUnique.h"
 
 /* ----------------------------------------------------------------
  *		ExecIdenticalTuples

src/backend/lib/fstack.c

@@ -7,12 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.12 1999/07/15 23:03:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.13 1999/07/16 04:58:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
+#include "postgres.h"
 #include "lib/fstack.h"
 
 /*

src/backend/lib/hasht.c

@@ -8,14 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.10 1999/07/15 23:03:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.11 1999/07/16 04:58:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "utils/memutils.h"
 #include "lib/hasht.h"
+#include "utils/memutils.h"
 
 /* -----------------------------------
  *		HashTableWalk

src/backend/libpq/auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.38 1999/07/15 23:03:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.39 1999/07/16 04:58:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,14 +31,13 @@
 #include <arpa/inet.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 
 #include "libpq/auth.h"
-#include "libpq/libpq.h"
+#include "libpq/crypt.h"
 #include "libpq/hba.h"
+#include "libpq/libpq.h"
 #include "libpq/password.h"
-#include "libpq/crypt.h"
-
+#include "miscadmin.h"
 
 static void sendAuthRequest(Port *port, AuthRequest areq, PacketDoneProc handler);
 static int	handle_done_auth(void *arg, PacketLen len, void *pkt);

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.28 1999/07/15 23:03:13 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.29 1999/07/16 04:58:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,11 +31,11 @@
 
 #include "postgres.h"
 
-#include "lib/dllist.h"
-#include "libpq/libpq.h"
 #include "access/heapam.h"
-#include "catalog/catalog.h"
 #include "access/printtup.h"
+#include "catalog/catalog.h"
+#include "lib/dllist.h"
+#include "libpq/libpq.h"
 
 /* ----------------
  *		backend portal stack for recursive PQexec calls

src/backend/libpq/be-fsstubs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.39 1999/07/16 03:12:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.40 1999/07/16 04:58:59 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -37,10 +37,10 @@
 
 #include "postgres.h"
 
-#include "libpq/libpq-fs.h"
 #include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
 #include "libpq/be-fsstubs.h"
+#include "libpq/libpq-fs.h"
+#include "storage/large_object.h"
 
 /* [PA] is Pascal Andr <andre@via.ecp.fr> */
 

src/backend/libpq/be-pqexec.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.22 1999/07/15 23:03:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.23 1999/07/16 04:59:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,11 +22,12 @@
  */
 #include "postgres.h"
 
+#include "libpq/libpq.h"
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
-#include "libpq/libpq.h"
 #include "utils/builtins.h"
 #ifndef HAVE_MEMMOVE
+#include <regex/utils.h>
 #else
 #include <string.h>
 #endif

src/backend/libpq/crypt.c

@@ -9,7 +9,7 @@
  * Dec 17, 1997 - Todd A. Brandys
  *	Orignal Version Completed.
  *
- * $Id: crypt.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
+ * $Id: crypt.c,v 1.22 1999/07/16 04:59:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,12 +20,13 @@
 #include <unistd.h>
 
 #include "postgres.h"
+#include "libpq/crypt.h"
 #include "miscadmin.h"
-#include "utils/nabstime.h"
 #include "storage/fd.h"
-#include "libpq/crypt.h"
+#include "utils/nabstime.h"
 
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
 char	  **pwd_cache = NULL;

src/backend/libpq/hba.c

@@ -5,7 +5,7 @@
  *	  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.45 1999/07/15 23:03:13 momjian Exp $
+ *	$Id: hba.c,v 1.46 1999/07/16 04:59:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,8 @@
 #include <unistd.h>
 
 #include "postgres.h"
-#include "miscadmin.h"
 #include "libpq/libpq.h"
+#include "miscadmin.h"
 
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.

src/backend/libpq/password.c

 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.23 1999/07/15 23:03:14 momjian Exp $
+ * $Id: password.c,v 1.24 1999/07/16 04:59:01 momjian Exp $
  *
  */
 
-#include "postgres.h"
-#include "miscadmin.h"
-#include "libpq/password.h"
-#include "libpq/libpq.h"
 #include <string.h>
 #include <unistd.h>
+#include "postgres.h"
 #ifdef HAVE_CRYPT_H
+#include "crypt.h"
 #endif
 
+#include "libpq/libpq.h"
+#include "libpq/password.h"
+#include "miscadmin.h"
+
 int
 verify_password(char *auth_arg, char *user, char *password)
 {

src/backend/libpq/portal.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.25 1999/07/16 03:12:56 momjian Exp $
+ *	$Id: portal.c,v 1.26 1999/07/16 04:59:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/libpq/portalbuf.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.19 1999/07/16 03:12:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.20 1999/07/16 04:59:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/libpq/pqcomm.c

@@ -28,7 +28,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.75 1999/07/16 03:12:57 momjian Exp $
+ *	$Id: pqcomm.c,v 1.76 1999/07/16 04:59:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,14 +58,7 @@
  *
  *------------------------
  */
-#include "postgres.h"
-
 #include <stdio.h>
-#if defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
 #include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -79,6 +72,14 @@
 #include <arpa/inet.h>
 #include <sys/file.h>
 
+#include "postgres.h"
+
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+
 #include "libpq/libpq.h"
 #include "miscadmin.h"
 

src/backend/libpq/pqformat.c

@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.5 1999/07/15 22:39:15 momjian Exp $
+ *	$Id: pqformat.c,v 1.6 1999/07/16 04:59:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,9 +45,11 @@
  */
 #include "postgres.h"
 
-#include "libpq/pqformat.h"
 #include "libpq/libpq.h"
+#include "libpq/pqformat.h"
+
 #ifdef MULTIBYTE
+#include "mb/pg_wchar.h"
 #endif
 #include <string.h>
 #ifdef HAVE_ENDIAN_H

src/backend/libpq/pqsignal.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.12 1999/07/15 23:03:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.13 1999/07/16 04:59:04 momjian Exp $
  *
  * NOTES
  *		This shouldn't be in libpq, but the monitor and some other
@@ -37,10 +37,10 @@
  *	is to do signal-handler reinstallation, which doesn't work well
  *	at all.
  * ------------------------------------------------------------------------*/
-#include "postgres.h"
-
 #include <signal.h>
 
+#include "postgres.h"
+
 #include "libpq/pqsignal.h"
 
 pqsigfunc

src/backend/nodes/copyfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.84 1999/07/15 22:39:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.85 1999/07/16 04:59:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,11 +16,10 @@
 
 #include "postgres.h"
 
-
-#include "utils/syscache.h"
 #include "catalog/pg_type.h"
 #include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
+#include "utils/syscache.h"
 
 /*
  * listCopy

src/backend/nodes/equalfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.41 1999/07/15 22:39:16 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.42 1999/07/16 04:59:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,8 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
 #include "nodes/plannodes.h"
-
+#include "nodes/relation.h"
 #include "utils/datum.h"
 
 static bool equali(List *a, List *b);

src/backend/nodes/outfuncs.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: outfuncs.c,v 1.87 1999/07/15 15:19:08 momjian Exp $
+ *	$Id: outfuncs.c,v 1.88 1999/07/16 04:59:05 momjian Exp $
  *
  * NOTES
  *	  Every (plan) node in POSTGRES has an associated "out" routine which
@@ -24,21 +24,19 @@
 
 #include "access/heapam.h"
 #include "access/htup.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
+#include "catalog/pg_type.h"
 #include "fmgr.h"
-#include "utils/datum.h"
-
-#include "nodes/nodes.h"
+#include "lib/stringinfo.h"
 #include "nodes/execnodes.h"
+#include "nodes/nodes.h"
+#include "nodes/parsenodes.h"
 #include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
-
-#include "catalog/pg_type.h"
-#include "lib/stringinfo.h"
+#include "utils/datum.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 #include "../parse.h"
 

src/backend/nodes/print.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.29 1999/07/15 22:39:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.30 1999/07/16 04:59:06 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -22,9 +22,9 @@
 
 #include "access/printtup.h"
 #include "nodes/print.h"
+#include "optimizer/clauses.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
-#include "optimizer/clauses.h"
 
 static char *plannode_type(Plan *p);
 

src/backend/nodes/read.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.16 1999/07/15 15:19:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.17 1999/07/16 04:59:06 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "postgres.h"
 #include "nodes/pg_list.h"
 #include "nodes/readfuncs.h"

src/backend/nodes/readfuncs.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.67 1999/07/15 22:39:18 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.68 1999/07/16 04:59:06 momjian Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -29,12 +29,12 @@
 #include "postgres.h"
 
 
-#include "utils/lsyscache.h"
-#include "catalog/pg_index.h"
 
+#include "catalog/pg_index.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 #include "nodes/readfuncs.h"
+#include "nodes/relation.h"
+#include "utils/lsyscache.h"
 
 /* ----------------
  *		node creator declarations

src/backend/optimizer/geqo/geqo_copy.c

@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_copy.c,v 1.7 1999/07/15 22:39:18 momjian Exp $
+ * $Id: geqo_copy.c,v 1.8 1999/07/16 04:59:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,8 +33,6 @@
 /*************************************************************/
 
 #include "postgres.h"
-
-
 #include "optimizer/geqo_copy.h"
 
 /* geqo_copy