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

211 files changed, 612 insertions, 612 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index f061ea4822..133bb7bb00 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -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 89cc2f1bba..18ee5596d0 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -13,11 +13,11 @@
  *-------------------------------------------------------------------------
  */
 
-#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 78386f9b7b..ace5aa2db3 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 54f2ce7b06..a7020a1c32 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -12,9 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#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 88ed6d7976..27d19ab8aa 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -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 2e905427d8..934d7e5911 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 07dbd26947..26736686e6 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 2fe9222b2d..9bc3acc719 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 69eb9c31c3..e1a5e497a7 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 5fed69343c..23b08e0356 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -15,14 +15,14 @@
  *-------------------------------------------------------------------------
  */
 
-#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 "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"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index 9ac56469e8..9e171479b0 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -12,9 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#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 11ba3067b0..24887d6dec 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -14,9 +14,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 338d1c1555..520335de01 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -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 7d15063f57..c83d635f3f 100644
--- a/src/backend/access/hash/hashscan.c
+++ b/src/backend/access/hash/hashscan.c
@@ -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 4d95292b13..1f7f798326 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -12,9 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#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 9677d65334..7c6e2bf64f 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -12,7 +12,7 @@
  *-------------------------------------------------------------------------
  */
 
-#include <postgres.h>
+#include "postgres.h"
 
 
 /*
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index de67c7311c..b30fd701c5 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 7ce99385f5..c2bdc14177 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -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 9e280139e4..5af649c49d 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 645c49eb2c..af212a6530 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -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 52e96f5fa0..3bdd2255fa 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -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 2409f7e4a2..3c561e2e4c 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -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 4bebd72e16..951d3661e9 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -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 8d08b4c952..215d53563d 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 5902ec782f..7e93655821 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -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 9dafafa52e..33069598c9 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -16,14 +16,14 @@
  *-------------------------------------------------------------------------
  */
 
-#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 "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"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index d9c3e96098..abf56760c9 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -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 5ab69bedb1..aa2840119e 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 4b426ecfa6..e9e15b1474 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 1436eb378d..8d6e3ce948 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 6bfeffce55..ef2827cbea 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -12,9 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#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 4020f35361..e3e712c1f9 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -12,14 +12,14 @@
  *-------------------------------------------------------------------------
  */
 
-#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 "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"
 
 #ifndef HAVE_MEMMOVE
 #else
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 7d4dfe7c98..e3a9f21c63 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 2a5d1544cb..a00dc08c00 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#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 7d9387c11b..a2bddc4f0c 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -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 86a6e9890e..bbceab50d0 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -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 45c3c23b60..4bcb10700a 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -12,11 +12,11 @@
  *-------------------------------------------------------------------------
  */
 
-#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 84e4896a03..b8e05c5964 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -142,16 +142,16 @@
  * [PA, 7/17/98]
  * [PA] is Pascal Andr� <[email protected]>
  */
-#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 56e5de1f36..77518c788e 100644
--- a/src/backend/access/transam/xid.c
+++ b/src/backend/access/transam/xid.c
@@ -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 0e8a751c95..a56e2dfda6 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -13,14 +13,14 @@
  */
 #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 3d4502c81f..776705a027 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -11,16 +11,16 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 995c4ca240..80c889b548 100644
--- a/src/backend/commands/_deadcode/recipe.c
+++ b/src/backend/commands/_deadcode/recipe.c
@@ -11,24 +11,24 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 698804fde6..cab351fa38 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -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 cb0e3ac707..b97fb97c33 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -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 1039a5e562..7d21f432fb 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -20,19 +20,19 @@
  */
 #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 88ddfc836c..715643125a 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -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 b691cdf8ac..5cd39923ed 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -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 c905552ee3..80b9f077d8 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -14,16 +14,16 @@
 #include <stdio.h>
 #include <string.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 "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"
 
 /* ----------------
  *		local stuff
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 55bcffa1e4..76ca6bd2ea 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -37,22 +37,22 @@
 #include <string.h>
 #include <math.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 "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 <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 cdafc18044..9f7b7f99cd 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -10,15 +10,15 @@
 #include <stdio.h>
 #include <string.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 "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"
 
 typedef struct ExplainState
 {
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index a395137c47..481f78bdf1 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -13,22 +13,22 @@
  */
 #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 7db86005f1..eeb4f24751 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -11,19 +11,19 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 f8fbf5f570..4efc85c41a 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 0f27fa9d78..e6f230d36d 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -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 61008087dc..7b5347d405 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -12,17 +12,17 @@
 #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 d8000fc699..d4b2cee3cc 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -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 6ce6b65add..6f257d4f36 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -14,8 +14,8 @@
  *-------------------------------------------------------------------------
  */
 
