Change #include's to use <> and "" as appropriate.

110 files changed, 518 insertions, 518 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index ad1c7b252c9..950a7f6030f 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.54 1999/07/15 22:38:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.55 1999/07/15 23:02:51 momjian Exp $
  *
  * NOTES
  *	  The old interface functions have been converted to macros
@@ -17,10 +17,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <catalog/pg_type.h>
+#include "access/heapam.h"
+#include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 61b1ae483ee..8ed3adcd151 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,16 +8,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.34 1999/07/15 22:38:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.35 1999/07/15 23:02:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <access/itup.h>
-#include <catalog/pg_type.h>
+#include "access/heapam.h"
+#include "access/itup.h"
+#include "catalog/pg_type.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index 0d3f4bac423..20de0ec2827 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.22 1999/07/15 22:38:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.23 1999/07/15 23:02:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/iqual.h>
-#include <executor/execdebug.h>
+#include "access/iqual.h"
+#include "executor/execdebug.h"
 
 /* ----------------------------------------------------------------
  *				  index scan key qualification code
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index ed95c0dfb8c..672ab6dbd3b 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.15 1999/07/15 22:38:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.16 1999/07/15 23:02:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/skey.h>
+#include "access/skey.h"
 
 /*
  * ScanKeyEntryIsLegal
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 27ffc2aec3c..99f867c9689 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.51 1999/07/15 22:38:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.52 1999/07/15 23:02:51 momjian Exp $
  *
  * NOTES
  *	  some of the executor utility code such as "ExecTypeFromTL" should be
@@ -18,13 +18,13 @@
 
 #include <stdio.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <catalog/pg_type.h>
-#include <nodes/parsenodes.h>
-#include <parser/parse_type.h>
-#include <utils/builtins.h>
-#include <utils/syscache.h>
+#include "catalog/pg_type.h"
+#include "nodes/parsenodes.h"
+#include "parser/parse_type.h"
+#include "utils/builtins.h"
+#include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 2e905427d89..934d7e59114 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -11,16 +11,16 @@
  *-------------------------------------------------------------------------
  */
 
