Rename files and headers related to index AM

The following renaming is done so as source files related to index
access methods are more consistent with table access methods (the
original names used for index AMs ware too generic, and could be
confused as including features related to table AMs):
- amapi.h -> indexam.h.
- amapi.c -> indexamapi.c.  Here we have an equivalent with
backend/access/table/tableamapi.c.
- amvalidate.c -> indexamvalidate.c.
- amvalidate.h -> indexamvalidate.h.
- genam.c -> indexgenam.c.
- genam.h -> indexgenam.h.

This has been discussed during the development of v12 when table AM was
worked on, but the renaming never happened.

Author: Michael Paquier
Reviewed-by: Fabien Coelho, Julien Rouhaud
Discussion: https://postgr.es/m/20191223053434.GF34339@paquier.xyz

90 files changed, 101 insertions, 101 deletions

diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c
index 86788024ef6..152b8b70dab 100644
--- a/src/backend/access/brin/brin_inclusion.c
+++ b/src/backend/access/brin/brin_inclusion.c
@@ -26,7 +26,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/skey.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index 655c0b54b53..d0d4389ea3c 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -12,7 +12,7 @@
 
 #include "access/brin_internal.h"
 #include "access/brin_tuple.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/stratnum.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index 02337a767ce..9b6f435e56b 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/brin_internal.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"
diff --git a/src/backend/access/common/detoast.c b/src/backend/access/common/detoast.c
index 78fcc876dad..d6f45c8463a 100644
--- a/src/backend/access/common/detoast.c
+++ b/src/backend/access/common/detoast.c
@@ -14,7 +14,7 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/heaptoast.h"
 #include "access/table.h"
 #include "access/toast_internals.h"
diff --git a/src/backend/access/common/toast_internals.c b/src/backend/access/common/toast_internals.c
index a9712424901..63517132d6d 100644
--- a/src/backend/access/common/toast_internals.c
+++ b/src/backend/access/common/toast_internals.c
@@ -14,9 +14,9 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/toast_internals.h"
 #include "access/xact.h"
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 5d96f29cdef..5abd746894c 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/gin_private.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"
diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
index 739846a257d..b9b31dd63e0 100644
--- a/src/backend/access/gist/gistbuild.c
+++ b/src/backend/access/gist/gistbuild.c
@@ -16,9 +16,9 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/gist_private.h"
 #include "access/gistxlog.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xloginsert.h"
 #include "catalog/index.h"
diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c
index 38f786848de..39121d5597d 100644
--- a/src/backend/access/gist/gistbuildbuffers.c
+++ b/src/backend/access/gist/gistbuildbuffers.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "storage/buffile.h"
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 98b68920138..dd1df12fc88 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "lib/pairingheap.h"
 #include "miscadmin.h"
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 710e4015b3d..c8bb5f96b00 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/indexgenam.h"
 #include "access/transam.h"
 #include "commands/vacuum.h"
 #include "lib/integerset.h"
diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c
index dfc1a87a757..3357689970a 100644
--- a/src/backend/access/gist/gistvalidate.c
+++ b/src/backend/access/gist/gistvalidate.c
@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/gist_private.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"
diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index 93158727512..3ec9fcd0362 100644
--- a/src/backend/access/hash/hashvalidate.c
+++ b/src/backend/access/hash/hashvalidate.c
@@ -13,9 +13,9 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
 #include "catalog/pg_opclass.h"
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 0128bb34ef6..e6d2b5f007c 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -33,11 +33,11 @@
 #include "postgres.h"
 
 #include "access/bufmask.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
 #include "access/heaptoast.h"
 #include "access/hio.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/parallel.h"
 #include "access/relscan.h"
diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c
index 92073fec54d..72729f744bb 100644
--- a/src/backend/access/heap/heapam_handler.c
+++ b/src/backend/access/heap/heapam_handler.c
@@ -19,9 +19,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/rewriteheap.h"
 #include "access/tableam.h"
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index ab09d8408cc..253b273366f 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -36,10 +36,10 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/transam.h"
 #include "access/visibilitymap.h"