-#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 cb52df31c8..278ae71195 100644
--- a/src/backend/lib/fstack.c
+++ b/src/backend/lib/fstack.c
@@ -11,9 +11,9 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 6de004677e..04f14e7d07 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -12,10 +12,10 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 7e2b1d28c6..1390491d07 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -13,7 +13,7 @@
 
 #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 f8f98bc4a6..29cc92de80 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -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 5590cb7b2f..0b11bf1cff 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -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 29c4a5e677..92d81262dd 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -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� <[email protected]> */
 
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 5d3bfa817a..7f5b79ccee 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -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 24df4d0090..778bc3a2e1 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -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 73342fc389..70ac23c5cd 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -5,10 +5,10 @@
  *
  */
 
-#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 dc1f3cd463..99a26cf1c4 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -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 c16a483650..b540a5bfc2 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -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 df3f35c8d1..ab8aec278f 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -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 be570b2e0e..9c2eaaeedc 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -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 9225f2c8e5..759014376e 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -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 012fcb3d16..a80c8c1474 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -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 d58e15a324..12d10940d1 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -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 6720ac0ab3..c3882a1cf9 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -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 401b08b1af..3cac00d117 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 30bb46473a..f9f8d3e8d3 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 2cd1066d2b..2c707fedbb 100644
--- a/src/backend/port/dynloader/bsd.h
+++ b/src/backend/port/dynloader/bsd.h
@@ -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 4e12b823c4..0d121cb484 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 2cd1066d2b..2c707fedbb 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -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 d9a28de867..89ec1a5aed 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -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 439ec35cd2..5276243a62 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -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 66cbba9e8c..98cf5c2f78 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 c1978cfebd..2ead59012c 100644
--- a/src/backend/port/dynloader/ultrix4.c
+++ b/src/backend/port/dynloader/ultrix4.c
@@ -14,9 +14,9 @@
  *-------------------------------------------------------------------------
  */
 #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 0a274f076d..b17446a771 100644
--- a/src/backend/port/dynloader/ultrix4.h
+++ b/src/backend/port/dynloader/ultrix4.h
@@ -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 6e83e25d71..6ef1b126f4 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 dfdc128622..1e1c680b25 100644
--- a/src/backend/port/strerror.c
+++ b/src/backend/port/strerror.c
@@ -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 6f143edbe3..99427ab383 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -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 d7dded8f4b..b6c01ef004 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 a2ade47966..93b4733061 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 d53a6b4d8b..ec71296cc4 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 1127bd24f8..f0a019b0f6 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 9dded4351b..b91d0ba232 100644
--- a/src/backend/regex/retest.c
+++ b/src/backend/regex/retest.c
@@ -7,7 +7,7 @@
 #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 7cdd352076..885b6cab99 100644
--- a/src/backend/utils/Gen_fmgrtab.sh.in
+++ b/src/backend/utils/Gen_fmgrtab.sh.in
@@ -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 ad287ddb5c..abd48e7963 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -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 5059959742..1e1a31f364 100644
--- a/src/backend/utils/adt/chunk.c
+++ b/src/backend/utils/adt/chunk.c
@@ -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 3e37395101..234fadbff2 100644
--- a/src/backend/utils/adt/filename.c
+++ b/src/backend/utils/adt/filename.c
@@ -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 bb619001dd..5b18c24755 100644
--- a/src/backend/utils/adt/inet_net_ntop.c
+++ b/src/backend/utils/adt/inet_net_ntop.c
@@ -30,8 +30,8 @@ static const char rcsid[] = "$Id$";
 #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 d061a4b9a0..0114690252 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -32,8 +32,8 @@ static const char rcsid[] = "$Id$";
 #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 b668dd3eed..6ba837e6ab 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -7,8 +7,8 @@
 #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 6a224d6201..f55484920b 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -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 315c1c142d..c7ac726bf6 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -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 eb3d2ec237..ab1499f08b 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -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 0fcdebaf3c..9b1ea79bd5 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -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 e5d4202627..67ce82795c 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -39,15 +39,15 @@
  * Modified by [email protected] 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 39bd697a6e..865b93eff3 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -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 dde9622f20..28d880a48a 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -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 6bef9dd0b3..0d592e8ebe 100644
--- a/src/backend/utils/mb/utftest.c
+++ b/src/backend/utils/mb/utftest.c
@@ -2,11 +2,11 @@
  * testing of utf2wchar()
  * $Id$
  */