-#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 <executor/executor.h>
-#include <utils/syscache.h>
+#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 "executor/executor.h"
+#include "utils/syscache.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 07dbd269471..26736686e60 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -11,10 +11,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/gist.h>
-#include <executor/execdebug.h>
+#include "access/gist.h"
+#include "executor/execdebug.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 2fe9222b2d4..9bc3acc7196 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -10,11 +10,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/gist.h>
-#include <access/gistscan.h>
-#include <access/genam.h>
+#include "access/gist.h"
+#include "access/gistscan.h"
+#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index 69eb9c31c3f..e1a5e497a7d 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/gist.h>
-#include <access/istrat.h>
+#include "access/gist.h"
+#include "access/istrat.h"
 
 /*
  *	Note:  negate, commute, and negatecommute all assume that operators are
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 525168b836d..def7ce83944 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.27 1999/07/15 22:38:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.28 1999/07/15 23:02:54 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -15,14 +15,14 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
-#include <access/genam.h>
-#include <catalog/index.h>
-#include <miscadmin.h>
+#include "access/hash.h"
+#include "executor/executor.h"
+#include "access/heapam.h"
+#include "access/genam.h"
+#include "catalog/index.h"
+#include "miscadmin.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index a4d51c2d1de..bb5a4acc1d8 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.16 1999/07/15 22:38:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.17 1999/07/15 23:02:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
+#include "access/hash.h"
 
 static InsertIndexResult _hash_insertonpg(Relation rel, Buffer buf, int keysz, ScanKey scankey, HashItem hitem, Buffer metabuf);
 static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey itup_scankey, Size itemsize, HashItem hitem);
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index 3fb38df0412..d6eb9736541 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,16 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.22 1999/07/15 23:02:55 momjian Exp $
  *
  * NOTES
  *	  Overflow pages look like ordinary relation pages.
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
+#include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 0dec4c1fd83..083fbcb13be 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.22 1999/07/15 23:02:55 momjian Exp $
  *
  * NOTES
  *	  Postgres hash pages look like ordinary relation pages.  The opaque
@@ -23,11 +23,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <miscadmin.h>
-#include <access/genam.h>
+#include "access/hash.h"
+#include "miscadmin.h"
+#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/hash/hashscan.c b/src/backend/access/hash/hashscan.c
index 21321e8efc4..d3bd838bc12 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.19 1999/07/15 15:18:33 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashscan.c,v 1.20 1999/07/15 23:02:55 momjian Exp $
  *
  * NOTES
  *	  Because we can be doing an index scan on a relation while we
@@ -27,9 +27,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
+#include "access/hash.h"
 
 static void _hash_scandel(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
 static bool _hash_scantouched(IndexScanDesc scan, BlockNumber blkno, OffsetNumber offno);
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 9a868fed216..2253fc56dbb 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.18 1999/07/15 22:38:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.19 1999/07/15 23:02:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
+#include "access/hash.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 72a29c1c196..3901431ddf0 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,12 +7,12 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.14 1999/07/15 22:38:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.15 1999/07/15 23:02:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
 
 /*
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 6948145b619..b544034241a 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.18 1999/07/15 22:38:39 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.19 1999/07/15 23:02:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hash.h>
-#include <access/iqual.h>
+#include "access/hash.h"
+#include "access/iqual.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 232149c71ed..5437921e861 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.49 1999/07/15 22:38:40 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.50 1999/07/15 23:02:57 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -73,17 +73,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 <catalog/catalog.h>
-#include <utils/inval.h>
-#include <utils/builtins.h>
+#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 "catalog/catalog.h"
+#include "utils/inval.h"
+#include "utils/builtins.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 1a680d8d709..e5e476d5f09 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Id: hio.c,v 1.23 1999/07/15 22:38:41 momjian Exp $
+ *	  $Id: hio.c,v 1.24 1999/07/15 23:02:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/hio.h>
-#include <access/heapam.h>
+#include "access/hio.h"
+#include "access/heapam.h"
 
 /*
  * amputunique	- place tuple at tid
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index e9e87664dda..6b5d50e50c1 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.19 1999/07/15 23:02:58 momjian Exp $
  *
  * NOTES
  *	  initam should be moved someplace else.
@@ -18,9 +18,9 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
+#include "access/heapam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 517eb93357e..60b9599f127 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.19 1999/07/15 23:02:58 momjian Exp $
  *
  * NOTES
  *	  many of the old access method routines have been turned into
@@ -44,9 +44,9 @@
  * ----------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
+#include "access/genam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 7d59e2b1283..00d5fdf21ad 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.33 1999/07/15 22:38:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.34 1999/07/15 23:02:59 momjian Exp $
  *
  * INTERFACE ROUTINES
  *		index_open		- open an index relation by relationId
@@ -63,11 +63,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <utils/relcache.h>
-#include <access/heapam.h>
+#include "access/genam.h"
+#include "utils/relcache.h"
+#include "access/heapam.h"
 
 /* ----------------
  *	 undefine macros we aren't going to use that would otherwise
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index df164bd6ffa..834d510b8c7 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.25 1999/07/15 22:38:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.26 1999/07/15 23:02:59 momjian Exp $
  *
  *	NOTES
  *		These functions are stored in pg_amproc.  For each operator class
@@ -22,9 +22,9 @@
 
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/builtins.h>
+#include "utils/builtins.h"
 
 int32
 btint2cmp(int16 a, int16 b)
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index b4d3994550d..14ef86accfe 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.45 1999/07/15 22:38:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.46 1999/07/15 23:03:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/nbtree.h>
-#include <access/heapam.h>
+#include "access/nbtree.h"
+#include "access/heapam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 522692ba9f1..e43110a8c2f 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.27 1999/07/15 22:38:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.28 1999/07/15 23:03:00 momjian Exp $
  *
  *	NOTES
  *	   Postgres btree pages look like ordinary relation pages.	The opaque
@@ -22,10 +22,10 @@
 #include <stdio.h>
 #include <time.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/nbtree.h>
-#include <miscadmin.h>
+#include "access/nbtree.h"
+#include "miscadmin.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 5961ebf4ec3..a483cd89854 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.42 1999/07/15 22:38:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.43 1999/07/15 23:03:00 momjian Exp $
  *
  * NOTES
  *	  This file contains only the public interface routines.
@@ -16,14 +16,14 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <access/nbtree.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
-#include <catalog/index.h>
-#include <miscadmin.h>
+#include "access/genam.h"
+#include "access/nbtree.h"
+#include "executor/executor.h"
+#include "access/heapam.h"
+#include "catalog/index.h"
+#include "miscadmin.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index fbb6046ff75..a655a442eea 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.26 1999/07/15 22:38:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.27 1999/07/15 23:03:00 momjian Exp $
  *
  *
  * NOTES
@@ -27,9 +27,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/nbtree.h>
+#include "access/nbtree.h"
 
 typedef struct BTScanListData
 {
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index fd98e18fac2..0cb2850c4fb 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.48 1999/07/15 22:38:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.49 1999/07/15 23:03:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <access/nbtree.h>
+#include "access/genam.h"
+#include "access/nbtree.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index e1027215bb5..16ca39007d2 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.9 1999/07/15 22:38:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.10 1999/07/15 23:03:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/istrat.h>
-#include <access/nbtree.h>
+#include "access/istrat.h"
+#include "access/nbtree.h"
 
 /*
  * Note:
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 212ddf79b16..0f1dba0383d 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.16 1999/07/15 22:38:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.17 1999/07/15 23:03:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/iqual.h>
-#include <access/rtree.h>
+#include "access/iqual.h"
+#include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index cfae3bae75a..49c7808c82a 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,14 +7,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.21 1999/07/15 22:38:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.22 1999/07/15 23:03:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/builtins.h>
+#include "utils/builtins.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 7c5f6f4243d..5e5ede35e31 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,19 +7,19 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.33 1999/07/15 22:38:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.34 1999/07/15 23:03:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <catalog/index.h>
-#include <access/rtree.h>
-#include <utils/geo_decls.h>
-#include <executor/executor.h>
-#include <access/heapam.h>
+#include "access/genam.h"
+#include "catalog/index.h"
+#include "access/rtree.h"
+#include "utils/geo_decls.h"
+#include "executor/executor.h"
+#include "access/heapam.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 5a7e15b07d2..a249a821528 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.26 1999/07/15 22:38:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.27 1999/07/15 23:03:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/genam.h>
-#include <access/rtree.h>
+#include "access/genam.h"
+#include "access/rtree.h"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 95c62a7ea6a..b9489c7ebe8 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,15 +7,15 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.12 1999/07/15 22:38:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.13 1999/07/15 23:03:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/rtree.h>
-#include <access/istrat.h>
+#include "access/rtree.h"
+#include "access/istrat.h"
 
 static StrategyNumber RelationGetRTStrategy(Relation r,
 					  AttrNumber attnum, RegProcedure proc);
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 020dd389dd3..23fe21a35ee 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.29 1999/07/15 22:38:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.30 1999/07/15 23:03:02 momjian Exp $
  *
  * NOTES
  *	  This file contains the high level access-method interface to the
@@ -16,11 +16,11 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <catalog/catname.h>
-#include <commands/vacuum.h>
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "commands/vacuum.h"
 
 static int	RecoveryCheckingEnabled(void);
 static void TransRecover(Relation logRelation);
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index c9788f12969..d874674a915 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.22 1999/07/15 22:38:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.23 1999/07/15 23:03:03 momjian Exp $
  *
  * NOTES
  *	  This file contains support functions for the high
@@ -16,10 +16,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/bit.h>
-#include <access/xact.h>
+#include "utils/bit.h"
+#include "access/xact.h"
 
 static XidStatus TransBlockGetXidStatus(Block tblock,
 					   TransactionId transactionId);
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 0a95088cba4..135912e97de 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,16 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.23 1999/07/15 22:38:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.24 1999/07/15 23:03:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <catalog/catname.h>
-#include <storage/proc.h>
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "storage/proc.h"
 
 static void GetNewObjectIdBlock(Oid *oid_return, int oid_block_size);
 static void VariableRelationGetNextOid(Oid *oid_return);
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 6a7a8201cce..2059ec9b758 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.44 1999/07/15 22:38:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.45 1999/07/15 23:03:03 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -142,16 +142,16 @@
  * [PA, 7/17/98]
  * [PA] is Pascal Andr� <andre@via.ecp.fr>
  */
-#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 "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"
 
 extern bool	SharedBufferChanged;
 
diff --git a/src/backend/access/transam/xid.c b/src/backend/access/transam/xid.c
index 017c042747c..1d824cabc48 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: xid.c,v 1.24 1999/07/15 15:18:45 momjian Exp $
+ *	$Id: xid.c,v 1.25 1999/07/15 23:03:04 momjian Exp $
  *
  * OLD COMMENTS
  * XXX WARNING