diff --git a/src/backend/access/index/Makefile b/src/backend/access/index/Makefile
index 6f2e3061a84..0d8cbbc88cb 100644
--- a/src/backend/access/index/Makefile
+++ b/src/backend/access/index/Makefile
@@ -13,9 +13,9 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = \
-	amapi.o \
-	amvalidate.o \
-	genam.o \
-	indexam.o
+	indexam.o \
+	indexamapi.o \
+	indexamvalidate.o \
+	indexgenam.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 4af418287d2..d5d6e29e181 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -43,8 +43,8 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"
diff --git a/src/backend/access/index/amapi.c b/src/backend/access/index/indexamapi.c
index 450a7dce1fc..bda667cf934 100644
--- a/src/backend/access/index/amapi.c
+++ b/src/backend/access/index/indexamapi.c
@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * amapi.c
+ * indexamapi.c
  *	  Support routines for API for Postgres index access methods.
  *
  * Copyright (c) 2015-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/amapi.c
+ *	  src/backend/access/index/indexamapi.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_opclass.h"
 #include "utils/builtins.h"
diff --git a/src/backend/access/index/amvalidate.c b/src/backend/access/index/indexamvalidate.c
index 5a2728502ce..8f00012d209 100644
--- a/src/backend/access/index/amvalidate.c
+++ b/src/backend/access/index/indexamvalidate.c
@@ -1,20 +1,20 @@
 /*-------------------------------------------------------------------------
  *
- * amvalidate.c
+ * indexamvalidate.c
  *	  Support routines for index access methods' amvalidate functions.
  *
  * Copyright (c) 2016-2019, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/amvalidate.c
+ *	  src/backend/access/index/indexamvalidate.c
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/indexgenam.c
index 2599b5d3425..6a1ac6cc309 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/indexgenam.c
@@ -1,6 +1,6 @@
 /*-------------------------------------------------------------------------
  *
- * genam.c
+ * indexgenam.c
  *	  general index access method routines
  *
  * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
@@ -8,19 +8,19 @@
  *
  *
  * IDENTIFICATION
- *	  src/backend/access/index/genam.c
+ *	  src/backend/access/index/indexgenam.c
  *
  * NOTES
  *	  many of the old access method routines have been turned into
- *	  macros and moved to genam.h -cim 4/30/91
+ *	  macros and moved to indexgenam.h -cim 4/30/91
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"
diff --git a/src/backend/access/nbtree/nbtvalidate.c b/src/backend/access/nbtree/nbtvalidate.c
index 0148ea78929..2b40b0e21cf 100644
--- a/src/backend/access/nbtree/nbtvalidate.c
+++ b/src/backend/access/nbtree/nbtvalidate.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/nbtree.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
index c34c44cd8b5..42a894cc54b 100644
--- a/src/backend/access/spgist/spgdoinsert.c
+++ b/src/backend/access/spgist/spgdoinsert.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/xloginsert.h"
diff --git a/src/backend/access/spgist/spginsert.c b/src/backend/access/spgist/spginsert.c
index dd9088741cf..043016fe8d6 100644
--- a/src/backend/access/spgist/spginsert.c
+++ b/src/backend/access/spgist/spginsert.c
@@ -16,7 +16,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/tableam.h"
diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c
index 6e940fd3def..8e5f0124973 100644
--- a/src/backend/access/spgist/spgscan.c
+++ b/src/backend/access/spgist/spgscan.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/spgist_private.h"
 #include "miscadmin.h"
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index e2d391ee754..d01ea59e141 100644
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -15,8 +15,8 @@
 
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/reloptions.h"
 #include "access/spgist_private.h"
 #include "access/transam.h"
diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c
index 478d4c0d612..1b8cb9760f7 100644
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/spgist_private.h"
 #include "access/spgxlog.h"
 #include "access/transam.h"
diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c
index 4b9fdbd5d78..3a599db86cd 100644
--- a/src/backend/access/spgist/spgvalidate.c
+++ b/src/backend/access/spgist/spgvalidate.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amvalidate.h"
 #include "access/htup_details.h"
+#include "access/indexamvalidate.h"
 #include "access/spgist_private.h"
 #include "catalog/pg_amop.h"
 #include "catalog/pg_amproc.h"
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 8ea033610d6..9dcb7b66d3c 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -17,9 +17,9 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "access/xlog_internal.h"
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index ea5666ebb8d..b6dba91b9ad 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -17,9 +17,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 6b104695c0c..c4c4d9f6c8c 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -20,8 +20,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/transam.h"
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index d07bb4496e3..aea8cdde742 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/dependency.h"
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 452a7f3f953..c9b3e17dc11 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -29,8 +29,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 787aad636e7..7529bf39b8e 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -23,8 +23,8 @@
 
 #include <unistd.h>
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index f237e62bc90..8f48e0076c2 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -15,9 +15,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "executor/executor.h"
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ae3002bb427..00a21c430c1 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -15,7 +15,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/htup_details.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index 7657608dd74..5f85b9b99ca 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -15,8 +15,8 @@
 #include "postgres.h"
 
 #include "access/attmap.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index dd99d53547f..ec5cea1bab0 100644
--- a/src/backend/catalog/pg_collation.c
+++ b/src/backend/catalog/pg_collation.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 25c52134f06..b12834a2c05 100644
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/xact.h"
diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c
index 20acac2eea9..791fca9deef 100644
--- a/src/backend/catalog/pg_db_role_setting.c
+++ b/src/backend/catalog/pg_db_role_setting.c
@@ -10,9 +10,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "catalog/indexing.h"
 #include "catalog/objectaccess.h"
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index a060c25d2ee..c9228cc9079 100644
--- a/src/backend/catalog/pg_depend.c
+++ b/src/backend/catalog/pg_depend.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index be0f06524d9..e43b1451709 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"
diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c
index 59af16221ea..62622cc6f9c 100644
--- a/src/backend/catalog/pg_inherits.c
+++ b/src/backend/catalog/pg_inherits.c
@@ -19,8 +19,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_inherits.h"
diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c
index 1a687028fe2..2c3e15e6bc0 100644
--- a/src/backend/catalog/pg_largeobject.c
+++ b/src/backend/catalog/pg_largeobject.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index f6e9a68bf70..80a6a92a826 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -14,9 +14,9 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/catalog/pg_range.c b/src/backend/catalog/pg_range.c
index e6e138babdf..c8808a78b33 100644
--- a/src/backend/catalog/pg_range.c
+++ b/src/backend/catalog/pg_range.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 59f97bf3d02..89ebb849a29 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index 68d88ff4991..f346ec959f3 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -14,9 +14,9 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 71372ceb161..70ee89d52f5 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -17,7 +17,7 @@
 #include <math.h>
 
 #include "access/detoast.h"
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index b8c349f245b..cc35811dc89 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -17,8 +17,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
+#include "access/indexam.h"
 #include "access/multixact.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 1859fb628fd..7823dace9fa 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index 806962a686b..8a57a0ef99d 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "catalog/index.h"
 #include "commands/trigger.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index a70e75a219e..da0e5d8b94c 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -23,9 +23,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index 6eaa9cc4f3d..df04a82fe59 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -29,8 +29,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 94411b50082..4527aa15f71 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -32,8 +32,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 8f242aef1e2..940aa97323a 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -15,9 +15,9 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/reloptions.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 537d0e8ceff..907c71dda0c 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -14,9 +14,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index cb7a6bd2d14..cccd95a97a2 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -17,9 +17,9 @@
 
 #include <limits.h>
 
-#include "access/genam.h"
 #include "access/hash.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 36093dcd956..72ba997e4c3 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -12,9 +12,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index b51c373b93f..0182dc7202a 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index fbf11c86aad..4252db4ec05 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 63219ad589f..94d28b24fc8 100644
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -10,8 +10,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 53a8f1610a4..a776e652f4b 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -15,9 +15,9 @@
 #include "postgres.h"
 
 #include "access/attmap.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/heapam_xlog.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/reloptions.h"
 #include "access/relscan.h"
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 99cb5bf557b..7e9bcb317d5 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index 5d6528f9cf8..714dff53048 100644
--- a/src/backend/commands/tsearchcmds.c
+++ b/src/backend/commands/tsearchcmds.c
@@ -17,8 +17,8 @@
 
 #include <ctype.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 89887b8fd75..d3df657fa0f 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -31,9 +31,9 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/tableam.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index aab5aa855d2..f3572b1749a 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/binary_upgrade.h"
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index da1da234000..477b271aa39 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -24,9 +24,9 @@
 
 #include "access/clog.h"
 #include "access/commit_ts.h"
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/multixact.h"
 #include "access/tableam.h"
 #include "access/transam.h"
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 779d3dcceae..c1e2cedc081 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -12,8 +12,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "executor/execdebug.h"
 #include "executor/nodeAgg.h"
 #include "executor/nodeAppend.h"
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index c7f909241b4..3853d154d8e 100644
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -12,7 +12,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "catalog/pg_type.h"
diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
index 40bd8049f05..823b6707605 100644
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@ -106,7 +106,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/xact.h"
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 95e027c970b..f311476071d 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -14,7 +14,7 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/transam.h"
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index 604f4f1132f..fbe434ce2f8 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -21,7 +21,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapIndexscan.h"
 #include "executor/nodeIndexscan.h"
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index 784486f0c80..a4ea390d2bf 100644
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -30,7 +30,7 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/tableam.h"
 #include "access/tupdesc.h"
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index c5f65934859..2911c7a461b 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -73,8 +73,8 @@
 
 #include <math.h>
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/tsmapi.h"
 #include "executor/executor.h"
 #include "executor/nodeHash.h"
@@ -539,7 +539,7 @@ cost_index(IndexPath *path, PlannerInfo *root, double loop_count,
 	 * for scanning the index, as well as the selectivity of the index (ie,
 	 * the fraction of main-table tuples we will have to retrieve) and its
 	 * correlation to the main-table tuple order.  We need a cast here because
-	 * pathnodes.h uses a weak function type to avoid including amapi.h.
+	 * pathnodes.h uses a weak function type to avoid including indexam.h.
 	 */
 	amcostestimate = (amcostestimate_function) index->amcostestimate;
 	amcostestimate(root, path, loop_count,
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index cb54b15507b..d63ebb7287c 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -18,8 +18,8 @@
 #include <limits.h>
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/parallel.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 5e889d18614..c15654e660c 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -17,8 +17,8 @@
 
 #include <math.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/nbtree.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 45bb31ecf8f..3fafa920f38 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -26,8 +26,8 @@
 
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/relation.h"
 #include "access/reloptions.h"
 #include "access/table.h"
diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c
index 6ede084afe4..5ca63d02b79 100644
--- a/src/backend/partitioning/partdesc.c
+++ b/src/backend/partitioning/partdesc.c
@@ -14,8 +14,8 @@
 
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/partition.h"
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index fffc330c94f..f965bdb0270 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -70,8 +70,8 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index bb98b6936a0..6dbe010f6a8 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/catalog.h"
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index 9d339433f65..98b70760adc 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -17,8 +17,8 @@
 #include "postgres.h"
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_collation.h"
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 263d5be12eb..cd823622877 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -33,8 +33,8 @@
 #include <limits.h>
 
 #include "access/detoast.h"
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "access/xact.h"
diff --git a/src/backend/utils/adt/amutils.c b/src/backend/utils/adt/amutils.c
index e81d6cc0562..6de33886dba 100644
--- a/src/backend/utils/adt/amutils.c
+++ b/src/backend/utils/adt/amutils.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "catalog/pg_class.h"
 #include "catalog/pg_index.h"
 #include "utils/builtins.h"
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
index 3402ff860d3..000572c5b33 100644
--- a/src/backend/utils/adt/enum.c
+++ b/src/backend/utils/adt/enum.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_enum.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 4af1603e7ce..bdf78db8c80 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -19,8 +19,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "access/amapi.h"
 #include "access/htup_details.h"
+#include "access/indexam.h"
 #include "access/relation.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c3e7d94aa5b..9ce04af9a9c 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -14,8 +14,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/heaptoast.h"
+#include "access/indexgenam.h"
 #include "access/relscan.h"
 #include "access/sysattr.h"
 #include "access/table.h"
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 1b0f7383212..510160c8870 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/relation.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_event_trigger.h"
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index d244eaf4d8c..693501067ad 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -13,8 +13,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_class.h"
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index 68c04d87d51..487d3cadeee 100644
--- a/src/backend/utils/cache/ts_cache.c
+++ b/src/backend/utils/cache/ts_cache.c
@@ -26,8 +26,8 @@
  */
 #include "postgres.h"
 
-#include "access/genam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/table.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index cc38669a1eb..5375653a42b 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -19,9 +19,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/indexgenam.h"
 #include "access/session.h"
 #include "access/sysattr.h"
 #include "access/tableam.h"