From a081c57217d6eb3beb418debc31bd016132da4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Herrera?= <alvherre@kurilemu.de>
Date: Sun, 22 Mar 2026 19:39:18 +0100
Subject: [PATCH v2 14/15] pg_inherits.h doesn't need the full lock.h

---
 src/backend/catalog/pg_inherits.c    | 1 +
 src/backend/optimizer/util/inherit.c | 2 ++
 src/include/catalog/pg_inherits.h    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c
index cef80633157..4b9802aafcc 100644
--- a/src/backend/catalog/pg_inherits.c
+++ b/src/backend/catalog/pg_inherits.c
@@ -28,6 +28,7 @@
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
+#include "utils/hsearch.h"
 #include "utils/snapmgr.h"
 #include "utils/syscache.h"
 
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c
index 8d623bf136d..6a7b9edff3f 100644
--- a/src/backend/optimizer/util/inherit.c
+++ b/src/backend/optimizer/util/inherit.c
@@ -14,6 +14,8 @@
  */
 #include "postgres.h"
 
+#include <limits.h>
+
 #include "access/sysattr.h"
 #include "access/table.h"
 #include "catalog/partition.h"
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 7a36241d7b3..cc874abaabb 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -22,7 +22,7 @@
 #include "catalog/pg_inherits_d.h"	/* IWYU pragma: export */
 
 #include "nodes/pg_list.h"
-#include "storage/lock.h"
+#include "storage/lockdefs.h"
 
 /* ----------------
  *		pg_inherits definition.  cpp turns this into
-- 
2.47.3