@@ -20,8 +20,8 @@
 
 #include <stdio.h>
 
-#include <postgres.h>
-#include <access/xact.h>
+#include "postgres.h"
+#include "access/xact.h"
 
 extern TransactionId NullTransactionId;
 extern TransactionId DisabledTransactionId;
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 5e720714354..02c2ee8ba05 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -7,20 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.21 1999/05/25 16:08:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.22 1999/07/15 23:03:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
 #include <miscadmin.h>			/* for DataDir */
-#include <utils/syscache.h>
+#include "utils/syscache.h"
 #include <catalog/catname.h>	/* NameIs{,Shared}SystemRelationName */
-#include <catalog/pg_type.h>
-#include <catalog/catalog.h>
-#include <access/transam.h>
+#include "catalog/pg_type.h"
+#include "catalog/catalog.h"
+#include "access/transam.h"
 
 /*
  * relpath				- path to the relation
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index 96863e8a3fe..7a118888132 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,20 +7,20 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.21 1999/07/15 22:38:58 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.22 1999/07/15 23:03:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <utils/builtins.h>
-#include <catalog/catname.h>
-#include <utils/syscache.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_type.h>
-#include <catalog/pg_aggregate.h>
-#include <miscadmin.h>
+#include "access/heapam.h"
+#include "utils/builtins.h"
+#include "catalog/catname.h"
+#include "utils/syscache.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_aggregate.h"
+#include "miscadmin.h"
 #ifndef HAVE_MEMMOVE
 #else
 #include <string.h>
diff --git a/src/backend/commands/_deadcode/recipe.c b/src/backend/commands/_deadcode/recipe.c
index 487f55923df..28d74f1aaf8 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -7,28 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.4 1999/05/25 22:40:56 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/_deadcode/Attic/recipe.c,v 1.5 1999/07/15 23:03:09 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 <libpq/libpq-be.h>
-#include <parser/parse_node.h>
-#include <utils/builtins.h>
+#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 "libpq/libpq-be.h"
+#include "parser/parse_node.h"
+#include "utils/builtins.h"
 #include <utils/relcache.h>		/* for RelationNameGetRelation */
-#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 "rewrite/rewriteHandler.h"
+#include "rewrite/rewriteManip.h"
+#include "tcop/pquery.h"
+#include "tcop/dest.h"
+#include "optimizer/planner.h"
+#include "executor/executor.h"
 
 /* from tcop/postgres.c */
 extern CommandDest whereToSendOutput;
@@ -43,7 +43,7 @@ beginRecipe(RecipeStmt *stmt)
 
 #else
 
-#include <tioga/tgRecipe.h>
+#include "tioga/tgRecipe.h"
 
 #define DEBUG_RECIPE 1
 
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index a07c1423d77..eddc79392da 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -9,7 +9,7 @@
  *	doesn't work! - jolly 8/19/95
  *
  *
- *	$Id: version.c,v 1.20 1999/07/15 22:39:03 momjian Exp $
+ *	$Id: version.c,v 1.21 1999/07/15 23:03:09 momjian Exp $
  *
  * NOTES
  *	At the point the version is defined, 2 physical relations are created
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
 
 #define MAX_QUERY_LEN 1024
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index ffb2998c358..29f9614244a 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.48 1999/07/15 22:38:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.49 1999/07/15 23:03:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -94,8 +94,8 @@
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
 #include "utils/syscache.h"
-#include <utils/trace.h>
-#include <utils/ps_status.h>
+#include "utils/trace.h"
+#include "utils/ps_status.h"
 
 /* stuff that we really ought not be touching directly :-( */
 extern TransactionState CurrentTransactionState;
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index a58cc85d153..f1fbe352915 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,25 +14,25 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.41 1999/07/15 22:39:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.42 1999/07/15 23:03:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
-#include <postgres.h>
-
-#include <catalog/heap.h>
-#include <access/heapam.h>
-#include <access/genam.h>
-#include <utils/syscache.h>
-#include <catalog/index.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>
+#include "postgres.h"
+
+#include "catalog/heap.h"
+#include "access/heapam.h"
+#include "access/genam.h"
+#include "utils/syscache.h"
+#include "catalog/index.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 */
 
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 7b4936387ce..c39db896e65 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.49 1999/07/15 22:39:00 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.50 1999/07/15 23:03:07 momjian Exp $
  *
  * NOTES
  *	  The PortalExecutorHeapMemory crap needs to be eliminated
@@ -36,7 +36,7 @@
 #include "utils/temprel.h"
 #include "utils/syscache.h"
 #include "miscadmin.h"
-#include "string.h"
+#include <string.h>
 
 /* ----------------
  *		PortalExecutorHeapMemory stuff
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index b1d4901fc6b..196785265a4 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.82 1999/07/15 22:39:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.83 1999/07/15 23:03:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,24 +14,24 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <miscadmin.h>
-#include <utils/builtins.h>
-#include <utils/acl.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 <catalog/catname.h>
-#include <catalog/pg_shadow.h>
-#include <commands/copy.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 "catalog/catname.h"
+#include "catalog/pg_shadow.h"
+#include "commands/copy.h"
 #include "commands/trigger.h"
-#include <libpq/libpq.h>
+#include "libpq/libpq.h"
 
 #ifdef MULTIBYTE
 #endif
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index 252763a48f3..64ed30974d7 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,23 +7,23 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.42 1999/07/15 22:39:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.43 1999/07/15 23:03:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
+#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/pg_inherits.h>
-#include <catalog/pg_ipl.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/pg_inherits.h"
+#include "catalog/pg_ipl.h"
 
 /* ----------------
  *		local stuff
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 6760ca9f2dd..2ed883f4313 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.30 1999/07/15 15:18:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/define.c,v 1.31 1999/07/15 23:03:08 momjian Exp $
  *
  * DESCRIPTION
  *	  The "DefineFoo" routines take the parse tree and pick out the
@@ -37,22 +37,22 @@
 #include <string.h>
 #include <math.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <access/heapam.h>
-#include <catalog/catname.h>
-#include <catalog/pg_aggregate.h>
-#include <catalog/pg_operator.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_type.h>
-#include <catalog/pg_language.h>
-#include <utils/syscache.h>
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "catalog/pg_aggregate.h"
+#include "catalog/pg_operator.h"
+#include "catalog/pg_proc.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_language.h"
+#include "utils/syscache.h"
 #include <fmgr.h>				/* for fmgr */
 #include <utils/builtins.h>		/* prototype for textin() */