-#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 3efdcc6f39..4b6a16b7d1 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 c7ccf1b4cb..050a46191b 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 dc0c9bbd89..fde2a3428b 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -15,9 +15,9 @@
  *-------------------------------------------------------------------------
  */
 
-#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 a0f3a30795..bc3f880d60 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -13,10 +13,10 @@
 #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 b1c31b2c66..dd0aa92e40 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 d86036e9e1..ef55ab3951 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 77fc90b162..c2fc30edf4 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 97a128903f..7f5ed86366 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -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 483e7b36b8..9d6b27db00 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -13,7 +13,7 @@
 #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 3a8feed054..13cbdc34b5 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -13,7 +13,7 @@
 #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 43b7a1e328..d441859273 100644
--- a/src/include/access/ibit.h
+++ b/src/include/access/ibit.h
@@ -13,7 +13,7 @@
 #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 632e455dd1..fa7aed7cd1 100644
--- a/src/include/access/iqual.h
+++ b/src/include/access/iqual.h
@@ -13,8 +13,8 @@
 #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 2e9bbd4f95..2e2293f9c3 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -13,7 +13,7 @@
 #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 f6c081df75..d29a510f7f 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -13,10 +13,10 @@
 #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 15e7f58fe1..85d49fe2da 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -13,10 +13,10 @@
 #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 3177541d9a..64299c1e6f 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -13,7 +13,7 @@
 #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 f2423f8be7..5c080c66e7 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -13,7 +13,7 @@
 #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 c02b336da8..1ab5a394c0 100644
--- a/src/include/access/rtree.h
+++ b/src/include/access/rtree.h
@@ -13,10 +13,10 @@
 #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 bc857bf6fa..1ac0131d29 100644
--- a/src/include/access/rtscan.h
+++ b/src/include/access/rtscan.h
@@ -13,9 +13,9 @@
 #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 0823184056..e659f2aa3d 100644
--- a/src/include/access/rtstrat.h
+++ b/src/include/access/rtstrat.h
@@ -13,7 +13,7 @@
 #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 a47ea5666f..6121ae29d4 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -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 61c558f7d4..3965640cbd 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -14,7 +14,7 @@
 #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 a88297e2c6..53d362f386 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -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 3feb513f6c..2ca7df0492 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -13,9 +13,9 @@
 #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 f72b2a8265..27f71bfbc6 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -13,8 +13,8 @@
 #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 7e377c7653..79916dfffb 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -13,9 +13,9 @@
 #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 b9ef67b7f0..8372e90437 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -13,7 +13,7 @@
 #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 30a5fa5b97..df892f55a4 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -13,7 +13,7 @@
 #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 e8d08d4140..0868d3c522 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -13,8 +13,8 @@
 #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 00223fbed6..72e3c51fa4 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -14,7 +14,7 @@
 #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 a1e3b00f13..ffad1636e8 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -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 ee7592b38a..56ad4ed2af 100644
--- a/src/include/commands/command.h
+++ b/src/include/commands/command.h
@@ -13,7 +13,7 @@
 #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 2ae412c63d..fc19bd47d6 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -13,8 +13,8 @@
 #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 f39a6498fb..42276055e6 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 eb2fe1f00e..03a46d99d2 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -13,7 +13,7 @@
 #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 9d7569db11..2f4ebcb53d 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -14,9 +14,9 @@
 #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 dc76149aae..79928559c0 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -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 b66320fa7a..01a5d641be 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -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 60e8f2fa72..3bf5b20b36 100644
--- a/src/include/lib/hasht.h
+++ b/src/include/lib/hasht.h
@@ -14,7 +14,7 @@
 #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 d6023332be..7827b46408 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 e55db2a4e8..59c7dd1ff7 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -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 4bb8739017..67b92d15cb 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -13,13 +13,13 @@
 #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 faa2bae7b2..fc8d7308f1 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -13,7 +13,7 @@
 #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 ad996f64c0..1541a3dd7a 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -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 f48e65f1b7..c4a9657459 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -13,7 +13,7 @@
 #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 56047e86c7..ff8046487c 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -13,7 +13,7 @@
 #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 fcc761cf2c..a0fad8f212 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -13,7 +13,7 @@
 #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 ef8765b8d1..696a2b3fcd 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -13,7 +13,7 @@
 #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 70a612d26b..553771a226 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -13,7 +13,7 @@
 #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 3112c71a37..c53896c2df 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -13,9 +13,9 @@
 #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 3a1363cafa..8d0d2a2f33 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -13,7 +13,7 @@
 #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 7e973696e4..aea99ff5a3 100644
