diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c
index a0f500edc88d2a7d96318fa83524173d689cdf97..8cc052eb7df1b8d3d8ba8716a393674ddc056f0b 100644
--- a/src/backend/access/heap/syncscan.c
+++ b/src/backend/access/heap/syncscan.c
@@ -48,6 +48,8 @@
 
 #include "access/heapam.h"
 #include "miscadmin.h"
+#include "storage/lwlock.h"
+#include "storage/shmem.h"
 #include "utils/rel.h"
 
 
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index e330105217d83c4bb7075cccb207a07d8d91d252..a8d275f4d39035a6f62b2a0d482249b112906a30 100644
--- a/src/backend/access/transam/commit_ts.c
+++ b/src/backend/access/transam/commit_ts.c
@@ -32,6 +32,7 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "pg_trace.h"
+#include "storage/shmem.h"
 #include "utils/builtins.h"
 #include "utils/snapmgr.h"
 #include "utils/timestamp.h"
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index b3a595c67e940a65307f2ab976326666d6b21db9..0d12bbbbeaff1e94af19ef6fe0c40cf4c7e5ff45 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -19,7 +19,7 @@
 #include "nodes/lockoptions.h"
 #include "nodes/primnodes.h"
 #include "storage/bufpage.h"
-#include "storage/lock.h"
+#include "storage/lockdefs.h"
 #include "utils/relcache.h"
 #include "utils/snapshot.h"
 
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 49c2a6f2ce2642b6c52a8f9969c7f48683304234..de98dd65981dd628e7158450ad66fee092473edf 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -19,6 +19,7 @@
 #include "access/htup_details.h"
 #include "access/itup.h"
 #include "access/tupdesc.h"
+#include "storage/spin.h"
 
 /*
  * Shared state for parallel heap scan.
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index e28477d82dbd99dd44e3a07014d2a80de45db8e2..4fa366178f5ee14f4fa3aef56454c54eae731218 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -20,6 +20,7 @@
 #include "lib/pairingheap.h"
 #include "nodes/params.h"
 #include "nodes/plannodes.h"
+#include "utils/hsearch.h"
 #include "utils/reltrigger.h"
 #include "utils/sortsupport.h"
 #include "utils/tuplestore.h"