-#include <commands/defrem.h>
-#include <tcop/dest.h>
-#include <catalog/pg_shadow.h>
-#include <optimizer/cost.h>
+#include "commands/defrem.h"
+#include "tcop/dest.h"
+#include "catalog/pg_shadow.h"
+#include "optimizer/cost.h"
 
 static char *defGetString(DefElem *def);
 static int	defGetTypeLength(DefElem *def);
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 5db5334f118..c4ccf2db0de 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,21 +4,21 @@
  *
  * Copyright (c) 1994-5, Regents of the University of California
  *
- *	  $Id: explain.c,v 1.39 1999/07/15 22:39:01 momjian Exp $
+ *	  $Id: explain.c,v 1.40 1999/07/15 23:03:08 momjian Exp $
  *
  */
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <nodes/print.h>
-#include <lib/stringinfo.h>
-#include <commands/explain.h>
-#include <parser/parsetree.h>
-#include <optimizer/planner.h>
-#include <utils/relcache.h>
-#include <rewrite/rewriteHandler.h>
+#include "nodes/print.h"
+#include "lib/stringinfo.h"
+#include "commands/explain.h"
+#include "parser/parsetree.h"
+#include "optimizer/planner.h"
+#include "utils/relcache.h"
+#include "rewrite/rewriteHandler.h"
 
 typedef struct ExplainState
 {
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 91abbaf3321..9eeae0b3aa6 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,28 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.5 1999/07/15 22:39:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.6 1999/07/15 23:03:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
-#include <postgres.h>
-
-#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_proc.h>
-#include <catalog/pg_type.h>
-#include <catalog/pg_opclass.h>
-#include <commands/defrem.h>
+#include "postgres.h"
+
+#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_proc.h"
+#include "catalog/pg_type.h"
+#include "catalog/pg_opclass.h"
+#include "commands/defrem.h"
 #include <parser/parsetree.h>	/* for getrelid() */
-#include <optimizer/prep.h>
-#include <optimizer/clauses.h>
+#include "optimizer/prep.h"
+#include "optimizer/clauses.h"
 
 #define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
 
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index b5a3a5d307c..0064f4a22df 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,23 +7,23 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.27 1999/07/15 22:39:02 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.28 1999/07/15 23:03:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
-
-#include <access/heapam.h>
-#include <catalog/catname.h>
-#include <utils/syscache.h>
-#include <catalog/heap.h>
-#include <catalog/indexing.h>
-#include <catalog/catalog.h>
-#include <commands/rename.h>
-#include <miscadmin.h>
+#include "postgres.h"
+
+#include "access/heapam.h"
+#include "catalog/catname.h"
+#include "utils/syscache.h"
+#include "catalog/heap.h"
+#include "catalog/indexing.h"
+#include "catalog/catalog.h"
+#include "commands/rename.h"
+#include "miscadmin.h"
 #include <optimizer/prep.h>		/* for find_all_inheritors */
 #ifndef NO_SECURITY
-#include <utils/acl.h>
+#include "utils/acl.h"
 #endif	 /* !NO_SECURITY */
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index f8fbf5f570f..4efc85c41a4 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -8,14 +8,14 @@
 #include <stdio.h>
 #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 <utils/acl.h>
+#include "postgres.h"
+#include "miscadmin.h"
+
+#include "access/heapam.h"
+#include "commands/creatinh.h"
+#include "commands/sequence.h"
+#include "utils/builtins.h"
+#include "utils/acl.h"
 
 #define SEQ_MAGIC	  0x1717
 
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 0419cb527b8..152c57f752d 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: user.c,v 1.29 1999/07/15 22:39:02 momjian Exp $
+ * $Id: user.c,v 1.30 1999/07/15 23:03:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,18 +16,18 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <postgres.h>
-
-#include <miscadmin.h>
-#include <catalog/catname.h>
-#include <catalog/pg_database.h>
-#include <catalog/pg_shadow.h>
-#include <libpq/crypt.h>
-#include <access/heapam.h>
-#include <tcop/tcopprot.h>
-#include <utils/acl.h>
-#include <utils/syscache.h>
-#include <commands/user.h>
+#include "postgres.h"
+
+#include "miscadmin.h"
+#include "catalog/catname.h"
+#include "catalog/pg_database.h"
+#include "catalog/pg_shadow.h"
+#include "libpq/crypt.h"
+#include "access/heapam.h"
+#include "tcop/tcopprot.h"
+#include "utils/acl.h"
+#include "utils/syscache.h"
+#include "commands/user.h"
 
 static void CheckPgUserAclNotNull(void);
 
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 2176f0b6ea1..c71ee85b012 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,24 +5,24 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: view.c,v 1.34 1999/07/15 22:39:03 momjian Exp $
+ *	$Id: view.c,v 1.35 1999/07/15 23:03:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
-
-#include <catalog/heap.h>
-#include <access/xact.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>
+#include "postgres.h"
+
+#include "catalog/heap.h"
+#include "access/xact.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
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index 8dabbc658ca..46742b14e80 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.7 1999/07/15 22:39:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.8 1999/07/15 23:03:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,9 @@
 /*
  * utils/memutils.h contains declarations of the functions in this file
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/bit.h>
+#include "utils/bit.h"
 
 void
 BitArraySetBit(BitArray bitArray, BitIndex bitIndex)
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 1c261cee21e..a149eac75d7 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -9,13 +9,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.14 1999/06/03 01:28:24 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.15 1999/07/15 23:03:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-#include <lib/dllist.h>
+#include "postgres.h"
+#include "lib/dllist.h"
 
 /* When this file is compiled for inclusion in libpq,
  * it can't use assert checking.  Probably this fix ought to be
diff --git a/src/backend/lib/fstack.c b/src/backend/lib/fstack.c
index 1f2beafa922..edc6c532681 100644
--- a/src/backend/lib/fstack.c
+++ b/src/backend/lib/fstack.c
@@ -7,13 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.11 1999/05/25 16:08:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/fstack.c,v 1.12 1999/07/15 23:03:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <lib/fstack.h>
+#include "lib/fstack.h"
 
 /*
  * Internal function definitions
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index c57b43be8e2..332a1b29485 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,14 +8,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.9 1999/07/15 22:39:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.10 1999/07/15 23:03:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <utils/memutils.h>
-#include <lib/hasht.h>
+#include "utils/memutils.h"
+#include "lib/hasht.h"
 
 /* -----------------------------------
  *		HashTableWalk
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index f4522aaa850..d928c33a685 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -6,14 +6,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.11 1999/07/15 22:39:12 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.12 1999/07/15 23:03:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 
 #include <sys/types.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
 
 #ifdef NOT_USED
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 565060905af..72ccd86657c 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.37 1999/05/26 12:55:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.38 1999/07/15 23:03:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,14 +30,14 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <postgres.h>
-#include <miscadmin.h>
+#include "postgres.h"
+#include "miscadmin.h"
 
-#include <libpq/auth.h>
-#include <libpq/libpq.h>
-#include <libpq/hba.h>
-#include <libpq/password.h>
-#include <libpq/crypt.h>
+#include "libpq/auth.h"
+#include "libpq/libpq.h"
+#include "libpq/hba.h"
+#include "libpq/password.h"
+#include "libpq/crypt.h"
 
 
 static void sendAuthRequest(Port *port, AuthRequest areq, PacketDoneProc handler);
@@ -62,7 +62,7 @@ static void	auth_failed(Port *port);
  *----------------------------------------------------------------
  */
 
-#include <krb.h>
+#include "krb.h"
 
 /*
  * pg_krb4_recvauth -- server routine to receive authentication information
@@ -149,7 +149,7 @@ pg_krb4_recvauth(Port *port)
  *----------------------------------------------------------------
  */
 
-#include <krb5/krb5.h>
+#include "krb5/krb5.h"
 
 /*
  * pg_an_to_ln -- return the local name corresponding to an authentication
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 326948faf0b..5a0599bc128 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: be-dumpdata.c,v 1.27 1999/07/15 22:39:13 momjian Exp $
+ *	$Id: be-dumpdata.c,v 1.28 1999/07/15 23:03:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,13 +29,13 @@
  */
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <lib/dllist.h>
-#include <libpq/libpq.h>
-#include <access/heapam.h>
-#include <catalog/catalog.h>
-#include <access/printtup.h>
+#include "lib/dllist.h"
+#include "libpq/libpq.h"
+#include "access/heapam.h"
+#include "catalog/catalog.h"
+#include "access/printtup.h"
 
 /* ----------------
  *		backend portal stack for recursive PQexec calls
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 25e87aae642..eecb1331378 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.37 1999/07/15 22:39:13 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.38 1999/07/15 23:03:13 momjian Exp $
  *
  * NOTES
  *	  This should be moved to a more appropriate place.  It is here
@@ -35,12 +35,12 @@
 #include <unistd.h>
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
-#include <libpq/libpq-fs.h>
+#include "libpq/libpq-fs.h"
 #include <catalog/pg_shadow.h>	/* for superuser() */
-#include <storage/large_object.h>
-#include <libpq/be-fsstubs.h>
+#include "storage/large_object.h"
+#include "libpq/be-fsstubs.h"
 
 /* [PA] is Pascal Andr� <andre@via.ecp.fr> */
 
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index ea48d6ff62c..6703b955bca 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.22 1999/07/15 23:03:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,12 +20,12 @@
  * NOTES
  *		These routines are compiled into the postgres backend.
  */
-#include <postgres.h>
+#include "postgres.h"
 
-#include <tcop/fastpath.h>
-#include <tcop/tcopprot.h>
-#include <libpq/libpq.h>
-#include <utils/builtins.h>
+#include "tcop/fastpath.h"
+#include "tcop/tcopprot.h"
+#include "libpq/libpq.h"
+#include "utils/builtins.h"
 #ifndef HAVE_MEMMOVE
 #else
 #include <string.h>
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index b6fa91e6265..1067253b73b 100644
--- a/src/backend/libpq/hba.c
+++ b/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.44 1999/07/15 22:39:14 momjian Exp $
+ *	$Id: hba.c,v 1.45 1999/07/15 23:03:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,9 +20,9 @@
 #include <arpa/inet.h>
 #include <unistd.h>
 
-#include <postgres.h>
-#include <miscadmin.h>
-#include <libpq/libpq.h>
+#include "postgres.h"
+#include "miscadmin.h"
+#include "libpq/libpq.h"
 
 /* Some standard C libraries, including GNU, have an isblank() function.
    Others, including Solaris, do not.  So we have our own.
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 1dd93829984..aee994ce180 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,14 +1,14 @@
 /*
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: password.c,v 1.22 1999/07/15 22:39:14 momjian Exp $
+ * $Id: password.c,v 1.23 1999/07/15 23:03:14 momjian Exp $
  *
  */
 
-#include <postgres.h>
-#include <miscadmin.h>
-#include <libpq/password.h>
-#include <libpq/libpq.h>
+#include "postgres.h"
+#include "miscadmin.h"
+#include "libpq/password.h"
+#include "libpq/libpq.h"
 #include <string.h>
 #include <unistd.h>
 #ifdef HAVE_CRYPT_H
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 7a7f1dbfc90..9680909c303 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: portal.c,v 1.23 1999/07/15 22:39:14 momjian Exp $
+ *	$Id: portal.c,v 1.24 1999/07/15 23:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,7 +53,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
 #include <libpq/libpq.h>		/* where the declarations go */
 
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 81e1fea503f..c2b84ab2fa2 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.17 1999/07/15 22:39:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.18 1999/07/15 23:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -50,7 +50,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include <postgres.h>
+#include "postgres.h"
 
 #include <libpq/libpq.h>		/* where the declarations go */
 
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index ec516026bfb..febfb374367 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.20 1999/07/15 22:39:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.21 1999/07/15 23:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,8 +23,8 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <postgres.h>
-#include <libpq/libpq.h>
+#include "postgres.h"
+#include "libpq/libpq.h"
 
 
 /*
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index cdc8ccac9db..0e667656ccb 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.11 1999/02/13 23:15:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.12 1999/07/15 23:03:14 momjian Exp $
  *
  * NOTES
  *		This shouldn't be in libpq, but the monitor and some other
@@ -37,11 +37,11 @@
  *	is to do signal-handler reinstallation, which doesn't work well
  *	at all.
  * ------------------------------------------------------------------------*/
-#include <postgres.h>
+#include "postgres.h"
 
 #include <signal.h>
 
-#include <libpq/pqsignal.h>
+#include "libpq/pqsignal.h"
 
 pqsigfunc
 pqsignal(int signo, pqsigfunc func)
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 9c46209f435..72c475d375c 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: util.c,v 1.10 1999/07/15 22:39:15 momjian Exp $
+ *	$Id: util.c,v 1.11 1999/07/15 23:03:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
+#include "postgres.h"
 #include <libpq/libpq.h>		/* where the declarations go */
 
 
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 25982e5fa47..a20268229b0 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.24 1999/07/13 20:12:46 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.25 1999/07/15 23:03:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 
 #if defined(__alpha__) && !defined(linux)
 #include <sys/sysinfo.h>
-#include <machine/hal_sysinfo.h>
+#include "machine/hal_sysinfo.h"
 #define ASSEMBLER
 #include <sys/proc.h>
 #undef ASSEMBLER
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index e96554885c4..134b058654b 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.59 1999/07/15 22:39:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.60 1999/07/15 23:03:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include <utils/syscache.h>
+#include "utils/syscache.h"
 
 #include "nodes/nodeFuncs.h"
 
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index d9aee84717e..d5f1427638f 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.38 1999/07/15 22:39:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.39 1999/07/15 23:03:17 momjian Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -18,7 +18,7 @@
 
 #include "postgres.h"
 
-#include <catalog/pg_operator.h>
+#include "catalog/pg_operator.h"
 #include "nodes/plannodes.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
diff --git a/src/backend/port/dynloader/aix.c b/src/backend/port/dynloader/aix.c
index 401b08b1afb..3cac00d117d 100644
--- a/src/backend/port/dynloader/aix.c
+++ b/src/backend/port/dynloader/aix.c
@@ -9,9 +9,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/ldr.h>
+#include "sys/ldr.h"
 #include <a.out.h>
-#include <ldfcn.h>
+#include "ldfcn.h"
 #include "postgres.h"
 #include "dynloader.h"
 
diff --git a/src/backend/port/dynloader/bsd.c b/src/backend/port/dynloader/bsd.c
index 30bb46473a4..f9f8d3e8d35 100644
--- a/src/backend/port/dynloader/bsd.c
+++ b/src/backend/port/dynloader/bsd.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 
 #include <sys/types.h>
 #include <nlist.h>
-#include <link.h>
+#include "link.h"
 #include <dlfcn.h>
 
 #include <stdio.h>
diff --git a/src/backend/port/dynloader/bsd.h b/src/backend/port/dynloader/bsd.h
index 6ac127290c1..b4ac086c92f 100644
--- a/src/backend/port/dynloader/bsd.h
+++ b/src/backend/port/dynloader/bsd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bsd.h,v 1.3 1999/02/13 23:17:16 momjian Exp $
+ * $Id: bsd.h,v 1.4 1999/07/15 23:03:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 #include <nlist.h>
-#include <link.h>
+#include "link.h"
 
 #include "postgres.h"
 
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 4e12b823c4d..0d121cb4845 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)dl.c	5.4 (Berkeley) 2/23/91";
 
 #include <sys/types.h>
 #include <nlist.h>