--- a/src/include/optimizer/_deadcode/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -13,8 +13,8 @@
 #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 a7390237dd..7880beee70 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -13,7 +13,7 @@
 #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 290ab24a23..3d70c18126 100644
--- a/src/include/optimizer/ordering.h
+++ b/src/include/optimizer/ordering.h
@@ -13,7 +13,7 @@
 #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 0ce97a6926..700c4c6c4d 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -13,7 +13,7 @@
 #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 9dce4c5448..58b0d4d072 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -13,8 +13,8 @@
 #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 9a97faf7ad..b305950d20 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -12,7 +12,7 @@
 #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 cee0635b7d..7f7efe4c67 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -13,7 +13,7 @@
 #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 3ec7c3f2c7..969955cba3 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -13,7 +13,7 @@
 #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 878e3cb25c..c7033bf556 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -13,7 +13,7 @@
 #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 a0b94e9c45..9b934966c1 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -13,7 +13,7 @@
 #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 e072794241..f9e6fcc05f 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -12,8 +12,8 @@
 #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 60b88fd3df..985f329e9c 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -13,7 +13,7 @@
 #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 415af90ef5..14b6dde37f 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -13,7 +13,7 @@
 #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 e05bf88056..eb3286b984 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -13,7 +13,7 @@
 #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 d0b43d5716..40451da12b 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 ef47720e8e..722cbd94e6 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 a460c825c6..67646898d5 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 55c11733ea..b0b86f3cb6 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 6c23bc4ad8..493082a181 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -12,8 +12,8 @@
 #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 c309690464..0bd91c887f 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -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 ad1a1ef1b9..6adab4e6a9 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -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 d05479d825..4fc810c406 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -13,12 +13,12 @@
 #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 9109ff4ed4..e2371fe8a2 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -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 55effe49de..b6b41a60a9 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -13,8 +13,8 @@
 #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 f22316b3ed..c2c661343b 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -13,8 +13,8 @@
 #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 0fffbdce9c..670cc6a3d2 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -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 e135d4ebb3..679916538d 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -13,8 +13,8 @@
 #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 741ec2857e..eecfde3ae4 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -13,10 +13,10 @@
 #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 8da2ecedf7..f1a628623e 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -14,7 +14,7 @@
 #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 421ac9b790..59a3ca571a 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -13,7 +13,7 @@
 #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 daea02e941..7242479c1f 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -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 935bfe8a9d..4bf9b5b580 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -13,8 +13,8 @@
 #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 7e7038aea4..f5d38f8ad3 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -13,8 +13,8 @@
 #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 381aa29c1f..170232e845 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -13,8 +13,8 @@
 #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 249f8f4c59..b46b1695c1 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -13,9 +13,9 @@
 #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 9cc9876cc7..af96963113 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -13,7 +13,7 @@
 #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 830fb6042d..2e74d4bfd6 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -51,7 +51,7 @@
 #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 66d45ea688..9f20a83a17 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -13,7 +13,7 @@
 #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 d5d60e7080..78a39a7787 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -13,7 +13,7 @@
 #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 40191186b8..6ebaa7cee1 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -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 1afc40ace1..2aaf04260c 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.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 e8ae590ae2..d110f41022 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -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 f5cdf67b8f..9af97541c6 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -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 753ed316bd..78217ba903 100644
--- a/src/include/utils/fcache.h
+++ b/src/include/utils/fcache.h
@@ -13,7 +13,7 @@
 #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 9e78964ac3..4d669a599b 100644
--- a/src/include/utils/fcache2.h
+++ b/src/include/utils/fcache2.h
@@ -13,7 +13,7 @@
 #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 f925a91d30..587feb5f5c 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -13,7 +13,7 @@
 #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 423198aa25..22d31f636d 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -13,7 +13,7 @@
 #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 66b04ad687..1d7812f7d5 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -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 4564d0c29f..2539d3c2d1 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -13,12 +13,12 @@
 #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 ee979acba8..3110ea305d 100644
--- a/src/include/utils/rel2.h
+++ b/src/include/utils/rel2.h
@@ -13,7 +13,7 @@
 #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 6e753ee599..42e7789f29 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -13,7 +13,7 @@
 #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 e7c9bde122..b4425faadf 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -13,7 +13,7 @@
 #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 38cc5bde8b..9a32f8f205 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -14,8 +14,8 @@
 #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
 {