diff --git a/contrib/dummy_seclabel/dummy_seclabel.c b/contrib/dummy_seclabel/dummy_seclabel.c
index 5deb43fa9b819299f21635544920ea7ca6f39580..2979fecd06a9ca16640f2c8b4261d970ed00557b 100644
--- a/contrib/dummy_seclabel/dummy_seclabel.c
+++ b/contrib/dummy_seclabel/dummy_seclabel.c
@@ -14,6 +14,7 @@
 
 #include "commands/seclabel.h"
 #include "miscadmin.h"
+#include "utils/rel.h"
 
 PG_MODULE_MAGIC;
 
diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index 5b92a4c0c2816d29d6e3379e6422b20a29b8743d..28a016b97260339d266243020eeb2680a81b2ecd 100644
--- a/src/backend/catalog/pg_collation.c
+++ b/src/backend/catalog/pg_collation.c
@@ -26,6 +26,7 @@
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/rel.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
 
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 7f8a108374ec8a307607aa1b20b2240c821b7868..9e6138b92a6c6d118901141654f7533f463fac4d 100644
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -31,6 +31,7 @@
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/pg_locale.h"
+#include "utils/rel.h"
 #include "utils/syscache.h"
 
 static void AlterCollationOwner_internal(Relation rel, Oid collationOid,
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index de4d5ded683197e9ab975d7b918e1cb4faa394cd..200b6a22ccf8bdb0308ba2c6a92be1f70c8d7ed6 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -25,6 +25,7 @@
 #include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/rel.h"
 #include "utils/tqual.h"
 
 
diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 51a5567a014a3f9d8f5ba45c3ac70b23252ffc1c..6e7e9c2976164c1986c5eabf60e18cdfcea9ceb5 100644
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -23,6 +23,7 @@
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
+#include "utils/rel.h"
 #include "utils/tqual.h"
 
 typedef struct
diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h
index 300b81d1f6913c011040d2767e5ecfcf2731c031..2da6309054b1fdfe9b1260e1906a23d7c6f9ab74 100644
--- a/src/include/catalog/objectaddress.h
+++ b/src/include/catalog/objectaddress.h
@@ -15,7 +15,7 @@
 
 #include "nodes/parsenodes.h"
 #include "storage/lock.h"
-#include "utils/rel.h"
+#include "utils/relcache.h"
 
 /*
  * An ObjectAddress represents a database object of any type.