nocfbot-0031-Remove-unused-include-fix-header-ordering.txt

From a074cdb45ffaa6a46a0b60a581a2eb527d855cad Mon Sep 17 00:00:00 2001
From: Henson Choi <assam258@gmail.com>
Date: Tue, 7 Apr 2026 20:52:13 +0900
Subject: [PATCH 31/40] Remove unused include and fix header ordering in RPR
 files

---
 src/backend/executor/execExprInterp.c | 2 +-
 src/backend/executor/nodeWindowAgg.c  | 3 +--
 src/backend/parser/parse_rpr.c        | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index e2d41c3098f..58b6693ed75 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -56,8 +56,8 @@
  */
 #include "postgres.h"
 
-#include "common/int.h"
 #include "access/heaptoast.h"
+#include "common/int.h"
 #include "access/tupconvert.h"
 #include "catalog/pg_type.h"
 #include "commands/sequence.h"
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index 849ebf8abb0..02f17e5472c 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -34,10 +34,9 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
-#include "common/int.h"
 #include "catalog/objectaccess.h"
 #include "catalog/pg_aggregate.h"
-#include "catalog/pg_collation_d.h"
+#include "common/int.h"
 #include "catalog/pg_proc.h"
 #include "executor/executor.h"
 #include "executor/execRPR.h"
diff --git a/src/backend/parser/parse_rpr.c b/src/backend/parser/parse_rpr.c
index 8fbe12e1518..8864b20e6cf 100644
--- a/src/backend/parser/parse_rpr.c
+++ b/src/backend/parser/parse_rpr.c
@@ -30,9 +30,8 @@
 #include "nodes/nodeFuncs.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/rpr.h"
-#include "parser/parse_clause.h"
-#include "parser/parse_collate.h"
 #include "parser/parse_coerce.h"
+#include "parser/parse_collate.h"
 #include "parser/parse_expr.h"
 #include "parser/parse_rpr.h"
 #include "parser/parse_target.h"
-- 
2.50.1 (Apple Git-155)