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

211 files changed, 794 insertions, 794 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)
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index b2e55df620e..7955fd6bfe8 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.18 1999/02/13 23:20:50 momjian Exp $
+ * $Id: genam.h,v 1.19 1999/07/15 23:03:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef GENAM_H
 #define GENAM_H
 
-#include <access/sdir.h>
-#include <access/funcindex.h>
-#include <access/relscan.h>
-#include <access/itup.h>
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "access/relscan.h"
+#include "access/itup.h"
 
 /* ----------------
  *		generalized index_ interface routines
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index b1c31b2c66b..dd0aa92e40d 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -12,10 +12,10 @@
 #ifndef GIST_H
 #define GIST_H
 
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <access/relscan.h>
-#include <access/sdir.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 
 /*
 ** You can have as many strategies as you please in GiSTs, as
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index d86036e9e18..ef55ab39518 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -11,7 +11,7 @@
  */
 #ifndef GISTSCAN_H
 
-#include <access/relscan.h>
+#include "access/relscan.h"
 
 extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
 			  uint16 nkeys, ScanKey key);
diff --git a/src/include/access/giststrat.h b/src/include/access/giststrat.h
index 77fc90b1625..c2fc30edf42 100644
--- a/src/include/access/giststrat.h
+++ b/src/include/access/giststrat.h
@@ -12,7 +12,7 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern StrategyNumber RelationGetGISTStrategy(Relation r,
 						AttrNumber attnum, RegProcedure proc);
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 1157bf355a9..08739e70ca6 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.25 1999/07/15 15:20:53 momjian Exp $
+ * $Id: hash.h,v 1.26 1999/07/15 23:03:34 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -16,11 +16,11 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include <access/sdir.h>
-#include <access/funcindex.h>
-#include <access/relscan.h>
-#include <access/itup.h>
-#include <utils/int8.h>
+#include "access/sdir.h"
+#include "access/funcindex.h"
+#include "access/relscan.h"
+#include "access/itup.h"
+#include "utils/int8.h"
 
 /*
  * An overflow page is a spare page allocated for storing data whose
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index d94d959b7a1..edfcc1319e5 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.12 1999/07/15 15:20:54 momjian Exp $
+ * $Id: hio.h,v 1.13 1999/07/15 23:03:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HIO_H
 #define HIO_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
 					 HeapTuple tuple);
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 507a17907fc..cae145ead49 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.23 1999/07/15 15:20:54 momjian Exp $
+ * $Id: htup.h,v 1.24 1999/07/15 23:03:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HTUP_H
 #define HTUP_H
 
-#include <storage/bufpage.h>
+#include "storage/bufpage.h"
 
 #define MinHeapTupleBitmapSize	32		/* 8 * 4 */
 
diff --git a/src/include/access/ibit.h b/src/include/access/ibit.h
index acbe22b6a1d..31ccc99191b 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ibit.h,v 1.9 1999/02/13 23:20:54 momjian Exp $
+ * $Id: ibit.h,v 1.10 1999/07/15 23:03:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef IBIT_H
 #define IBIT_H
 
