diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index b8d0342085d6fc539a4f09f5de1f373bfd4aca47..76617e3f367b279f6d8e4d80017abc74fe913768 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -63,6 +63,7 @@
#include "utils/hsearch.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 466c015107db28b46601b759ad4542d6589a597c..f2d7f3a6a88f47b63aa20051d693f17e6b0dd05f 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -24,6 +24,7 @@
#include "foreign/foreign.h"
#include "miscadmin.h"
#include "optimizer/cost.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/lo/lo.c b/contrib/lo/lo.c
index 0e3559c0201e76f03b164add15d3cb324eca4d7f..6946150fed5d597a54aab7efeed09e68e211bcdb 100644
--- a/contrib/lo/lo.c
+++ b/contrib/lo/lo.c
@@ -7,15 +7,12 @@
#include "postgres.h"
-/* Required for SPI */
+#include "commands/trigger.h"
#include "executor/spi.h"
-
-/* Required for largeobjects */
#include "libpq/be-fsstubs.h"
#include "libpq/libpq-fs.h"
+#include "utils/rel.h"
-/* Required for triggers */
-#include "commands/trigger.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index ef27cd4080caba0bfc47d317d8204e995cfdada8..514406a67a8f42a0875cb42cd85e584a77e73264 100644
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -35,6 +35,7 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
extern Datum bt_metap(PG_FUNCTION_ARGS);
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index 2607576c378d3f6bbcab7c20abe8e258ffa3108c..8fc3a48d5621d8dcbd35fd8898469d5bafeaa535 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -25,6 +25,7 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index 302bb5c39c97742ac4e78f90a2b1312643c98b54..4a49ee342fe2e248d95262aa8eea3f6039d17765 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -35,6 +35,7 @@
#include "storage/procarray.h"
#include "utils/acl.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
#include "utils/tqual.h"
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index fd2cc9246bcc57ac588c0c1646fa22cd315cc42b..f0d6341bd16145847a32f6c0a024086ff39a3f07 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -34,6 +34,7 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
extern Datum pgstatindex(PG_FUNCTION_ARGS);
diff --git a/contrib/spi/autoinc.c b/contrib/spi/autoinc.c
index 9b38493a3323f672d2d20bb95b97f848a7afa76b..54bbc4345c8e756e1bceabb56ee322d3df96a8b3 100644
--- a/contrib/spi/autoinc.c
+++ b/contrib/spi/autoinc.c
@@ -8,6 +8,7 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/spi/insert_username.c b/contrib/spi/insert_username.c
index 18a13344cf175bbdaac8bb5c35391eb4f7beb44d..3bc51c7f02095e07348670bc496dfe7c611718d3 100644
--- a/contrib/spi/insert_username.c
+++ b/contrib/spi/insert_username.c
@@ -13,6 +13,7 @@
#include "executor/spi.h"
#include "miscadmin.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c
index d02560c2981d43b575dc6cbddd35f5dc63b1d952..d0bc4078f9eb57e6fefae47f796d20e2fc2e0868 100644
--- a/contrib/spi/moddatetime.c
+++ b/contrib/spi/moddatetime.c
@@ -18,6 +18,7 @@ OH, me, I'm Terry Mackintosh <terry@terrym.com>
#include "catalog/pg_type.h"
#include "executor/spi.h"
#include "commands/trigger.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 36f9ee421e7ad617a84319f9f5a552570dce0e0e..ed7e00782b33254f31c815e3e1135bd6e50567c2 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -12,6 +12,7 @@
#include "commands/trigger.h"
#include "executor/spi.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index 3d05cc505cee5c312c0744b99da00144db34febe..69ec6278685b842d359ad7bffccc175bbf7650c0 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -17,6 +17,7 @@
#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/nabstime.h"
+#include "utils/rel.h"
PG_MODULE_MAGIC;
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 82419e37acb278eea849e5fcf12b2e0c90abc0bf..60a6d80a18961c24ee3b8da0ef0060b730517948 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -24,6 +24,7 @@
#include "miscadmin.h"
#include "storage/bufmgr.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#define GIN_PAGE_FREESIZE \
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 3e32af94a96d34369487f014df68559a08c299d0..bea5f681fda376ec5f268205ab8d9ebee0938521 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -21,6 +21,7 @@
#include "storage/smgr.h"
#include "storage/indexfsm.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
typedef struct
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index cdb0343d104cfec50b751edb83dae2239d89687a..b756f6e0e306beca241a1ee8c484e0220e5e9d55 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -22,6 +22,7 @@
#include "storage/bufmgr.h"
#include "storage/indexfsm.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
/* Working state for gistbuild and its callback */
typedef struct
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 1aba68684470d72c8490fa0b82acfd9b6e4840b6..5d5fd5b738e58c8b454ae69b05f52f4139bb65a4 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -22,6 +22,7 @@
#include "storage/bufmgr.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
/*
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 4cb29b2bb45159991551d7fc14671dacf6bacfcc..bfb10897d20e6a260cdb5807d9b7f1d68faa547b 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -25,6 +25,7 @@
#include "optimizer/cost.h"
#include "optimizer/plancat.h"
#include "storage/bufmgr.h"
+#include "utils/rel.h"
/* Working state for hashbuild and its callback */
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 6283f4a82b59c73bafccf2d83937aeff92ef3246..aa68be596ea5c59d60de7efd300dfa7250754521 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -20,6 +20,7 @@
#include "executor/execdebug.h"
#include "storage/bufmgr.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
/*
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index f87eadcdec2dbd3c9ca95859ef5f4cb899e5bb28..3996203a7ef83523980b72c68929b015a768b705 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -27,6 +27,7 @@
#include "storage/lwlock.h"
#include "storage/shmem.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
static bool _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index fc093ccc4b9aa339f0fa093e1d6d24cb40ff2699..08ae863f549373b8b8a19da28383443a8352b670 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -43,6 +43,7 @@
#include "utils/fmgroids.h"
#include "utils/memutils.h"
#include "utils/ps_status.h"
+#include "utils/rel.h"
#include "utils/relmapper.h"
#include "utils/tqual.h"
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 6b8eb53dd1b6e5ba4d3a8978411db8b9fe807a09..a8c27006a7581bc51061f7a4d4fe2e416c12444b 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -70,7 +70,7 @@
#include "utils/fmgroids.h"
#include "utils/inval.h"
#include "utils/lsyscache.h"
-#include "utils/relcache.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index 21f5cce69c8c88c33e5fb92fed6c7de7b7b6693c..351e6f63ac62e337b9c01442ea17962f54c432d1 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -19,6 +19,7 @@
#include "catalog/index.h"
#include "catalog/indexing.h"
#include "executor/executor.h"
+#include "utils/rel.h"
/*
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 92be0a76dae1bba73e87e88374ced03fec0dec27..ec229810cac63db9fb579b1f31ad679828c4b180 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -35,6 +35,7 @@
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index b059f9d784bd42e574eeb39228440a5292d84bdb..ce082fd2c25e486d821c23828c30029715310101 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -29,6 +29,7 @@
#include "miscadmin.h"
#include "nodes/makefuncs.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
/* Potentially set by contrib/pg_upgrade_support functions */
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 215e21cae0826b870fce4856e7ed366f03c82a2b..2373d52c0f2024b71e8fedb7d75a4f27326b9060 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -38,6 +38,7 @@
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index e8a19a9f03bc6ac7aa72f0dcf6d6907f77f6ed4a..b76cdeeb639b1c8ca29d211e22a37297322d3aca 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -17,6 +17,7 @@
#include "commands/trigger.h"
#include "executor/executor.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
#include "utils/tqual.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 57429035e895e5b74f158e005b726ea3d40915ce..528a3a1f5397f43ae0cc75e9643c7253160bda93 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -42,6 +42,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index a770daf88d9baa4b5306163a4be55d52f34289cd..fee829f9606fce4b619e7f198607cbb8fbdf4d85 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -32,8 +32,9 @@
#include "utils/builtins.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
-#include "utils/tuplesort.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
+#include "utils/tuplesort.h"
#include "utils/xml.h"
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index 08fb3d5d360f00bc0bb919454efc6adfca11ebbd..a0385eb0a1888de9a26e764a17c237c22fc2607e 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -51,6 +51,7 @@
#include "utils/fmgroids.h"
#include "utils/guc.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/tqual.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 82bbf8fa506f5b4b95a8ed0c5ed5aefcd77b4fed..5dd5763a7bca89a97d14336896f7c29ebc6877d7 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -29,6 +29,7 @@
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 798d8a85a4f8a1ee2fc551dae833054b2a6b4c72..8072c7768797deadd6098a3a4b8cb8eba52f4a6e 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -51,6 +51,7 @@
#include "utils/inval.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 2a2ff5387e51ef1106d7ac309330a20def3e60e0..7c27f85cdc66a545ed137360ec2eccb72099394c 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -63,6 +63,7 @@
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 01775ce4494c1781bb630dcaeefa722af49b6a1a..ffdcc966ee60a3b0edbf5ea26241e0f47d903663 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -48,6 +48,7 @@
#include "executor/nodeWindowAgg.h"
#include "executor/nodeWorktablescan.h"
#include "nodes/nodeFuncs.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index 5312d9aeec0a32196b1f559d0780881d543fc7bc..61a5f471124795d8cbaee07d024efa5c7bc9dda4 100644
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -18,6 +18,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/portal.h"
+#include "utils/rel.h"
static char *fetch_cursor_param_value(ExprContext *econtext, int paramId);
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 568035a481beafae49dabafa1f79d7b5d2192d31..c9b540e0798f37e698e71d4dffee011dd11fae8b 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -44,6 +44,7 @@
#include "storage/bufmgr.h"
#include "storage/predicate.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/tqual.h"
diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c
index d50489c7f4c595d8298a67e97f33932891a75cbd..841ae6931b79eccd7d920601a9f40b9803146a70 100644
--- a/src/backend/executor/nodeForeignscan.c
+++ b/src/backend/executor/nodeForeignscan.c
@@ -25,6 +25,7 @@
#include "executor/executor.h"
#include "executor/nodeForeignscan.h"
#include "foreign/fdwapi.h"
+#include "utils/rel.h"
static TupleTableSlot *ForeignNext(ForeignScanState *node);
static bool ForeignRecheck(ForeignScanState *node, TupleTableSlot *slot);
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index dbc1467d5be26367218ff0592a36839b9fb9658a..263f3b946ba17367392aa045a11a6a0876a49b5b 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -33,6 +33,7 @@
#include "utils/array.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
static TupleTableSlot *IndexNext(IndexScanState *node);
diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c
index d71278ebd729f682f6b1220cd0f43a2334c66635..0c48b6bcacf98bbc780563e9366f6ea1c4da45fc 100644
--- a/src/backend/executor/nodeLockRows.c
+++ b/src/backend/executor/nodeLockRows.c
@@ -25,6 +25,7 @@
#include "executor/executor.h"
#include "executor/nodeLockRows.h"
#include "storage/bufmgr.h"
+#include "utils/rel.h"
#include "utils/tqual.h"
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 43059664b9348ae462dcb6b1166124f4f0fde2ee..fa0ecc817698e9091ad66e7398cd4af28501e1fb 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -42,6 +42,7 @@
#include "executor/execdebug.h"
#include "executor/nodeMergeAppend.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
/*
* It gets quite confusing having a heap array (indexed by integers) which
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index c0eab4bf0db894dce689bfcabbde4d7e281b7714..070f27c66c96a4a9074e934782fa629571af8289 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -46,6 +46,7 @@
#include "storage/bufmgr.h"
#include "utils/builtins.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/tqual.h"
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 0f3438d0639d8c454f5b83851281817e2629a08d..e2cea0eecb22aec7b490f0618608123d3d17a340 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -28,6 +28,7 @@
#include "access/relscan.h"
#include "executor/execdebug.h"
#include "executor/nodeSeqscan.h"
+#include "utils/rel.h"
static void InitScanRelation(SeqScanState *node, EState *estate);
static TupleTableSlot *SeqNext(SeqScanState *node);
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index aae41bf60e373efce37cb29be9e1deeaa4a7a982..28244a1a3d072a4c9035593277ed648fdb6000a6 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -32,6 +32,7 @@
#include "optimizer/clauses.h"
#include "storage/bufmgr.h"
#include "utils/array.h"
+#include "utils/rel.h"
#define IsCTIDVar(node) \
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 6e723ca092b323bfca4d8415bc24acc4b5a16b7d..d71ea60b317f9180481fcf875d9c7f411a03f807 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -28,6 +28,7 @@
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 9aafc8adcc6bd5884925c6280c1b9d19904ea58e..b31e3869d31a4b783818e31a7a072ab80991b278 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -41,6 +41,7 @@
#include "parser/parse_oper.h"
#include "parser/parsetree.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index a7e83729b1b1bd161fab50b00847cd883ca33676..6c3dfb7eb580b04e965b7310a7ee47c2ae98f720 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -15,6 +15,7 @@
*/
#include "postgres.h"
+#include "catalog/pg_am.h"
#include "catalog/pg_amop.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index edfb1f12e978e4bbb9cefc31f77dfd16c55db96d..f2ccf0d7453d3a57c77da02458a861711e78e117 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -29,6 +29,7 @@
#include "parser/parse_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index e6f9e36bbcadfc1a79eca45bfb30627d0e321ba7..9d4e580e47699219973ba0c6613c23749577ffcc 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -29,6 +29,7 @@
#include "parser/parse_type.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/typcache.h"
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 1771fee6478d6ce2f1d3dcbfb712d25c169f70e3..b64f837bf867abfaccd61b6ae08321e73241b57f 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -59,7 +59,7 @@
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/relcache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index ca4e03590df25303fcb37ecf3689f7316400023a..483a82951b0d577a25d3984c804c4ae5008d6933 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -93,6 +93,7 @@
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/ps_status.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 6ef20a5bb537c716602eb0cd03bf5cc187b5027a..84b5037bb3c2341a61c8df0e479deb5a38ca47ea 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -16,6 +16,7 @@
#include "access/heapam.h"
#include "access/sysattr.h"
#include "catalog/pg_type.h"
+#include "commands/trigger.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "parser/analyze.h"
@@ -26,7 +27,7 @@
#include "rewrite/rewriteManip.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "commands/trigger.h"
+#include "utils/rel.h"
/* We use a list of these to detect recursion in RewriteQuery */
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index fa7b8e6e81a6dea5e580ac503e13c88f0f6c78bd..4b85b9b4021e64ef383d3d7e1ff34ca100922a8b 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -48,6 +48,7 @@
#include "utils/guc.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/syscache.h"
#include "utils/tqual.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 00920f9edaa306640e49779d9fe10521a59250a9..49dc9c88d527f85d0a30b2219120f33865589207 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -52,8 +52,9 @@
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
-#include "utils/tqual.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
+#include "utils/tqual.h"
#include "utils/typcache.h"
#include "utils/xml.h"
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 00ba19ec6c9d88e6d65bebb8941154c6394224d5..10b73fb9fb4cfb30f422e33989177c4b14ad33e6 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -120,6 +120,7 @@
#include "utils/lsyscache.h"
#include "utils/nabstime.h"
#include "utils/pg_locale.h"
+#include "utils/rel.h"
#include "utils/selfuncs.h"
#include "utils/spccache.h"
#include "utils/syscache.h"
diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c
index 86f81bb5bec4906185033e3da59b38e4bad146cd..474878de7d921ec6ae10b02a99b2e4d01c69b369 100644
--- a/src/backend/utils/adt/trigfuncs.c
+++ b/src/backend/utils/adt/trigfuncs.c
@@ -16,6 +16,7 @@
#include "access/htup.h"
#include "commands/trigger.h"
#include "utils/builtins.h"
+#include "utils/rel.h"
/*
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 66674917f0dd6a721d7c2750b75dadb4a6fad709..181bfee9e308653bd423a07ea7df6de6c70d93db 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -25,6 +25,7 @@
#include "tsearch/ts_utils.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
typedef struct
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 702b9e3e9f489276e660f4677ceed37979365567..de1eb2af3698824c74b996568da9143fc5b16b21 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -74,6 +74,7 @@
#include "utils/datetime.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/xml.h"
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 28d18b0d32d9567a1e45313f79d49eb1431b0aaf..69ec51363416719e66429ccd89f03c85f0f123ad 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -35,6 +35,7 @@
#include "utils/datum.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index aa249fabfe83bb43f3881b507f11825257fd1ffd..02ee92b7159aa543032d558f79099d8f42907c78 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -24,6 +24,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 16756616e5215503ba4e26889fce2b4d144d24de..a3a931005585378001db56c76d4e50e5d406f5a5 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -21,7 +21,7 @@
#include "nodes/plannodes.h"
#include "nodes/tidbitmap.h"
#include "utils/hsearch.h"
-#include "utils/rel.h"
+#include "utils/reltrigger.h"
#include "utils/snapshot.h"
#include "utils/tuplestore.h"
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index e2c2fa9ae4560a596690b87f514e2cd211de79ae..173dc16a2531358f8bd10dab851519f7546888c8 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -24,6 +24,7 @@
#include "storage/block.h"
#include "storage/relfilenode.h"
#include "utils/relcache.h"
+#include "utils/reltrigger.h"
/*
@@ -44,60 +45,6 @@ typedef struct LockInfoData
typedef LockInfoData *LockInfo;
-/*
- * Likewise, this struct really belongs to trigger.h, but for convenience
- * we put it here.
- */
-typedef struct Trigger
-{
- Oid tgoid; /* OID of trigger (pg_trigger row) */
- /* Remaining fields are copied from pg_trigger, see pg_trigger.h */
- char *tgname;
- Oid tgfoid;
- int16 tgtype;
- char tgenabled;
- bool tgisinternal;
- Oid tgconstrrelid;
- Oid tgconstrindid;
- Oid tgconstraint;
- bool tgdeferrable;
- bool tginitdeferred;
- int16 tgnargs;
- int16 tgnattr;
- int16 *tgattr;
- char **tgargs;
- char *tgqual;
-} Trigger;
-
-typedef struct TriggerDesc
-{
- Trigger *triggers; /* array of Trigger structs */
- int numtriggers; /* number of array entries */
-
- /*
- * These flags indicate whether the array contains at least one of each
- * type of trigger. We use these to skip searching the array if not.
- */
- bool trig_insert_before_row;
- bool trig_insert_after_row;
- bool trig_insert_instead_row;
- bool trig_insert_before_statement;
- bool trig_insert_after_statement;
- bool trig_update_before_row;
- bool trig_update_after_row;
- bool trig_update_instead_row;
- bool trig_update_before_statement;
- bool trig_update_after_statement;
- bool trig_delete_before_row;
- bool trig_delete_after_row;
- bool trig_delete_instead_row;
- bool trig_delete_before_statement;
- bool trig_delete_after_statement;
- /* there are no row-level truncate triggers */
- bool trig_truncate_before_statement;
- bool trig_truncate_after_statement;
-} TriggerDesc;
-
/*
* Cached lookup information for the index access method functions defined
diff --git a/src/include/utils/reltrigger.h b/src/include/utils/reltrigger.h
new file mode 100644
index 0000000000000000000000000000000000000000..eaf5abd447e36c8665cc922d44be1a4cad5d69be
--- /dev/null
+++ b/src/include/utils/reltrigger.h
@@ -0,0 +1,74 @@
+/*-------------------------------------------------------------------------
+ *
+ * reltrigger.h
+ * POSTGRES relation trigger definitions.
+ *
+ *
+ * Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/utils/reltrigger.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef RELTRIGGER_H
+#define RELTRIGGER_H
+
+
+/*
+ * These struct really belongs to trigger.h, but we put it separately so that
+ * it can be cleanly included in rel.h and other places.
+ */
+
+typedef struct Trigger
+{
+ Oid tgoid; /* OID of trigger (pg_trigger row) */
+ /* Remaining fields are copied from pg_trigger, see pg_trigger.h */
+ char *tgname;
+ Oid tgfoid;
+ int16 tgtype;
+ char tgenabled;
+ bool tgisinternal;
+ Oid tgconstrrelid;
+ Oid tgconstrindid;
+ Oid tgconstraint;
+ bool tgdeferrable;
+ bool tginitdeferred;
+ int16 tgnargs;
+ int16 tgnattr;
+ int16 *tgattr;
+ char **tgargs;
+ char *tgqual;
+} Trigger;
+
+typedef struct TriggerDesc
+{
+ Trigger *triggers; /* array of Trigger structs */
+ int numtriggers; /* number of array entries */
+
+ /*
+ * These flags indicate whether the array contains at least one of each
+ * type of trigger. We use these to skip searching the array if not.
+ */
+ bool trig_insert_before_row;
+ bool trig_insert_after_row;
+ bool trig_insert_instead_row;
+ bool trig_insert_before_statement;
+ bool trig_insert_after_statement;
+ bool trig_update_before_row;
+ bool trig_update_after_row;
+ bool trig_update_instead_row;
+ bool trig_update_before_statement;
+ bool trig_update_after_statement;
+ bool trig_delete_before_row;
+ bool trig_delete_after_row;
+ bool trig_delete_instead_row;
+ bool trig_delete_before_statement;
+ bool trig_delete_after_statement;
+ /* there are no row-level truncate triggers */
+ bool trig_truncate_before_statement;
+ bool trig_truncate_after_statement;
+} TriggerDesc;
+
+
+#endif /* RELTRIGGER_H */
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 61252308cd871bd49823ec8621fcfdd1f15ef0ae..8fd4cfb550bb5fe9b4d762b68f81e23aac48d51b 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -34,6 +34,7 @@
#include "utils/hsearch.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 75098ec6deb21a70dc49c13544e95c3b99a4ded4..afd20b4872d8724350a291fe21991fd0a409383a 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -32,6 +32,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 906a485853f1232c181a2fdabb3a25b3dbe04c36..7f948d5f80866e512c27c4b726d4d753a283e259 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -33,6 +33,7 @@
#include "utils/datum.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/snapmgr.h"
#include "utils/typcache.h"
diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 9081cffb498bedfc411afecab374441c8a58bda6..0227f1a18299bc84b4dac6d1d5bb1aad81b00f17 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -108,6 +108,7 @@ typedef int Py_ssize_t;
#include "utils/hsearch.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index f5171444987b65af2c2f70fe81a9f51e32c4da58..be8fe7a0f21960fb5e91406537548d5fb0e1e158 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -31,6 +31,7 @@
#include "utils/builtins.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#include "utils/rel.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index 8e4286a643b2331ed98068a6f0d052ebdacb2dc2..daee5af49e4beb4a07c312b9eca4f7d197887a84 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -16,6 +16,7 @@
#include "executor/spi.h"
#include "utils/builtins.h"
#include "utils/geo_decls.h"
+#include "utils/rel.h"
#define P_MAXDIG 12