From 8991f2138f371519a2f24221c1fe275045771ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Herrera?= <alvherre@kurilemu.de>
Date: Wed, 1 Oct 2025 19:47:35 +0200
Subject: [PATCH 4/4] Don't include execnodes.h in brin.h or gin.h

---
 src/backend/access/brin/brin_bloom.c | 1 +
 src/backend/access/gin/ginscan.c     | 1 +
 src/include/access/brin.h            | 3 ++-
 src/include/access/gin.h             | 4 ++--
 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/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c
index 26081693383..1c9a8cb4df8 100644
--- a/src/backend/access/gin/ginscan.c
+++ b/src/backend/access/gin/ginscan.c
@@ -16,6 +16,7 @@
 
 #include "access/gin_private.h"
 #include "access/relscan.h"
+#include "executor/instrument_node.h"
 #include "pgstat.h"
 #include "utils/memutils.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"
 
 
-- 
2.47.3

