4 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/access/brin/brin_bloom.c b/src/backend/access/brin/brin_bloom.c
index 7c3f7d454fc..d6da3abc8de 100644
--- a/src/backend/access/brin/brin_bloom.c
+++ b/src/backend/access/brin/brin_bloom.c
@@ -126,6 +126,7 @@
 #include "catalog/pg_am.h"
 #include "catalog/pg_type.h"
 #include "common/hashfn.h"
+#include "port/pg_bitutils.h"
 #include "utils/fmgrprotos.h"
 #include "utils/rel.h"
 
diff --git a/src/include/access/brin.h b/src/include/access/brin.h
index 821f1e02806..91ec498bda0 100644
--- a/src/include/access/brin.h
+++ b/src/include/access/brin.h
@@ -10,7 +10,8 @@
 #ifndef BRIN_H
 #define BRIN_H
 
-#include "nodes/execnodes.h"
+#include "storage/block.h"
+#include "storage/dsm.h"
 #include "storage/shm_toc.h"
 #include "utils/relcache.h"
 
diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index 2e1076a0499..13ea91922ef 100644
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -12,9 +12,9 @@
 
 #include "access/xlogreader.h"
 #include "lib/stringinfo.h"
-#include "nodes/execnodes.h"
-#include "storage/shm_toc.h"
 #include "storage/block.h"
+#include "storage/dsm.h"
+#include "storage/shm_toc.h"
 #include "utils/relcache.h"
 
 
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index aee1f70c22e..9ea303a7c1b 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -13,6 +13,7 @@
 #include "access/amapi.h"
 #include "access/gin.h"
 #include "access/ginblock.h"
+#include "access/htup_details.h"
 #include "access/itup.h"
 #include "common/int.h"
 #include "catalog/pg_am_d.h"