diff --git a/src/hnswinsert.c b/src/hnswinsert.c
index 25bd2a6..221120b 100644
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -3,6 +3,7 @@
 #include "access/genam.h"
 #include "access/generic_xlog.h"
 #include "hnsw.h"
+#include "storage/block.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
@@ -10,6 +11,7 @@
 #include "storage/itemptr.h"
 #include "storage/lmgr.h"
 #include "storage/lockdefs.h"
+#include "storage/off.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
diff --git a/src/hnswscan.c b/src/hnswscan.c
index fa60fc0..cfb5cb5 100644
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -9,6 +9,7 @@
 #include "miscadmin.h"
 #include "nodes/pg_list.h"
 #include "pgstat.h"
+#include "storage/itemptr.h"
 #include "storage/lmgr.h"
 #include "utils/float.h"
 #include "utils/memutils.h"
diff --git a/src/hnswutils.c b/src/hnswutils.c
index e6ed936..8982f7f 100644
--- a/src/hnswutils.c
+++ b/src/hnswutils.c
@@ -12,11 +12,13 @@
 #include "nodes/pg_list.h"
 #include "port/atomics.h"
 #include "sparsevec.h"
+#include "storage/block.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/itemptr.h"
 #include "storage/lwlock.h"
+#include "storage/off.h"
 #include "utils/datum.h"
 #include "utils/memdebug.h"
 #include "utils/rel.h"
diff --git a/src/ivfbuild.c b/src/ivfbuild.c
index a71464a..a4544c0 100644
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -22,11 +22,14 @@
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "optimizer/optimizer.h"
+#include "storage/block.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/condition_variable.h"
+#include "storage/itemptr.h"
 #include "storage/lockdefs.h"
+#include "storage/off.h"
 #include "storage/shm_toc.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
diff --git a/src/ivfinsert.c b/src/ivfinsert.c
index 8587bee..493988c 100644
--- a/src/ivfinsert.c
+++ b/src/ivfinsert.c
@@ -8,12 +8,15 @@
 #include "fmgr.h"
 #include "ivfflat.h"
 #include "nodes/execnodes.h"
+#include "storage/block.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/itemid.h"
+#include "storage/itemptr.h"
 #include "storage/lmgr.h"
 #include "storage/lockdefs.h"
+#include "storage/off.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"
diff --git a/src/ivfscan.c b/src/ivfscan.c
index c8bfe39..80197d2 100644
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -20,6 +20,7 @@
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/itemid.h"
+#include "storage/itemptr.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"