-#include <utils/memutils.h>
+#include "utils/memutils.h"
 
 typedef struct IndexAttributeBitMapData
 {
diff --git a/src/include/access/iqual.h b/src/include/access/iqual.h
index be765ab4ec7..15e576e65a7 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: iqual.h,v 1.11 1999/02/13 23:20:55 momjian Exp $
+ * $Id: iqual.h,v 1.12 1999/07/15 23:03:34 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef IQUAL_H
 #define IQUAL_H
 
-#include <access/skey.h>
-#include <access/itup.h>
+#include "access/skey.h"
+#include "access/itup.h"
 
 
 /* ----------------
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 90ed45926af..32d75ef0903 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.14 1999/07/15 15:20:54 momjian Exp $
+ * $Id: istrat.h,v 1.15 1999/07/15 23:03:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ISTRAT_H
 #define ISTRAT_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 /*
  * StrategyNumberIsValid
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index f89211029c0..d324e0c7add 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.18 1999/07/15 15:20:54 momjian Exp $
+ * $Id: itup.h,v 1.19 1999/07/15 23:03:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ITUP_H
 #define ITUP_H
 
-#include <access/ibit.h>
-#include <access/tupmacs.h>
-#include <access/tupdesc.h>
-#include <storage/itemptr.h>
+#include "access/ibit.h"
+#include "access/tupmacs.h"
+#include "access/tupdesc.h"
+#include "storage/itemptr.h"
 
 #define MaxIndexAttributeNumber 7
 
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 9618e5fb725..f5d50533676 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.28 1999/07/15 15:20:55 momjian Exp $
+ * $Id: nbtree.h,v 1.29 1999/07/15 23:03:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NBTREE_H
 #define NBTREE_H
 
-#include <access/sdir.h>
-#include <access/relscan.h>
-#include <access/funcindex.h>
-#include <access/itup.h>
+#include "access/sdir.h"
+#include "access/relscan.h"
+#include "access/funcindex.h"
+#include "access/itup.h"
 
 /*
  *	BTPageOpaqueData -- At the end of every page, we store a pointer
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 0fce96e73a2..f90f3103b0c 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: printtup.h,v 1.10 1999/05/25 22:42:32 momjian Exp $
+ * $Id: printtup.h,v 1.11 1999/07/15 23:03:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRINTTUP_H
 #define PRINTTUP_H
 
-#include <tcop/dest.h>
+#include "tcop/dest.h"
 
 extern DestReceiver *printtup_create_DR(void);
 extern void showatts(char *name, TupleDesc attinfo);
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index fe8b03f40c1..08e7754df59 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.16 1999/07/15 15:20:55 momjian Exp $
+ * $Id: relscan.h,v 1.17 1999/07/15 23:03:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELSCAN_H
 #define RELSCAN_H
 
-#include <utils/tqual.h>
+#include "utils/tqual.h"
 
 typedef ItemPointerData MarkData;
 
diff --git a/src/include/access/rtree.h b/src/include/access/rtree.h
index d5d105ec3f6..ff13d3baba0 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.15 1999/07/15 15:20:55 momjian Exp $
+ * $Id: rtree.h,v 1.16 1999/07/15 23:03:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTREE_H
 #define RTREE_H
 
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <access/relscan.h>
-#include <access/sdir.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies					8
diff --git a/src/include/access/rtscan.h b/src/include/access/rtscan.h
index 88932322d33..8ad9943ac06 100644
--- a/src/include/access/rtscan.h
+++ b/src/include/access/rtscan.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtscan.h,v 1.6 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtscan.h,v 1.7 1999/07/15 23:03:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTSCAN_H
 #define RTSCAN_H
 
-#include <utils/rel.h>
-#include <storage/block.h>
-#include <storage/off.h>
+#include "utils/rel.h"
+#include "storage/block.h"
+#include "storage/off.h"
 
 void		rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
diff --git a/src/include/access/rtstrat.h b/src/include/access/rtstrat.h
index fb3e090b6c6..91d5d3d365c 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.10 1999/07/15 15:20:55 momjian Exp $
+ * $Id: rtstrat.h,v 1.11 1999/07/15 23:03:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RTSTRAT_H
 #define RTSTRAT_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 57cc7e0d444..8b9d1c5174f 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: skey.h,v 1.11 1999/02/13 23:20:58 momjian Exp $
+ * $Id: skey.h,v 1.12 1999/07/15 23:03:37 momjian Exp $
  *
  *
  * Note:
@@ -16,8 +16,8 @@
 #ifndef SKEY_H
 #define SKEY_H
 
-#include <access/attnum.h>
-#include <fmgr.h>
+#include "access/attnum.h"
+#include "fmgr.h"
 
 typedef struct ScanKeyData
 {
diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index b1e58f08dbe..92b58939b54 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: strat.h,v 1.15 1999/05/25 22:42:34 momjian Exp $
+ * $Id: strat.h,v 1.16 1999/07/15 23:03:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef STRAT_H
 #define STRAT_H
 
-#include <access/skey.h>
+#include "access/skey.h"
 
 typedef uint16 StrategyNumber;
 
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 2551278f129..46d9f1b8036 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: transam.h,v 1.22 1999/06/10 14:17:12 vadim Exp $
+ * $Id: transam.h,v 1.23 1999/07/15 23:03:38 momjian Exp $
  *
  *	 NOTES
  *		Transaction System Version 101 now support proper oid
@@ -17,7 +17,7 @@
 #ifndef TRANSAM_H
 #define TRANSAM_H
 
-#include <storage/bufmgr.h>
+#include "storage/bufmgr.h"
 
 /* ----------------
  *		transaction system version id
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index f338723d5f1..98e6492440b 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupdesc.h,v 1.22 1999/05/25 22:42:36 momjian Exp $
+ * $Id: tupdesc.h,v 1.23 1999/07/15 23:03:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TUPDESC_H
 #define TUPDESC_H
 
-#include <nodes/pg_list.h>
-#include <access/attnum.h>
-#include <catalog/pg_attribute.h>
+#include "nodes/pg_list.h"
+#include "access/attnum.h"
+#include "catalog/pg_attribute.h"
 
 
 typedef struct attrDefault
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 9f155200e25..44c9d4b7a6e 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.21 1999/07/15 15:20:56 momjian Exp $
+ * $Id: xact.h,v 1.22 1999/07/15 23:03:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XACT_H
 #define XACT_H
 
-#include <utils/nabstime.h>
-#include <access/transam.h>
+#include "utils/nabstime.h"
+#include "access/transam.h"
 
 /* ----------------
  *		transaction state structure
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 2e4cb77969b..fc0758152d3 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bootstrap.h,v 1.14 1999/02/13 23:21:00 momjian Exp $
+ * $Id: bootstrap.h,v 1.15 1999/07/15 23:03:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BOOTSTRAP_H
 #define BOOTSTRAP_H
 
-#include <access/funcindex.h>
-#include <access/itup.h>
-#include <utils/rel.h>
+#include "access/funcindex.h"
+#include "access/itup.h"
+#include "utils/rel.h"
 
 #define MAXATTR 40				/* max. number of attributes in a relation */
 
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 1ef299580f1..bc6a8ef6436 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog.h,v 1.7 1999/02/13 23:21:01 momjian Exp $
+ * $Id: catalog.h,v 1.8 1999/07/15 23:03:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CATALOG_H
 #define CATALOG_H
 
-#include <access/tupdesc.h>
+#include "access/tupdesc.h"
 
 extern char *relpath(char *relname);
 extern bool IsSystemRelationName(char *relname);
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index f10340a2a4f..b8e89d8c395 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heap.h,v 1.19 1999/05/25 16:13:39 momjian Exp $
+ * $Id: heap.h,v 1.20 1999/07/15 23:03:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HEAP_H
 #define HEAP_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern Oid	RelnameFindRelid(char *relname);
 extern Relation heap_create(char *relname, TupleDesc att,
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index a43ffae1ddc..b26e4acc711 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.17 1999/07/15 15:20:58 momjian Exp $
+ * $Id: index.h,v 1.18 1999/07/15 23:03:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INDEX_H
 #define INDEX_H
 
-#include <nodes/execnodes.h>
-#include <access/itup.h>
+#include "nodes/execnodes.h"
+#include "access/itup.h"
 
 extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId);
 
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index 2ff93f65744..73df64aaca6 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.20 1999/07/15 15:20:59 momjian Exp $
+ * $Id: indexing.h,v 1.21 1999/07/15 23:03:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INDEXING_H
 #define INDEXING_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 /*
  * Some definitions for indices on pg_attribute
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 292f8fac389..a507f7e2d5a 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.99 1999/05/25 16:13:47 momjian Exp $
+ * $Id: pg_proc.h,v 1.100 1999/07/15 23:03:43 momjian Exp $
  *
  * NOTES
  *	  The script catalog/genbki.sh reads this file and generates .bki
@@ -22,7 +22,7 @@
 #ifndef PG_PROC_H
 #define PG_PROC_H
 
-#include <tcop/dest.h>
+#include "tcop/dest.h"
 
 /* ----------------
  *		postgres.h contains the system type definintions and the
diff --git a/src/include/commands/command.h b/src/include/commands/command.h
index 207ee4da429..75aa526ca17 100644
--- a/src/include/commands/command.h
+++ b/src/include/commands/command.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: command.h,v 1.14 1999/05/25 22:42:41 momjian Exp $
+ * $Id: command.h,v 1.15 1999/07/15 23:03:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef COMMAND_H
 #define COMMAND_H
 
-#include <utils/portal.h>
+#include "utils/portal.h"
 
 extern MemoryContext PortalExecutorHeapMemory;
 
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index 5932ab43a22..63e1559f44e 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: defrem.h,v 1.15 1999/02/13 23:21:18 momjian Exp $
+ * $Id: defrem.h,v 1.16 1999/07/15 23:03:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DEFREM_H
 #define DEFREM_H
 
-#include <tcop/dest.h>
-#include <nodes/parsenodes.h>
+#include "tcop/dest.h"
+#include "nodes/parsenodes.h"
 
 /*
  * prototypes in defind.c
diff --git a/src/include/commands/proclang.h b/src/include/commands/proclang.h
index f39a6498fb0..42276055e6c 100644
--- a/src/include/commands/proclang.h
+++ b/src/include/commands/proclang.h
@@ -9,7 +9,7 @@
 #ifndef PROCLANG_H
 #define PROCLANG_H
 
-#include <nodes/parsenodes.h>
+#include "nodes/parsenodes.h"
 
 extern void CreateProceduralLanguage(CreatePLangStmt *stmt);
 extern void DropProceduralLanguage(DropPLangStmt *stmt);
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index cd67bd3f32a..b88c7b3ecc5 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.10 1999/07/15 15:21:06 momjian Exp $
+ * $Id: execdebug.h,v 1.11 1999/07/15 23:03:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
-#include <nodes/print.h>
+#include "nodes/print.h"
 
 /* ----------------------------------------------------------------
  *		debugging defines.
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 0dba8ccabd1..19823ac0e25 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -7,16 +7,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdesc.h,v 1.10 1999/02/13 23:21:23 momjian Exp $
+ * $Id: execdesc.h,v 1.11 1999/07/15 23:03:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDESC_H
 #define EXECDESC_H
 
-#include <tcop/dest.h>
-#include <nodes/plannodes.h>
-#include <nodes/parsenodes.h>
+#include "tcop/dest.h"
+#include "nodes/plannodes.h"
+#include "nodes/parsenodes.h"
 
 /* ----------------
  *		query descriptor:
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index e979441a15b..20ce01a2501 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.35 1999/07/15 15:21:06 momjian Exp $
+ * $Id: executor.h,v 1.36 1999/07/15 23:03:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,7 @@
 #define EXECUTOR_H
 
 #include <stdio.h>
-#include <executor/execdesc.h>
+#include "executor/execdesc.h"
 
 /* ----------------
  *		TupIsNull
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index ad6390fa203..2a1d8a4b3aa 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.13 1999/07/15 15:21:14 momjian Exp $
+ * $Id: tuptable.h,v 1.14 1999/07/15 23:03:48 momjian Exp $
  *
  * NOTES
  *	  The tuple table interface is getting pretty ugly.
@@ -17,7 +17,7 @@
 #ifndef TUPTABLE_H
 #define TUPTABLE_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 /* ----------------
  *		The executor tuple table is managed and manipulated by special
diff --git a/src/include/lib/hasht.h b/src/include/lib/hasht.h
index 3f56bf640ca..bffa83e7a68 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hasht.h,v 1.7 1999/02/13 23:21:31 momjian Exp $
+ * $Id: hasht.h,v 1.8 1999/07/15 23:03:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HASHT_H
 #define HASHT_H
 
-#include <utils/hsearch.h>
+#include "utils/hsearch.h"
 
 typedef void (*HashtFunc) ();
 
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index d6023332be6..7827b464081 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -9,7 +9,7 @@
 #ifndef PG_CRYPT_H
 #define PG_CRYPT_H
 
-#include <libpq/libpq-be.h>
+#include "libpq/libpq-be.h"
 
 #define CRYPT_PWD_FILE	"pg_pwd"
 #define CRYPT_PWD_FILE_SEPCHAR	"'\\t'"
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 1b37c064a4f..31a2db54222 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqcomm.h,v 1.36 1999/05/25 22:42:51 momjian Exp $
+ * $Id: pqcomm.h,v 1.37 1999/07/15 23:03:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #ifdef WIN32
-#include <winsock.h>
+#include "winsock.h"
 #else
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index ca324c94b12..ca2e427e019 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,20 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.31 1999/07/15 15:21:16 momjian Exp $
+ * $Id: execnodes.h,v 1.32 1999/07/15 23:03:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include <nodes/primnodes.h>
-#include <executor/hashjoin.h>
-#include <access/relscan.h>
-#include <access/sdir.h>
-#include <nodes/params.h>
-#include <executor/tuptable.h>
-#include <access/funcindex.h>
+#include "nodes/primnodes.h"
+#include "executor/hashjoin.h"
+#include "access/relscan.h"
+#include "access/sdir.h"
+#include "nodes/params.h"
+#include "executor/tuptable.h"
+#include "access/funcindex.h"
 
 /* ----------------
  *	  IndexInfo information
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 7ea2e7e1420..6a387fd5c5c 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.19 1999/07/15 15:21:16 momjian Exp $
+ * $Id: makefuncs.h,v 1.20 1999/07/15 23:03:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MAKEFUNC_H
 #define MAKEFUNC_H
 
-#include <nodes/parsenodes.h>
+#include "nodes/parsenodes.h"
 
 extern Oper *makeOper(Oid opno,
 		 Oid opid,
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index 76f99204c20..39130ef0edf 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memnodes.h,v 1.13 1999/05/25 22:42:55 momjian Exp $
+ * $Id: memnodes.h,v 1.14 1999/07/15 23:03:53 momjian Exp $
  *
  * XXX the typedefs in this file are different from the other ???nodes.h;
  *	  they are pointers to structures instead of the structures themselves.
@@ -18,9 +18,9 @@
 #ifndef MEMNODES_H
 #define MEMNODES_H
 
-#include <lib/fstack.h>
-#include <utils/memutils.h>
-#include <nodes/nodes.h>
+#include "lib/fstack.h"
+#include "utils/memutils.h"
+#include "nodes/nodes.h"
 
 /*
  * MemoryContext
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 528924ad41d..ccd1d3da094 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.9 1999/07/15 15:21:17 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.10 1999/07/15 23:03:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-#include <nodes/primnodes.h>
+#include "nodes/primnodes.h"
 
 extern bool single_node(Node *node);
 extern bool var_is_outer(Var *var);
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 8d6a9a2eb65..b52314c4633 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: params.h,v 1.10 1999/02/13 23:21:38 momjian Exp $
+ * $Id: params.h,v 1.11 1999/07/15 23:03:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARAMS_H
 #define PARAMS_H
 
-#include <access/attnum.h>
+#include "access/attnum.h"
 
 /* ----------------------------------------------------------------
  *
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index d804257ba6e..ef9f51cb7b0 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.75 1999/07/13 21:17:38 momjian Exp $
+ * $Id: parsenodes.h,v 1.76 1999/07/15 23:03:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSENODES_H
 #define PARSENODES_H
 
-#include <nodes/primnodes.h>
+#include "nodes/primnodes.h"
 
 /*****************************************************************************
  *	Query Tree
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index de481f4e464..3e20012b087 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_list.h,v 1.11 1999/02/22 05:26:47 momjian Exp $
+ * $Id: pg_list.h,v 1.12 1999/07/15 23:03:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PG_LIST_H
 #define PG_LIST_H
 
-#include <nodes/nodes.h>
+#include "nodes/nodes.h"
 
 /* ----------------------------------------------------------------
  *						node definitions
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 5c94d02932b..3d319a66ff7 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.27 1999/05/25 22:42:58 momjian Exp $
+ * $Id: plannodes.h,v 1.28 1999/07/15 23:03:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANNODES_H
 #define PLANNODES_H
 
-#include <nodes/execnodes.h>
+#include "nodes/execnodes.h"
 
 /* ----------------------------------------------------------------
  *	Executor State types are used in the plannode structures
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 3b0cadfcdcd..5f3fbb36c2a 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: primnodes.h,v 1.29 1999/05/25 22:42:59 momjian Exp $
+ * $Id: primnodes.h,v 1.30 1999/07/15 23:03:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRIMNODES_H
 #define PRIMNODES_H
 
-#include <utils/fcache.h>
-#include <access/attnum.h>
-#include <nodes/pg_list.h>
+#include "utils/fcache.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
 
 /* ----------------------------------------------------------------
  *						node definitions
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index c5d7d308407..e305870aa7b 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.33 1999/07/15 15:21:18 momjian Exp $
+ * $Id: relation.h,v 1.34 1999/07/15 23:03:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELATION_H
 #define RELATION_H
 
-#include <nodes/parsenodes.h>
+#include "nodes/parsenodes.h"
 
 /*
  * Relids
diff --git a/src/include/optimizer/_deadcode/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h
index d925be5630f..4ec0c5aabb7 100644
--- a/src/include/optimizer/_deadcode/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.1 1999/07/15 15:21:24 momjian Exp $
+ * $Id: xfunc.h,v 1.2 1999/07/15 23:03:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XFUNC_H
 #define XFUNC_H
 
-#include <utils/rel.h>
-#include <nodes/relation.h>
+#include "utils/rel.h"
+#include "nodes/relation.h"
 
 /* command line arg flags */
 #define XFUNC_OFF -1			/* do no optimization of expensive preds */
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 1416cc25450..de135ca1d53 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.20 1999/07/15 15:21:19 momjian Exp $
+ * $Id: clauses.h,v 1.21 1999/07/15 23:03:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CLAUSES_H
 #define CLAUSES_H
 
-#include <nodes/relation.h>
+#include "nodes/relation.h"
 
 extern Expr *make_clause(int type, Node *oper, List *args);
 
diff --git a/src/include/optimizer/ordering.h b/src/include/optimizer/ordering.h
index 30b262b9e37..61dc0a43366 100644
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ordering.h,v 1.14 1999/05/25 16:14:20 momjian Exp $
+ * $Id: ordering.h,v 1.15 1999/07/15 23:03:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ORDERING_H
 #define ORDERING_H
 
-#include <nodes/relation.h>
+#include "nodes/relation.h"
 
 extern bool pathorder_match(PathOrder *path_ordering1,
 				PathOrder *path_ordering2, int *better_sort);
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index cd67cd16d54..90c5e3e099f 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plancat.h,v 1.11 1999/02/13 23:21:50 momjian Exp $
+ * $Id: plancat.h,v 1.12 1999/07/15 23:03:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANCAT_H
 #define PLANCAT_H
 
-#include <nodes/parsenodes.h>
+#include "nodes/parsenodes.h"
 
 /*
  * transient data structure to hold return value of index_info. Note that
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index c3b06101c67..54733af3e7b 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.15 1999/06/06 17:38:10 tgl Exp $
+ * $Id: prep.h,v 1.16 1999/07/15 23:03:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PREP_H
 #define PREP_H
 
-#include <nodes/plannodes.h>
-#include <nodes/parsenodes.h>
+#include "nodes/plannodes.h"
+#include "nodes/parsenodes.h"
 
 /*
  * prototypes for prepqual.c
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index d928f0e7a61..3fa861f1564 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -5,14 +5,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: analyze.h,v 1.8 1999/07/13 21:17:40 momjian Exp $
+ * $Id: analyze.h,v 1.9 1999/07/15 23:04:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ANALYZE_H
 #define ANALYZE_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 extern List *parse_analyze(List *pl, ParseState *parentParseState);
 
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 64a6e3a65e2..f1b400e9c9a 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_agg.h,v 1.11 1999/07/15 15:21:25 momjian Exp $
+ * $Id: parse_agg.h,v 1.12 1999/07/15 23:04:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_AGG_H
 #define PARSE_AGG_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 extern void AddAggToParseState(ParseState *pstate, Aggref *aggref);
 extern void parseCheckAggregates(ParseState *pstate, Query *qry);
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 2b3dddad5c1..a50ab4e0391 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_clause.h,v 1.10 1999/07/15 15:21:25 momjian Exp $
+ * $Id: parse_clause.h,v 1.11 1999/07/15 23:04:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_CLAUSE_H
 #define PARSE_CLAUSE_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList, Node **qual);
 extern Node *transformWhereClause(ParseState *pstate, Node *where, Node *using);
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 0913ce3bbaa..cbc4095e330 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.12 1999/07/15 15:21:26 momjian Exp $
+ * $Id: parse_expr.h,v 1.13 1999/07/15 23:04:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_EXPR_H
 #define PARSE_EXPR_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 #include "parser/parse_type.h"
 
 extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index de3487183ab..38626290cb1 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.17 1999/07/15 15:21:26 momjian Exp $
+ * $Id: parse_func.h,v 1.18 1999/07/15 23:04:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSER_FUNC_H
 #define PARSER_FUNC_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 
 #define MAXFARGS 8				/* max # args to a c or postquel function */
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 5a56b5fb75b..3dd2257db5e 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -5,15 +5,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_node.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
+ * $Id: parse_node.h,v 1.14 1999/07/15 23:04:02 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_NODE_H
 #define PARSE_NODE_H
 
-#include <nodes/parsenodes.h>
-#include <utils/rel.h>
+#include "nodes/parsenodes.h"
+#include "utils/rel.h"
 
 /* state information used during parse analysis */
 typedef struct ParseState
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 12c47636b6a..e44f89c79ba 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.10 1999/07/15 15:21:27 momjian Exp $
+ * $Id: parse_relation.h,v 1.11 1999/07/15 23:04:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_QUERY_H
 #define PARSE_RANGE_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname);
 extern int refnameRangeTablePosn(ParseState *pstate,
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index d54ce32d83b..bd520d1bab9 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_target.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
+ * $Id: parse_target.h,v 1.14 1999/07/15 23:04:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_TARGET_H
 #define PARSE_TARGET_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 #define EXPR_COLUMN_FIRST	1
 #define EXPR_RELATION_FIRST 2
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 50b99b48ce6..f2c1cb5b5b6 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parser.h,v 1.5 1999/05/13 07:29:20 tgl Exp $
+ * $Id: parser.h,v 1.6 1999/07/15 23:04:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <parser/parse_node.h>
+#include "parser/parse_node.h"
 
 extern List *parser(char *str, Oid *typev, int nargs);
 
diff --git a/src/include/port/nextstep.h b/src/include/port/nextstep.h
index d0b43d57163..40451da12b2 100644
--- a/src/include/port/nextstep.h
+++ b/src/include/port/nextstep.h
@@ -1,4 +1,4 @@
-#include <libc.h>
+#include "libc.h"
 #include <sys/ioctl.h>
 #if defined(__STRICT_ANSI__)
 #define isascii(c)	((unsigned)(c)<=0177)
diff --git a/src/include/port/solaris_i386.h b/src/include/port/solaris_i386.h
index ef47720e8e0..722cbd94e68 100755
--- a/src/include/port/solaris_i386.h
+++ b/src/include/port/solaris_i386.h
@@ -4,7 +4,7 @@
 #define HAS_TEST_AND_SET
 typedef unsigned char slock_t;
 
-#include <sys/isa_defs.h>
+#include "sys/isa_defs.h"
 
 #ifndef			BIG_ENDIAN
 #define			BIG_ENDIAN		4321
diff --git a/src/include/port/svr4.h b/src/include/port/svr4.h
index a460c825c63..67646898d54 100644
--- a/src/include/port/svr4.h
+++ b/src/include/port/svr4.h
@@ -11,7 +11,7 @@
 #ifdef sinix
 #define HAS_TEST_AND_SET
 
-#include <abi_mutex.h>
+#include "abi_mutex.h"
 typedef abilock_t slock_t;
 
 #endif
diff --git a/src/include/regex/regex.h b/src/include/regex/regex.h
index 55c11733eac..b0b86f3cb6d 100644
--- a/src/include/regex/regex.h
+++ b/src/include/regex/regex.h
@@ -41,7 +41,7 @@
 #define _REGEX_H_
 
 #include <sys/types.h>
-#include <mb/pg_wchar.h>
+#include "mb/pg_wchar.h"
 
 /* types */
 typedef off_t regoff_t;
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 5e7b8fb014e..06b396a9882 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -5,15 +5,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prs2lock.h,v 1.9 1999/02/13 23:21:59 momjian Exp $
+ * $Id: prs2lock.h,v 1.10 1999/07/15 23:04:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRS2LOCK_H
 #define PRS2LOCK_H
 
-#include <access/attnum.h>
-#include <nodes/pg_list.h>
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
 
 /*
  * RewriteRule -
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index 7d257e33e60..0b496f07bf5 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.29 1999/05/25 16:14:38 momjian Exp $
+ * $Id: buf_internals.h,v 1.30 1999/07/15 23:04:08 momjian Exp $
  *
  * NOTE
  *		If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -17,8 +17,8 @@
 #ifndef BUFMGR_INTERNALS_H
 #define BUFMGR_INTERNALS_H
 
-#include <storage/lmgr.h>
-#include <storage/buf.h>
+#include "storage/lmgr.h"
+#include "storage/buf.h"
 
 /* Buf Mgr constants */
 /* in bufmgr.c */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index a0d08a2d78b..c434d1beec4 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.27 1999/07/15 15:21:31 momjian Exp $
+ * $Id: bufmgr.h,v 1.28 1999/07/15 23:04:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,11 +15,11 @@
 
 #include <stdio.h>
 
-#include <storage/ipc.h>
-#include <storage/block.h>
-#include <storage/buf.h>
-#include <storage/buf_internals.h>
-#include <utils/rel.h>
+#include "storage/ipc.h"
+#include "storage/block.h"
+#include "storage/buf.h"
+#include "storage/buf_internals.h"
+#include "utils/rel.h"
 
 /*
  * the maximum size of a disk block for any possible installation.
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 6921f97a089..87f5be67a9f 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,19 +6,19 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.24 1999/07/15 15:21:32 momjian Exp $
+ * $Id: bufpage.h,v 1.25 1999/07/15 23:04:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef BUFPAGE_H
 #define BUFPAGE_H
 
-#include <storage/off.h>
-#include <storage/itemid.h>
-#include <storage/item.h>
-#include <storage/buf.h>
-#include <storage/page.h>
-#include <storage/bufmgr.h>
+#include "storage/off.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/page.h"
+#include "storage/bufmgr.h"
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index e9a96c8190a..8ae09e19905 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.34 1999/02/21 01:41:47 tgl Exp $
+ * $Id: ipc.h,v 1.35 1999/07/15 23:04:10 momjian Exp $
  *
  * NOTES
  *	  This file is very architecture-specific.	This stuff should actually
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 #include <sys/ipc.h>			/* For IPC_PRIVATE */
 
-#include <config.h>
+#include "config.h"
 
 #ifndef HAVE_UNION_SEMUN
 union semun
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index 7980ea15575..42368ddf5c3 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itempos.h,v 1.7 1999/02/13 23:22:06 momjian Exp $
+ * $Id: itempos.h,v 1.8 1999/07/15 23:04:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ITEMPOS_H
 #define ITEMPOS_H
 
-#include <storage/itemid.h>
-#include <storage/buf.h>
+#include "storage/itemid.h"
+#include "storage/buf.h"
 
 typedef struct ItemSubpositionData
 {
diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h
index 4f6a131f741..6d5f1e377e9 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itemptr.h,v 1.11 1999/05/25 16:14:42 momjian Exp $
+ * $Id: itemptr.h,v 1.12 1999/07/15 23:04:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef ITEMPTR_H
 #define ITEMPTR_H
 
-#include <storage/off.h>
-#include <storage/block.h>
+#include "storage/off.h"
+#include "storage/block.h"
 
 /*
  * ItemPointer:
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index bfe08d2c259..52c89c4f347 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: large_object.h,v 1.10 1999/02/13 23:22:06 momjian Exp $
+ * $Id: large_object.h,v 1.11 1999/07/15 23:04:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
 
 #include <sys/types.h>
 
-#include <access/relscan.h>
+#include "access/relscan.h"
 
 /*
  * This structure will eventually have lots more stuff associated with it.
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index c7e649f19c0..8903af8ec6b 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.21 1999/07/15 15:21:32 momjian Exp $
+ * $Id: lmgr.h,v 1.22 1999/07/15 23:04:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LMGR_H
 #define LMGR_H
 
-#include <storage/lock.h>
-#include <utils/rel.h>
+#include "storage/lock.h"
+#include "utils/rel.h"
 
 #define AccessShareLock			1		/* SELECT */
 #define RowShareLock			2		/* SELECT FOR UPDATE */
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 327f57cc7d1..fb74629e637 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,17 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.31 1999/07/15 20:32:29 momjian Exp $
+ * $Id: lock.h,v 1.32 1999/07/15 23:04:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LOCK_H_
 #define LOCK_H_
 
-#include <storage/shmem.h>
-#include <storage/itemptr.h>
-#include <storage/sinvaladt.h>
-#include <utils/array.h>
+#include "storage/shmem.h"
+#include "storage/itemptr.h"
+#include "storage/sinvaladt.h"
+#include "utils/array.h"
 
 extern SPINLOCK LockMgrLock;
 typedef int LOCKMASK;
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index 2baccce5bef..067bd24381e 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.15 1999/02/13 23:22:07 momjian Exp $
+ * $Id: multilev.h,v 1.16 1999/07/15 23:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MULTILEV_H
 #define MULTILEV_H
 
-#include <storage/lmgr.h>
+#include "storage/lmgr.h"
 
 #ifdef LowLevelLocking
 
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index f62106e1ce2..4a5eb5533a2 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: proc.h,v 1.24 1999/05/25 22:43:27 momjian Exp $
+ * $Id: proc.h,v 1.25 1999/07/15 23:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef _PROC_H_
 #define _PROC_H_
 
-#include <storage/lock.h>
+#include "storage/lock.h"
 
 typedef struct
 {
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index 3125d822ec4..6b6e4ecfb0f 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.63 1999/07/13 20:12:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.64 1999/07/15 23:04:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -307,7 +307,7 @@ tas(slock_t *s_lock)
  * assembly from his NECEWS SVR4 port, but we probably ought to retain this
  * for the R3000 chips out there.
  */
-#include <mutex.h>
+#include "mutex.h"
 #define TAS(lock)	(test_and_set(lock,1))
 #define S_UNLOCK(lock)	(test_then_and(lock,0))
 #define S_INIT_LOCK(lock)	(test_then_and(lock,0))
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 66365b4a9a7..bb9e004ba26 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: shmem.h,v 1.18 1999/05/25 22:43:27 momjian Exp $
+ * $Id: shmem.h,v 1.19 1999/07/15 23:04:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SHMEM_H
 #define SHMEM_H
 
-#include <utils/hsearch.h>
-#include <storage/spin.h>
+#include "utils/hsearch.h"
+#include "storage/spin.h"
 
 
 /* The shared memory region can start at a different address
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 8ef86c8a488..8d0f35a43c3 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinval.h,v 1.11 1999/05/28 17:03:31 tgl Exp $
+ * $Id: sinval.h,v 1.12 1999/07/15 23:04:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVAL_H
 #define SINVAL_H
 
-#include <storage/itemptr.h>
-#include <storage/spin.h>
+#include "storage/itemptr.h"
+#include "storage/spin.h"
 
 extern SPINLOCK SInvalLock;
 
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index c939a0c6dbe..03b2a3a8f53 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.14 1999/05/28 17:03:30 tgl Exp $
+ * $Id: sinvaladt.h,v 1.15 1999/07/15 23:04:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVALADT_H
 #define SINVALADT_H
 
-#include <storage/itemptr.h>
-#include <storage/ipc.h>
+#include "storage/itemptr.h"
+#include "storage/ipc.h"
 
 /*
  * The structure of the shared cache invaidation segment
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index c3c0d314462..c1e81abcf55 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -6,16 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: smgr.h,v 1.14 1999/02/13 23:22:10 momjian Exp $
+ * $Id: smgr.h,v 1.15 1999/07/15 23:04:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SMGR_H
 #define SMGR_H
 
-#include <storage/spin.h>
-#include <storage/block.h>
-#include <utils/rel.h>
+#include "storage/spin.h"
+#include "storage/block.h"
+#include "utils/rel.h"
 
 #define SM_FAIL			0
 #define SM_SUCCESS		1
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index ace673d98ec..be976c16b23 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: spin.h,v 1.8 1999/02/13 23:22:10 momjian Exp $
+ * $Id: spin.h,v 1.9 1999/07/15 23:04:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SPIN_H
 #define SPIN_H
 
-#include <storage/ipc.h>
+#include "storage/ipc.h"
 
 /*
  * two implementations of spin locks
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index a694d435c72..6d9cc55ea7e 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -44,14 +44,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.21 1999/07/15 15:21:36 momjian Exp $
+ * $Id: dest.h,v 1.22 1999/07/15 23:04:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DEST_H
 #define DEST_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 /* ----------------
  *		CommandDest is a simplistic means of identifying the desired
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 5c783d50142..66148375a77 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pquery.h,v 1.12 1999/02/13 23:22:13 momjian Exp $
+ * $Id: pquery.h,v 1.13 1999/07/15 23:04:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PQUERY_H
 #define PQUERY_H
 
-#include <executor/execdesc.h>
+#include "executor/execdesc.h"
 
 /* moved to execdesc.h
 extern QueryDesc *CreateQueryDesc(Query *parsetree, Plan *plantree,
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 8baffbeb2c4..1fc1ccf1e77 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: utility.h,v 1.7 1999/02/13 23:22:13 momjian Exp $
+ * $Id: utility.h,v 1.8 1999/07/15 23:04:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef UTILITY_H
 #define UTILITY_H
 
-#include <executor/execdesc.h>
+#include "executor/execdesc.h"
 
 extern void ProcessUtility(Node *parsetree, CommandDest dest);
 
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index c0270b3a125..71a155c9935 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.21 1999/07/15 15:21:38 momjian Exp $
+ * $Id: acl.h,v 1.22 1999/07/15 23:04:19 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -22,8 +22,8 @@
 #ifndef ACL_H
 #define ACL_H
 
-#include <nodes/parsenodes.h>
-#include <utils/array.h>
+#include "nodes/parsenodes.h"
+#include "utils/array.h"
 #include "utils/memutils.h"
 
 /*
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index f653068e200..58dd539b91b 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.82 1999/07/15 15:21:39 momjian Exp $
+ * $Id: builtins.h,v 1.83 1999/07/15 23:04:20 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -22,14 +22,14 @@
 #ifndef BUILTINS_H
 #define BUILTINS_H
 
-#include <storage/itemptr.h>
-#include <utils/array.h>
-#include <utils/geo_decls.h>
-#include <utils/datetime.h>
-#include <utils/nabstime.h>
-#include <utils/int8.h>
-#include <utils/inet.h>
-#include <utils/numeric.h>
+#include "storage/itemptr.h"
+#include "utils/array.h"
+#include "utils/geo_decls.h"
+#include "utils/datetime.h"
+#include "utils/nabstime.h"
+#include "utils/int8.h"
+#include "utils/inet.h"
+#include "utils/numeric.h"
 
 /*
  *		Defined in adt/
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 601e59596a6..b951cd634ea 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.17 1999/07/15 15:21:39 momjian Exp $
+ * $Id: catcache.h,v 1.18 1999/07/15 23:04:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,8 +15,8 @@
 
 /* #define		CACHEDEBUG		 turns DEBUG elogs on */
 
-#include <access/htup.h>
-#include <lib/dllist.h>
+#include "access/htup.h"
+#include "lib/dllist.h"
 
 /*
  *		struct catctup:			tuples in the cache.
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 601c023387c..78d74966c7f 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.11 1999/07/15 15:21:39 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.12 1999/07/15 23:04:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,7 @@
 #include <sys/param.h>			/* For MAXPATHLEN */
 
 /* we need this include because port files use them */
-#include <postgres.h>
+#include "postgres.h"
 
 #ifdef MIN
 #undef MIN
diff --git a/src/include/utils/fcache.h b/src/include/utils/fcache.h
index cb3de1083c0..9b3e902d63e 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache.h,v 1.8 1999/02/13 23:22:19 momjian Exp $
+ * $Id: fcache.h,v 1.9 1999/07/15 23:04:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE_H
 #define FCACHE_H
 
-#include <fmgr.h>
+#include "fmgr.h"
 
 
 typedef struct
diff --git a/src/include/utils/fcache2.h b/src/include/utils/fcache2.h
index 9439b28a797..048c86d4f45 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fcache2.h,v 1.8 1999/02/13 23:22:20 momjian Exp $
+ * $Id: fcache2.h,v 1.9 1999/07/15 23:04:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FCACHE2_H
 #define FCACHE2_H
 
-#include <nodes/execnodes.h>
+#include "nodes/execnodes.h"
 
 extern void setFcache(Node *node, Oid foid, List *argList, ExprContext *econtext);
 
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 3ee354df115..f63941f3967 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.12 1999/07/15 15:21:39 momjian Exp $
+ * $Id: inval.h,v 1.13 1999/07/15 23:04:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INVAL_H
 #define INVAL_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 extern void InitLocalInvalidateData(void);
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 6a985ac8c76..39cf80d9ebf 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.17 1999/07/15 15:21:41 momjian Exp $
+ * $Id: lsyscache.h,v 1.18 1999/07/15 23:04:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
 extern bool op_class(Oid oprno, int32 opclass, Oid amopid);
 extern char *get_attname(Oid relid, AttrNumber attnum);
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index 07186589a90..cfaea911a52 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.16 1999/07/15 15:21:42 momjian Exp $
+ * $Id: portal.h,v 1.17 1999/07/15 23:04:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,8 +25,8 @@
 #ifndef PORTAL_H
 #define PORTAL_H
 
-#include <executor/execdesc.h>
-#include <nodes/memnodes.h>
+#include "executor/execdesc.h"
+#include "nodes/memnodes.h"
 
 typedef struct PortalBlockData
 {
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 4b2ee9de96f..3dba1337beb 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,19 +6,19 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.23 1999/05/25 16:14:57 momjian Exp $
+ * $Id: rel.h,v 1.24 1999/07/15 23:04:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REL_H
 #define REL_H
 
-#include <catalog/pg_am.h>
-#include <catalog/pg_class.h>
-#include <access/strat.h>
-#include <access/tupdesc.h>
-#include <rewrite/prs2lock.h>
-#include <storage/fd.h>
+#include "catalog/pg_am.h"
+#include "catalog/pg_class.h"
+#include "access/strat.h"
+#include "access/tupdesc.h"
+#include "rewrite/prs2lock.h"
+#include "storage/fd.h"
 
 typedef struct Trigger
 {
diff --git a/src/include/utils/rel2.h b/src/include/utils/rel2.h
index 50863611007..ee9ad6f17be 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel2.h,v 1.8 1999/02/13 23:22:30 momjian Exp $
+ * $Id: rel2.h,v 1.9 1999/07/15 23:04:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TMP_REL2_H
 #define TMP_REL2_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 extern IndexStrategy RelationGetIndexStrategy(Relation relation);
 
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index d95a9a27fe3..cc9ed9e64c1 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relcache.h,v 1.12 1999/05/01 19:09:43 tgl Exp $
+ * $Id: relcache.h,v 1.13 1999/07/15 23:04:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELCACHE_H
 #define RELCACHE_H
 
-#include <utils/rel.h>
+#include "utils/rel.h"
 
 /*
  * relation lookup routines
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 22949b44346..14f888b76ce 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: syscache.h,v 1.14 1999/07/15 15:21:43 momjian Exp $
+ * $Id: syscache.h,v 1.15 1999/07/15 23:04:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SYSCACHE_H
 #define SYSCACHE_H
 
-#include <access/htup.h>
+#include "access/htup.h"
 
  /* #define CACHEDEBUG *//* turns DEBUG elogs on */
 
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index acb3284c9ae..4cb685968b1 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -7,15 +7,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tqual.h,v 1.23 1999/07/15 15:21:43 momjian Exp $
+ * $Id: tqual.h,v 1.24 1999/07/15 23:04:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TQUAL_H
 #define TQUAL_H
 
-#include <access/htup.h>
-#include <access/xact.h>
+#include "access/htup.h"
+#include "access/xact.h"
 
 typedef struct SnapshotData
 {