-#include <link.h>
+#include "link.h"
 #include <dlfcn.h>
 
 #include <stdio.h>
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index 609d3cbe209..f0c01ae955e 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: freebsd.h,v 1.2 1999/02/13 23:17:19 momjian Exp $
+ * $Id: freebsd.h,v 1.3 1999/07/15 23:03:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 
 #include <sys/types.h>
 #include <nlist.h>
-#include <link.h>
+#include "link.h"
 
 #include "postgres.h"
 
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 6450bad0472..f9998b42964 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.7 1999/02/13 23:17:20 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.8 1999/07/15 23:03:20 momjian Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
@@ -18,7 +18,7 @@
 /* System includes */
 #include <stdio.h>
 #include <a.out.h>
-#include <dl.h>
+#include "dl.h"
 #include "postgres.h"
 #include "fmgr.h"
 #include "utils/dynamic_loader.h"
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index c629e106ac7..6536efce36b 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: linux.h,v 1.5 1999/02/13 23:17:23 momjian Exp $
+ * $Id: linux.h,v 1.6 1999/07/15 23:03:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 #include "fmgr.h"				/* for func_ptr */
 #include "utils/dynamic_loader.h"
 #ifdef __ELF__
-#include "dlfcn.h"
+#include <dlfcn.h>
 #endif
 
 /* dynloader.c */
