diff --git a/src/hnswbuild.c b/src/hnswbuild.c
index ebc8553..a0257f8 100644
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -65,6 +65,7 @@
 #include "storage/off.h"
 #include "storage/shm_toc.h"
 #include "storage/shmem.h"
+#include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/datum.h"
 #include "utils/memutils.h"
@@ -73,6 +74,10 @@
 #include "utils/snapmgr.h"
 #include "utils/snapshot.h"
 
+#if PG_VERSION_NUM < 190000
+#include "storage/item.h"
+#endif
+
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif
diff --git a/src/hnswinsert.c b/src/hnswinsert.c
index 4946676..0310162 100644
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -4,6 +4,7 @@
 #include "access/generic_xlog.h"
 #include "common/relpath.h"
 #include "hnsw.h"
+#include "nodes/execnodes.h"
 #include "storage/block.h"
 #include "storage/buf.h"
 #include "storage/bufmgr.h"
@@ -18,6 +19,10 @@
 #include "utils/rel.h"
 #include "utils/relcache.h"
 
+#if PG_VERSION_NUM < 190000
+#include "storage/item.h"
+#endif
+
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif
diff --git a/src/hnswscan.c b/src/hnswscan.c
index cfb5cb5..c26e4a0 100644
--- a/src/hnswscan.c
+++ b/src/hnswscan.c
@@ -11,6 +11,7 @@
 #include "pgstat.h"
 #include "storage/itemptr.h"
 #include "storage/lmgr.h"
+#include "storage/lockdefs.h"
 #include "utils/float.h"
 #include "utils/memutils.h"
 #include "utils/relcache.h"
diff --git a/src/hnswvacuum.c b/src/hnswvacuum.c
index a6c5b80..d491bf3 100644
--- a/src/hnswvacuum.c
+++ b/src/hnswvacuum.c
@@ -18,6 +18,10 @@
 #include "utils/rel.h"
 #include "utils/relcache.h"
 
+#if PG_VERSION_NUM < 190000
+#include "storage/item.h"
+#endif
+
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif
diff --git a/src/ivfbuild.c b/src/ivfbuild.c
index a4544c0..bf4fb00 100644
--- a/src/ivfbuild.c
+++ b/src/ivfbuild.c
@@ -27,10 +27,12 @@
 #include "storage/bufmgr.h"
 #include "storage/bufpage.h"
 #include "storage/condition_variable.h"
+#include "storage/dsm.h"
 #include "storage/itemptr.h"
 #include "storage/lockdefs.h"
 #include "storage/off.h"
 #include "storage/shm_toc.h"
+#include "storage/shmem.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
 #include "utils/memutils.h"
@@ -41,6 +43,10 @@
 #include "utils/snapshot.h"
 #include "utils/tuplesort.h"
 
+#if PG_VERSION_NUM < 190000
+#include "storage/item.h"
+#endif
+
 #if PG_VERSION_NUM >= 160000
 #include "varatt.h"
 #endif
diff --git a/src/ivfinsert.c b/src/ivfinsert.c
index 35f3656..00cbdc6 100644
--- a/src/ivfinsert.c
+++ b/src/ivfinsert.c
@@ -22,6 +22,10 @@
 #include "utils/rel.h"
 #include "utils/relcache.h"
 
+#if PG_VERSION_NUM < 190000
+#include "storage/item.h"
+#endif
+
 /*
  * Find the list that minimizes the distance function
  */
diff --git a/src/ivfscan.c b/src/ivfscan.c
index 13090ba..9ad1528 100644
--- a/src/ivfscan.c
+++ b/src/ivfscan.c
@@ -17,11 +17,13 @@
 #include "ivfflat.h"
 #include "miscadmin.h"
 #include "pgstat.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/off.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/relcache.h"