diff --git a/src/hnsw.c b/src/hnsw.c
index 4bd03c8..e7b5eeb 100644
--- a/src/hnsw.c
+++ b/src/hnsw.c
@@ -15,6 +15,7 @@
 #include "nodes/nodes.h"
 #include "nodes/pathnodes.h"
 #include "nodes/pg_list.h"
+#include "storage/shmem.h"
 #include "utils/float.h"
 #include "utils/guc.h"
 #include "utils/selfuncs.h"
diff --git a/src/hnswbuild.c b/src/hnswbuild.c
index ebd4877..9608902 100644
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -60,6 +60,7 @@
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/snapmgr.h"
+#include "utils/snapshot.h"
 
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
diff --git a/src/hnswscan.c b/src/hnswscan.c
index d363399..e32c6af 100644
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -1,6 +1,7 @@
 #include "postgres.h"
 
 #include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/skey.h"
 #include "hnsw.h"
 #include "lib/pairingheap.h"
diff --git a/src/ivfbuild.c b/src/ivfbuild.c
index 7191bfd..949d522 100644
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -4,6 +4,8 @@
 
 #include "access/genam.h"
 #include "access/generic_xlog.h"
+#include "access/itup.h"
+#include "access/relscan.h"
 #include "access/table.h"
 #include "access/tableam.h"
 #include "access/tupdesc.h"
@@ -25,8 +27,10 @@
 #include "storage/shm_toc.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
+#include "utils/rel.h"
 #include "utils/sampling.h"
 #include "utils/snapmgr.h"
+#include "utils/snapshot.h"
 #include "utils/tuplesort.h"
 
 #if PG_VERSION_NUM >= 160000
diff --git a/src/ivfinsert.c b/src/ivfinsert.c
index e863acc..f9f08d8 100644
--- a/src/ivfinsert.c
+++ b/src/ivfinsert.c
@@ -4,12 +4,14 @@
 
 #include "access/genam.h"
 #include "access/generic_xlog.h"
+#include "access/itup.h"
 #include "fmgr.h"
 #include "ivfflat.h"
 #include "nodes/execnodes.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/memutils.h"
+#include "utils/rel.h"
 
 /*
  * Find the list that minimizes the distance function
diff --git a/src/ivfscan.c b/src/ivfscan.c
index ea5036d..1ea067d 100644
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -5,16 +5,19 @@
 #include "access/genam.h"
 #include "access/itup.h"
 #include "access/relscan.h"
+#include "access/sdir.h"
 #include "access/skey.h"
 #include "catalog/pg_operator_d.h"
 #include "catalog/pg_type_d.h"
 #include "executor/tuptable.h"
+#include "fmgr.h"
 #include "lib/pairingheap.h"
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/bufmgr.h"
 #include "utils/memutils.h"
+#include "utils/rel.h"
 #include "utils/snapmgr.h"
 #include "utils/tuplesort.h"