diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 5a2aa1dd0e..778e8bad41 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -9,6 +9,8 @@
  */
 #include "postgres_fe.h"
 
+#include "catalog/pg_class.h"
+
 #include "libpq-fe.h"
 #include "pg_getopt.h"
 
@@ -433,11 +435,12 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts)
 
 	snprintf(todo, sizeof(todo),
 			 "SELECT pg_catalog.pg_relation_filenode(c.oid) as \"Filenode\", relname as \"Table Name\" %s "
-			 "FROM pg_class c "
+			 "FROM pg_catalog.pg_class c "
 		   "	LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
 			 "	LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),"
 			 "	pg_catalog.pg_tablespace t "
-			 "WHERE relkind IN ('r', 'm'%s%s) AND "
+			 "WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ","
+			 CppAsString2(RELKIND_MATVIEW) "%s%s) AND "
 			 "	%s"
 			 "		t.oid = CASE"
 			 "			WHEN reltablespace <> 0 THEN reltablespace"
@@ -445,8 +448,8 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts)
 			 "		END "
 			 "ORDER BY relname",
 			 opts->extended ? addfields : "",
-			 opts->indexes ? ", 'i', 'S'" : "",
-			 opts->systables ? ", 't'" : "",
+			 opts->indexes ? "," CppAsString2(RELKIND_INDEX) "," CppAsString2(RELKIND_SEQUENCE) : "",
+			 opts->systables ? "," CppAsString2(RELKIND_TOASTVALUE) : "",
 			 opts->systables ? "" : "n.nspname NOT IN ('pg_catalog', 'information_schema') AND n.nspname !~ '^pg_toast' AND");
 
 	sql_exec(conn, todo, opts->quiet);
@@ -507,7 +510,11 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
 		"	LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace \n"
 					"	LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),\n"
 					"	pg_catalog.pg_tablespace t \n"
-					"WHERE relkind IN ('r', 'm', 'i', 'S', 't') AND \n"
+					"WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ","
+					CppAsString2(RELKIND_MATVIEW) ","
+					CppAsString2(RELKIND_INDEX) ","
+					CppAsString2(RELKIND_SEQUENCE) ","
+					CppAsString2(RELKIND_TOASTVALUE) ") AND \n"
 					"		t.oid = CASE\n"
 			"			WHEN reltablespace <> 0 THEN reltablespace\n"
 					"			ELSE dattablespace\n"
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 5d270b948a..990313a597 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -16,6 +16,7 @@
 
 #include "access/htup_details.h"
 #include "access/sysattr.h"
+#include "catalog/pg_class.h"
 #include "commands/defrem.h"
 #include "commands/explain.h"
 #include "commands/vacuum.h"
@@ -3885,7 +3886,11 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
 								   "    adrelid = c.oid AND adnum = attnum ");
 
 		appendStringInfoString(&buf,
-							   "WHERE c.relkind IN ('r', 'v', 'f', 'm') "
+							   "WHERE c.relkind IN ("
+							   CppAsString2(RELKIND_RELATION) ","
+							   CppAsString2(RELKIND_VIEW) ","
+							   CppAsString2(RELKIND_FOREIGN_TABLE) ","
+							   CppAsString2(RELKIND_MATVIEW) ") "
 							   "  AND n.nspname = ");
 		deparseStringLiteral(&buf, stmt->remote_schema);
 
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 06f469067b..887483cf0f 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -21,6 +21,8 @@
 #include <termios.h>
 #endif
 
+#include "catalog/pg_class.h"
+
 #include "libpq-fe.h"
 #include "pg_getopt.h"
 
@@ -209,7 +211,7 @@ vacuumlo(const char *database, const struct _param * param)
 	strcat(buf, "      AND a.atttypid = t.oid ");
 	strcat(buf, "      AND c.relnamespace = s.oid ");
 	strcat(buf, "      AND t.typname in ('oid', 'lo') ");
-	strcat(buf, "      AND c.relkind in ('r', 'm')");
+	strcat(buf, "      AND c.relkind in (" CppAsString2(RELKIND_RELATION) ", " CppAsString2(RELKIND_MATVIEW) ")");
 	strcat(buf, "      AND s.nspname !~ '^pg_'");
 	res = PQexec(conn, buf);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 04aeb7178e..f81cf489d2 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -69,6 +69,7 @@
 
 #include "access/htup_details.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "executor/executor.h"