diff --git a/src/backend/port/dynloader/nextstep.c b/src/backend/port/dynloader/nextstep.c
index 66cbba9e8ca..98cf5c2f781 100644
--- a/src/backend/port/dynloader/nextstep.c
+++ b/src/backend/port/dynloader/nextstep.c
@@ -1,5 +1,5 @@
-#include <mach-o/rld.h>
-#include <streams/streams.h>
+#include "mach-o/rld.h"
+#include "streams/streams.h"
 #include <stdlib.h>
 
 static char *lastError = NULL;
diff --git a/src/backend/port/dynloader/ultrix4.c b/src/backend/port/dynloader/ultrix4.c
index b21f9904bbc..868bd21db02 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -9,14 +9,14 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.6 1999/07/15 15:19:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.7 1999/07/15 23:03:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <stdio.h>
-#include <postgres.h>
+#include "postgres.h"
 #include "dl.h"
-#include <utils/dynamic_loader.h>
+#include "utils/dynamic_loader.h"
 #include "postgres.h"
 #include "fmgr.h"
 #include "port-protos.h"
diff --git a/src/backend/port/dynloader/ultrix4.h b/src/backend/port/dynloader/ultrix4.h
index 65561b29759..826f3ada06a 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ultrix4.h,v 1.3 1999/02/13 23:17:29 momjian Exp $
+ * $Id: ultrix4.h,v 1.4 1999/07/15 23:03:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,11 +35,11 @@
 #define _DL_HEADER_
 
 #include <stdio.h>				/* needed to declare FILE for ldfcn.h */
-#include <filehdr.h>
-#include <syms.h>
-#include <ldfcn.h>
-#include <reloc.h>
-#include <scnhdr.h>
+#include "filehdr.h"
+#include "syms.h"
+#include "ldfcn.h"
+#include "reloc.h"
+#include "scnhdr.h"
 
 
 typedef long CoreAddr;
diff --git a/src/backend/port/nextstep/port.c b/src/backend/port/nextstep/port.c
index 6e83e25d718..6ef1b126f4b 100644
--- a/src/backend/port/nextstep/port.c
+++ b/src/backend/port/nextstep/port.c
@@ -1,5 +1,5 @@
 #ifndef _POSIX_SOURCE
-#include <libc.h>
+#include "libc.h"
 #else
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/backend/port/strerror.c b/src/backend/port/strerror.c
index 84176c9930c..7997cc2ed1d 100644
--- a/src/backend/port/strerror.c
+++ b/src/backend/port/strerror.c
@@ -1,4 +1,4 @@
-/* $Id: strerror.c,v 1.5 1998/09/01 03:24:33 momjian Exp $ */
+/* $Id: strerror.c,v 1.6 1999/07/15 23:03:18 momjian Exp $ */
 
 /*
  * strerror - map error number to descriptive string
@@ -9,9 +9,9 @@
  * modified for ANSI by D'Arcy J.M. Cain
  */
 
-#include		<string.h>
-#include		<stdio.h>
-#include		<errno.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
 
 extern const char *const sys_errlist[];
 extern int	sys_nerr;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 913768b2d14..81231f41ea2 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.109 1999/07/15 15:19:38 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.110 1999/07/15 23:03:22 momjian Exp $
  *
  * NOTES
  *
@@ -74,7 +74,7 @@
 #endif
 
 #ifdef __CYGWIN32__
-#include <getopt.h>
+#include "getopt.h"
 #endif
 
 #include "storage/ipc.h"
diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c
index d7dded8f4b5..b6c01ef004f 100644
--- a/src/backend/regex/regcomp.c
+++ b/src/backend/regex/regcomp.c
@@ -50,11 +50,11 @@ static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 #include <stdlib.h>
 #include <assert.h>
 
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
-#include <regex/cclass.h>
-#include <regex/cname.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
+#include "regex/cclass.h"
+#include "regex/cname.h"
 
 /*
  * parse structure, passed up and down to avoid global variables and
diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c
index a2ade47966d..93b47330617 100644
--- a/src/backend/regex/regerror.c
+++ b/src/backend/regex/regerror.c
@@ -50,9 +50,9 @@ static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
 #include <stdlib.h>
 #include <assert.h>
 
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
 
 /* ========= begin header generated by ./mkh ========= */
 #ifdef __cplusplus
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index d53a6b4d8ba..ec71296cc42 100644
--- a/src/backend/regex/regexec.c
+++ b/src/backend/regex/regexec.c
@@ -57,9 +57,9 @@ static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
 #include <ctype.h>
 #include <assert.h>
 
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
 
 static int	nope = 0;			/* for use in asserts; shuts lint up */
 
diff --git a/src/backend/regex/regfree.c b/src/backend/regex/regfree.c
index 1127bd24f8f..f0a019b0f6f 100644
--- a/src/backend/regex/regfree.c
+++ b/src/backend/regex/regfree.c
@@ -46,9 +46,9 @@ static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
 
 /*
  - regfree - free everything
diff --git a/src/backend/regex/retest.c b/src/backend/regex/retest.c
index 4eb9b2282fb..a684212f384 100644
--- a/src/backend/regex/retest.c
+++ b/src/backend/regex/retest.c
@@ -1,13 +1,13 @@
 /*
  * a simple regexp debug program
  *
- * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.2 1999/05/25 16:10:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/regex/Attic/retest.c,v 1.3 1999/07/15 23:03:24 momjian Exp $
  */
 
 #include <stdio.h>
 #include <string.h>
 #include "postgres.h"
-#include <regex/regex.h>
+#include "regex/regex.h"
 
 int
 main()
diff --git a/src/backend/utils/Gen_fmgrtab.sh.in b/src/backend/utils/Gen_fmgrtab.sh.in
index 4537f91d48f..ec60faa83d9 100644
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
 #
 # NOTES
 #    Passes any -D options on to cpp prior to generating the list
@@ -83,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+ * $Id: Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
  *
  * NOTES
  *	******************************
@@ -206,7 +206,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.15 1999/04/09 22:35:41 tgl Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.16 1999/07/15 23:03:25 momjian Exp $
  *
  * NOTES
  *
@@ -225,7 +225,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
  */
 
 #include <string.h>
-#include <postgres.h>
+#include "postgres.h"
 #include "utils/fmgrtab.h"
 
 FuNkYfMgRtAbStUfF
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index b456a5f6c70..b1a5d8e1a03 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.37 1999/07/09 03:28:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/acl.c,v 1.38 1999/07/15 23:03:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,7 @@
 #include <string.h>
 #include "postgres.h"
 
-#include <utils/memutils.h>
+#include "utils/memutils.h"
 #include "utils/acl.h"
 #include "utils/syscache.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c
index a9a49fe940e..815a263dda5 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.20 1999/05/25 16:11:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.21 1999/07/15 23:03:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,7 +25,7 @@
 #include "utils/memutils.h"
 
 #ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
+#include "regex/utils.h"
 #else
 #include <string.h>
 #endif
diff --git a/src/backend/utils/adt/filename.c b/src/backend/utils/adt/filename.c
index 0b2c0dd250d..f8c049d257f 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.19 1999/07/15 15:20:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/filename.c,v 1.20 1999/07/15 23:03:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 #include <sys/param.h>
 
 #include "postgres.h"
-#include <miscadmin.h>
+#include "miscadmin.h"
 #include "utils/builtins.h"		/* where function declarations go */
 
 char *
diff --git a/src/backend/utils/adt/inet_net_ntop.c b/src/backend/utils/adt/inet_net_ntop.c
index 11a0cb9363a..45f8978a1ed 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.6 1999/05/25 16:12:04 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.7 1999/07/15 23:03:26 momjian Exp $";
 
 #endif
 
@@ -30,8 +30,8 @@ static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.6 1999/05/25 16:12:04 momj
 #include <string.h>
 #include <stdlib.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
 #define SPRINTF(x) strlen(sprintf/**/x)
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index bcc9ff681a2..f5687f25330 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.8 1999/05/25 16:12:05 momjian Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.9 1999/07/15 23:03:27 momjian Exp $";
 
 #endif
 
@@ -32,8 +32,8 @@ static const char rcsid[] = "$Id: inet_net_pton.c,v 1.8 1999/05/25 16:12:05 momj
 #include <string.h>
 #include <stdlib.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 #ifdef SPRINTF_CHAR
 #define SPRINTF(x) strlen(sprintf/**/x)
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index ed2a86a954f..631fa75e699 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,14 +1,14 @@
 /*
  *	PostgreSQL type definitions for MAC addresses.
  *
- *	$Id: mac.c,v 1.11 1999/07/15 22:39:59 momjian Exp $
+ *	$Id: mac.c,v 1.12 1999/07/15 23:03:27 momjian Exp $
  */
 
 #include <stdio.h>
 #include <string.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 manufacturer manufacturers[] = {
 	{0x00, 0x00, 0x0C, "Cisco"},
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 304e91d2060..a50c2dc82ff 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -4,7 +4,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- *	  $Id: nabstime.c,v 1.57 1999/07/15 15:20:18 momjian Exp $
+ *	  $Id: nabstime.c,v 1.58 1999/07/15 23:03:27 momjian Exp $
  *
  */
 #include <stdio.h>