@@ -2344,7 +2345,13 @@ schema_get_xml_visible_tables(Oid nspid)
 	StringInfoData query;
 
 	initStringInfo(&query);
-	appendStringInfo(&query, "SELECT oid FROM pg_catalog.pg_class WHERE relnamespace = %u AND relkind IN ('r', 'm', 'v') AND pg_catalog.has_table_privilege (oid, 'SELECT') ORDER BY relname;", nspid);
+	appendStringInfo(&query, "SELECT oid FROM pg_catalog.pg_class"
+					 " WHERE relnamespace = %u AND relkind IN ("
+					 CppAsString2(RELKIND_RELATION) ","
+					 CppAsString2(RELKIND_MATVIEW) ","
+					 CppAsString2(RELKIND_VIEW) ")"
+					 " AND pg_catalog.has_table_privilege (oid, 'SELECT')"
+					 " ORDER BY relname;", nspid);
 
 	return query_to_oid_list(query.data);
 }
@@ -2370,7 +2377,13 @@ static List *
 database_get_xml_visible_tables(void)
 {
 	/* At the moment there is no order required here. */
-	return query_to_oid_list("SELECT oid FROM pg_catalog.pg_class WHERE relkind IN ('r', 'm', 'v') AND pg_catalog.has_table_privilege (pg_class.oid, 'SELECT') AND relnamespace IN (" XML_VISIBLE_SCHEMAS ");");
+	return query_to_oid_list("SELECT oid FROM pg_catalog.pg_class"
+							 " WHERE relkind IN ("
+							 CppAsString2(RELKIND_RELATION) ","
+							 CppAsString2(RELKIND_MATVIEW) ","
+							 CppAsString2(RELKIND_VIEW) ")"
+							 " AND pg_catalog.has_table_privilege(pg_class.oid, 'SELECT')"
+							 " AND relnamespace IN (" XML_VISIBLE_SCHEMAS ");");
 }
 
 
diff --git a/src/tools/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c
index 9fe0379f63..267107ddae 100644
--- a/src/tools/findoidjoins/findoidjoins.c
+++ b/src/tools/findoidjoins/findoidjoins.c
@@ -7,6 +7,8 @@
  */
 #include "postgres_fe.h"
 
+#include "catalog/pg_class.h"
+
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
 
@@ -51,8 +53,8 @@ main(int argc, char **argv)
 					  "SELECT c.relname, (SELECT nspname FROM "
 		"pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname "
 					  "FROM pg_catalog.pg_class c "
-					  "WHERE c.relkind = 'r' "
-					  "AND c.relhasoids "
+					  "WHERE c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND c.relhasoids "
 					  "ORDER BY nspname, c.relname"
 		);
 
@@ -71,9 +73,10 @@ main(int argc, char **argv)
 					  "(SELECT nspname FROM pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname, "
 					  "a.attname "
 					  "FROM pg_catalog.pg_class c, pg_catalog.pg_attribute a "
-					  "WHERE a.attnum > 0 AND c.relkind = 'r' "
-					  "AND a.attrelid = c.oid "
-					  "AND a.atttypid IN ('pg_catalog.oid'::regtype, "
+					  "WHERE a.attnum > 0"
+					  " AND c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND a.attrelid = c.oid"
+					  " AND a.atttypid IN ('pg_catalog.oid'::regtype, "
 					  " 'pg_catalog.regclass'::regtype, "
 					  " 'pg_catalog.regoper'::regtype, "
 					  " 'pg_catalog.regoperator'::regtype, "
@@ -146,9 +149,10 @@ main(int argc, char **argv)
 					  "(SELECT nspname FROM pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname, "
 					  "a.attname "
 					  "FROM pg_catalog.pg_class c, pg_catalog.pg_attribute a "
-					  "WHERE a.attnum > 0 AND c.relkind = 'r' "
-					  "AND a.attrelid = c.oid "
-					  "AND a.atttypid IN ('pg_catalog.oid[]'::regtype, "
+					  "WHERE a.attnum > 0"
+					  " AND c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND a.attrelid = c.oid"
+					  " AND a.atttypid IN ('pg_catalog.oid[]'::regtype, "
 					  " 'pg_catalog.regclass[]'::regtype, "
 					  " 'pg_catalog.regoper[]'::regtype, "
 					  " 'pg_catalog.regoperator[]'::regtype, "