@@ -13,7 +13,7 @@
 #include <sys/types.h>
 
 #include "postgres.h"
-#include <miscadmin.h>
+#include "miscadmin.h"
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 70ecd3d5c28..889fc260c86 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
  *	is for IP V4 CIDR notation, but prepared for V6: just
  *	add the necessary bits where the comments indicate.
  *
- *	$Id: network.c,v 1.13 1999/07/15 22:40:00 momjian Exp $
+ *	$Id: network.c,v 1.14 1999/07/15 23:03:27 momjian Exp $
  *	Jon Postel RIP 16 Oct 1998
  */
 
@@ -17,8 +17,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <postgres.h>
-#include <utils/builtins.h>
+#include "postgres.h"
+#include "utils/builtins.h"
 
 static int	v4bitncmp(unsigned int a1, unsigned int a2, int bits);
 
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index c53b5350119..9a30652a5ee 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.24 1999/07/15 15:20:19 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.25 1999/07/15 23:03:27 momjian Exp $
  *
  *		Alistair Crooks added the code for the regex caching
  *		agc - cached the regular expressions used - there's a good chance
@@ -30,7 +30,7 @@
 #include <string.h>
 #include "postgres.h"			/* postgres system include file */
 
-#include <regex/regex.h>
+#include "regex/regex.h"
 
 #include "utils/builtins.h"		/* where the function declarations go */
 
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index a356bb8cdd0..39383494341 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.24 1999/07/15 22:40:03 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.25 1999/07/15 23:03:27 momjian Exp $
  *
  * Note - this code is real crufty...
  *
@@ -15,7 +15,7 @@
  */
 #include "postgres.h"
 
-#include <miscadmin.h>
+#include "miscadmin.h"
 
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 5b00ed9b0f4..076799089dd 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.24 1999/07/15 15:20:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.25 1999/07/15 23:03:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -39,15 +39,15 @@
  * Modified by sullivan@postgres.berkeley.edu April 1990
  *		changed ctl structure for shared memory
  */
-#include	   <stdio.h>
-#include	   <sys/types.h>
-#include	   <string.h>
-#include	   "postgres.h"
-#include	   "utils/dynahash.h"
-#include	   "utils/hsearch.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include <string.h>
+#include "postgres.h"
+#include "utils/dynahash.h"
+#include "utils/hsearch.h"
 #ifndef FRONTEND
 #endif	 /* !FRONTEND */
-#include	   "utils/memutils.h"
+#include "utils/memutils.h"
 
 /*
  * Fast MOD arithmetic, assuming that y is a power of 2 !
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 97dee13053e..8e6d2b1370a 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.32 1999/07/15 22:40:08 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.33 1999/07/15 23:03:30 momjian Exp $
  *
  * NOTES
  *	  Globals used all over the place should be declared here and not
@@ -26,7 +26,7 @@
 #include "postgres.h"
 #include "miscadmin.h"			/* where the declarations go */
 
-#include <storage/backendid.h>
+#include "storage/backendid.h"
 #include "storage/lmgr.h"
 #include "libpq/pqcomm.h"
 #include "catalog/catname.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 92532c9bad1..0474539462e 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.42 1999/07/15 22:40:09 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.43 1999/07/15 23:03:30 momjian Exp $
  *
  * NOTES
  *		InitPostgres() is the function called from PostgresMain
@@ -37,10 +37,10 @@
 #include "postgres.h"
 #include "version.h"
 
-#include <storage/backendid.h>
-#include <storage/smgr.h>
-#include <storage/proc.h>
-#include <utils/relcache.h>
+#include "storage/backendid.h"
+#include "storage/smgr.h"
+#include "storage/proc.h"
+#include "utils/relcache.h"
 
 #include "access/heapam.h"
 #include "utils/syscache.h"
diff --git a/src/backend/utils/mb/utftest.c b/src/backend/utils/mb/utftest.c
index c83e54c8ec8..e6556afe274 100644
--- a/src/backend/utils/mb/utftest.c
+++ b/src/backend/utils/mb/utftest.c
@@ -1,12 +1,12 @@
 /*
  * testing of utf2wchar()
- * $Id: utftest.c,v 1.2 1998/09/01 04:33:23 momjian Exp $
+ * $Id: utftest.c,v 1.3 1999/07/15 23:03:31 momjian Exp $
  */
-#include <regex/regex.h>
-#include <regex/utils.h>
-#include <regex/regex2.h>
+#include "regex/regex.h"
+#include "regex/utils.h"
+#include "regex/regex2.h"
 
-#include <regex/pg_wchar.h>
+#include "regex/pg_wchar.h"
 
 main()
 {
diff --git a/src/backend/utils/mb/wstrcmp.c b/src/backend/utils/mb/wstrcmp.c
index 3efdcc6f396..4b6a16b7d14 100644
--- a/src/backend/utils/mb/wstrcmp.c
+++ b/src/backend/utils/mb/wstrcmp.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  */
 
-#include <mb/pg_wchar.h>
+#include "mb/pg_wchar.h"
 
 int
 pg_char_and_wchar_strcmp(s1, s2)
diff --git a/src/backend/utils/mb/wstrncmp.c b/src/backend/utils/mb/wstrncmp.c
index c7ccf1b4cb7..050a46191b4 100644
--- a/src/backend/utils/mb/wstrncmp.c
+++ b/src/backend/utils/mb/wstrncmp.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  */
 
-#include <mb/pg_wchar.h>
+#include "mb/pg_wchar.h"
 
 int
 pg_wchar_strncmp(s1, s2, n)
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index f59ac973927..b1dab2d4961 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -8,16 +8,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.8 1999/02/13 23:20:06 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/misc/superuser.c,v 1.9 1999/07/15 23:03:32 momjian Exp $
  *
  * DESCRIPTION
  *	  See superuser().
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
-#include <utils/syscache.h>
-#include <catalog/pg_shadow.h>
+#include "postgres.h"
+#include "utils/syscache.h"
+#include "catalog/pg_shadow.h"
 
 bool
 superuser(void)