From d3252cf12f8e3edda02939690350b35c9daeca6c Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Mon, 2 Aug 1999 06:27:09 +0000
Subject: [PATCH] Final round before bed...more tomorrow...

---
 src/backend/optimizer/path/allpaths.c     | 20 ++----------
 src/backend/optimizer/path/clausesel.c    | 11 ++-----
 src/backend/optimizer/path/costsize.c     |  6 ++--
 src/backend/optimizer/path/hashutils.c    |  5 +--
 src/backend/optimizer/path/joinpath.c     | 13 ++------
 src/backend/optimizer/path/joinrels.c     |  8 ++---
 src/backend/optimizer/path/mergeutils.c   |  6 +---
 src/backend/optimizer/path/orindxpath.c   | 17 +++-------
 src/backend/optimizer/path/pathkeys.c     | 11 ++-----
 src/backend/optimizer/path/prune.c        |  6 +---
 src/backend/optimizer/plan/initsplan.c    | 22 ++++---------
 src/backend/optimizer/plan/planmain.c     | 25 +++------------
 src/backend/optimizer/plan/planner.c      | 39 ++++++-----------------
 src/backend/optimizer/plan/setrefs.c      | 13 ++------
 src/backend/optimizer/plan/subselect.c    | 15 ++-------
 src/backend/optimizer/prep/prepkeyset.c   |  2 --
 src/backend/optimizer/prep/prepqual.c     |  6 ++--
 src/backend/optimizer/prep/preptlist.c    | 22 +++----------
 src/backend/optimizer/prep/prepunion.c    | 21 +++---------
 src/backend/optimizer/util/clauses.c      | 15 ++-------
 src/backend/optimizer/util/indexnode.c    |  6 +---
 src/backend/optimizer/util/joininfo.c     |  5 +--
 src/backend/optimizer/util/keys.c         |  6 ----
 src/backend/optimizer/util/ordering.c     |  1 -
 src/backend/optimizer/util/pathnode.c     | 15 +++------
 src/backend/optimizer/util/relnode.c      |  6 +---
 src/backend/optimizer/util/restrictinfo.c |  4 +--
 src/backend/optimizer/util/tlist.c        | 14 +++-----
 src/backend/optimizer/util/var.c          |  6 ----
 29 files changed, 72 insertions(+), 274 deletions(-)

diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 823e8d55c0..4de66c8307 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -11,27 +11,13 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
-#include <stdio.h>
-
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-
-#include "optimizer/internal.h"
-
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/cost.h"
-
-#include "commands/creatinh.h"
-
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo.h"
+#include "optimizer/internal.h"
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
 #ifdef GEQO
 bool		_use_geqo_ = true;
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index ecd1926107..439367cb20 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -14,19 +14,14 @@
 #include "postgres.h"
 
 #include "catalog/pg_operator.h"
-#include "fmgr.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
-#include "optimizer/plancat.h"
-#include "parser/parsetree.h"	/* for getrelid() */
+#include "optimizer/plancat.h" 
+#include "optimizer/restrictinfo.h"
+#include "parser/parsetree.h" 
 #include "utils/lsyscache.h"
 
-
 static Cost compute_selec(Query *root, List *clauses, List *or_selectivities);
 
 /****************************************************************************
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 8f01323fa1..ec2bea1c5c 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -12,10 +12,9 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
 #include <math.h>
 
+#include "postgres.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #ifndef MAXINT
@@ -27,10 +26,9 @@
 #endif
 #endif
 
-#include "nodes/relation.h"
+
 #include "optimizer/cost.h"
 #include "optimizer/internal.h"
-#include "optimizer/keys.h"
 #include "optimizer/tlist.h"
 #include "utils/lsyscache.h"
 
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index 5c4648ad91..b3cb182db8 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -12,12 +12,9 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
+#include "optimizer/paths.h"
 
 
 static HashInfo *match_hashop_hashinfo(Oid hashop, List *hashinfo_list);
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 959322df8e..32c9ca1b0a 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -16,18 +16,9 @@
 
 #include "postgres.h"
 
-#include "storage/buf_internals.h"
-
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
+#include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
-#include "optimizer/keys.h"
-#include "optimizer/cost.h"		/* for _enable_{hashjoin,
-								 * _enable_mergejoin} */
+#include "optimizer/paths.h"
 
 static Path *best_innerjoin(List *join_paths, List *outer_relid);
 static List *sort_inner_and_outer(RelOptInfo *joinrel, RelOptInfo *outerrel, RelOptInfo *innerrel,
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index d071e55975..41a94c629f 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -13,15 +13,11 @@
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static List *new_joininfo_list(List *joininfo_list, Relids join_relids);
 static bool nonoverlap_sets(List *s1, List *s2);
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 13098fa8d4..a9a367fc02 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -13,13 +13,9 @@
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
 
 /*
  * group_clauses_by_order
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index c7389f06e7..8a662d6fa6 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -13,23 +13,14 @@
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-
-#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/paths.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
+#include "optimizer/paths.h"
 #include "optimizer/plancat.h"
-#include "optimizer/xfunc.h"
-
-#include "parser/parsetree.h"
-
+#include "optimizer/restrictinfo.h"
+#include "parser/parsetree.h" 
 
 static void best_or_subclause_indices(Query *root, RelOptInfo *rel, List *subclauses,
 				List *indices, List **indexids, Cost *cost, Cost *selec);
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 372bf66aaa..72f0a3cadb 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -13,17 +13,12 @@
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/var.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
 #include "optimizer/joininfo.h"
+#include "optimizer/keys.h"
 #include "optimizer/ordering.h"
+#include "optimizer/paths.h"
+#include "optimizer/tlist.h"
 
 static int match_pathkey_joinkeys(List *pathkey, List *joinkeys,
 					   int outer_or_inner);
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index 3ff8035ee8..ebf8358afc 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -13,15 +13,11 @@
  */
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/cost.h"
-#include "optimizer/paths.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
 
-#include "utils/elog.h"
 
 
 static List *merge_rel_with_same_relids(RelOptInfo *rel, Relids unjoined_relids);
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 2c559207ee..52436b1470 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -15,27 +15,17 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "nodes/makefuncs.h"
-
-#include "access/htup.h"
-
+#include "postgres.h"
 #include "catalog/pg_type.h"
-
-#include "utils/lsyscache.h"
-#include "utils/palloc.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/planmain.h"
+#include "nodes/makefuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/cost.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
+#include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
+#include "utils/lsyscache.h"
 
 extern int	Quiet;
 
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index df71b31ffc..95280d87ce 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -15,31 +15,14 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/print.h"
-#include "nodes/relation.h"
-#include "nodes/makefuncs.h"
 
+#include "optimizer/clauses.h"
+#include "optimizer/paths.h"
 #include "optimizer/planmain.h"
-#include "optimizer/subselect.h"
-#include "optimizer/internal.h"
 #include "optimizer/prep.h"
-#include "optimizer/paths.h"
-#include "optimizer/clauses.h"
-#include "optimizer/keys.h"
+#include "optimizer/subselect.h"
 #include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/xfunc.h"
-#include "optimizer/cost.h"
-
-#include "tcop/dest.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
-#include "nodes/memnodes.h"
-#include "utils/mcxt.h"
-#include "utils/lsyscache.h"
+
 
 static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
 static Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index c4aeea1f28..0c13c49679 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -12,48 +12,27 @@
  *-------------------------------------------------------------------------
  */
 #include <sys/types.h>
-#include <string.h>
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "nodes/makefuncs.h"
-#include "catalog/pg_type.h"
-#include "parser/parse_expr.h"
-
-#include "utils/elog.h"
-#include "utils/lsyscache.h"
+#include "access/genam.h"
 #include "access/heapam.h"
-
+#include "catalog/pg_type.h"
+#include "executor/executor.h"
+#include "nodes/makefuncs.h"
+#include "optimizer/clauses.h"
 #include "optimizer/internal.h"
+#include "optimizer/planmain.h"
 #include "optimizer/planner.h"
-#include "optimizer/plancat.h"
 #include "optimizer/prep.h"
-#include "optimizer/planmain.h"
 #include "optimizer/subselect.h"
-#include "optimizer/paths.h"
-#include "optimizer/cost.h"
-
-/* DATA STRUCTURE CREATION/MANIPULATION ROUTINES */
-#include "nodes/relation.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/joininfo.h"
-#include "optimizer/keys.h"
-#include "optimizer/ordering.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-
-#include "executor/executor.h"
-
+#include "parser/parse_expr.h"
+#include "parser/parse_oper.h"
 #include "utils/builtins.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
-#include "access/genam.h"
-#include "parser/parse_oper.h"
 
 static List *make_subplanTargetList(Query *parse, List *tlist,
 					   AttrNumber **groupColIdx);
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 3ca060b5ac..fa5ae33870 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -15,23 +15,14 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
 
-#include "utils/elog.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/makefuncs.h"
 
-#include "optimizer/internal.h"
+#include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/keys.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
-#include "optimizer/tlist.h"
 
 static void set_join_tlist_references(Join *join);
 static void set_nonamescan_tlist_references(SeqScan *nonamescan);
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index f9ae74973f..6e44baccb6 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -13,22 +13,11 @@
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-#include "optimizer/subselect.h"
-#include "optimizer/planner.h"
-#include "optimizer/planmain.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
 #include "optimizer/clauses.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/cost.h"
+#include "optimizer/planner.h"
+#include "optimizer/subselect.h"
 
 int			PlannerQueryLevel;	/* level of current query */
 List	   *PlannerInitPlan;	/* init subplans for current query */
diff --git a/src/backend/optimizer/prep/prepkeyset.c b/src/backend/optimizer/prep/prepkeyset.c
index 914779b4f6..9a8ef5da4f 100644
--- a/src/backend/optimizer/prep/prepkeyset.c
+++ b/src/backend/optimizer/prep/prepkeyset.c
@@ -7,8 +7,6 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <stdio.h>
-#include <string.h>
 
 #include "postgres.h"
 #include "optimizer/planmain.h"
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index 491b070622..b69bedf4db 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -15,13 +15,11 @@
 
 #include "postgres.h"
 
-#include "nodes/pg_list.h"
-#include "nodes/makefuncs.h"
 
-#include "optimizer/internal.h"
+
+#include "nodes/makefuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/prep.h"
-
 #include "utils/lsyscache.h"
 
 static Expr *pull_args(Expr *qual);
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index cc2baebddf..46023aa886 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -11,29 +11,15 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
-
 #include "nodes/makefuncs.h"
-
-#include "utils/builtins.h"
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-#include "utils/palloc.h"
-#include "parser/parse_type.h"
-
-#include "parser/parsetree.h"	/* for getrelid() */
-
-#include "optimizer/internal.h"
-#include "optimizer/prep.h"
 #include "optimizer/clauses.h"
-#include "optimizer/tlist.h"
+#include "optimizer/prep.h"
+#include "parser/parsetree.h"
+#include "utils/lsyscache.h"
+#include "utils/syscache.h"
 
 static List *expand_targetlist(List *tlist, Oid relid, int command_type,
 				  Index result_relation);
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 446c759751..7251192db6 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -11,28 +11,17 @@
  *
  *-------------------------------------------------------------------------
  */
-#include <string.h>
 #include <sys/types.h>
 
 #include "postgres.h"
 
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
-
-#include "parser/parsetree.h"
-#include "parser/parse_clause.h"
-
-#include "utils/elog.h"
-#include "utils/lsyscache.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/prep.h"
 #include "optimizer/plancat.h"
-#include "optimizer/planner.h"
 #include "optimizer/planmain.h"
+#include "optimizer/planner.h"
+#include "optimizer/prep.h"
+#include "parser/parse_clause.h"
+#include "parser/parsetree.h"
+#include "utils/lsyscache.h"
 
 static List *plan_inherit_query(Relids relids, Index rt_index,
 				   RangeTblEntry *rt_entry, Query *parse, List *tlist,
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 26cc89b97a..90e17a46f1 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -18,23 +18,14 @@
 
 #include "postgres.h"
 
-#include <catalog/pg_operator.h>
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
+#include "catalog/pg_operator.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
-
-#include "catalog/pg_aggregate.h"
-
-#include "utils/syscache.h"
-#include "utils/lsyscache.h"
-
+#include "nodes/plannodes.h"
 #include "optimizer/clauses.h"
 #include "optimizer/internal.h"
 #include "optimizer/var.h"
-
+#include "utils/lsyscache.h"
 
 static bool fix_opid_walker(Node *node, void *context);
 
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 91fa77e743..cdc3bc43d3 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -15,13 +15,9 @@
 
 #include "postgres.h"
 
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
+#include "optimizer/pathnode.h"
 #include "optimizer/plancat.h"
-#include "optimizer/pathnode.h" /* where the decls go */
 
 
 static List *find_secondary_index(Query *root, Oid relid);
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index fb9796721d..4be7927f71 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -13,12 +13,9 @@
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/joininfo.h"
-#include "optimizer/var.h"
 #include "optimizer/clauses.h"
+#include "optimizer/joininfo.h"
 
 
 /*
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index e0362bd2bb..07d0d7668e 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -12,14 +12,8 @@
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "utils/elog.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/keys.h"
-#include "optimizer/tlist.h"
 
 
 static Expr *matching2_tlvar(int var, List *tlist, bool (*test) ());
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index ebb864d681..8e5146c3ae 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -15,7 +15,6 @@
 
 #include "postgres.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/ordering.h"
 
 static bool sortops_order_match(Oid *ordering1, Oid *ordering2,
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 59d55f967b..d74c44edfa 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -15,19 +15,14 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
-#include "utils/elog.h"
-
-#include "optimizer/internal.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/plancat.h"
 #include "optimizer/cost.h"
 #include "optimizer/keys.h"
-#include "optimizer/xfunc.h"
 #include "optimizer/ordering.h"
-
-#include "parser/parsetree.h"	/* for getrelid() */
+#include "optimizer/pathnode.h"
+#include "optimizer/paths.h"
+#include "optimizer/plancat.h"
+#include "optimizer/restrictinfo.h"
+#include "parser/parsetree.h"
 
 static Path *better_path(Path *new_path, List *unique_paths, bool *is_new);
 
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 7462fef6eb..cba39491c7 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -13,14 +13,10 @@
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
-
 #include "optimizer/internal.h"
-#include "optimizer/pathnode.h" /* where the decls go */
+#include "optimizer/pathnode.h" 
 #include "optimizer/plancat.h"
 
-
-
 /*
  * get_base_rel
  *	  Returns relation entry corresponding to 'relid', creating a new one if
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 4b98bc2917..9d783ea564 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -13,11 +13,9 @@
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
 #include "nodes/nodeFuncs.h"
-
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
+#include "optimizer/internal.h" 
 #include "optimizer/restrictinfo.h"
 
 /*
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 55bf58c973..61ed76ec13 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -13,19 +13,13 @@
  */
 #include "postgres.h"
 
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodeFuncs.h"
-#include "utils/elog.h"
-#include "utils/lsyscache.h"
 
-#include "optimizer/internal.h"
-#include "optimizer/var.h"
-#include "optimizer/tlist.h"
-#include "optimizer/clauses.h"
 
 #include "nodes/makefuncs.h"
+#include "nodes/nodeFuncs.h"
+#include "optimizer/clauses.h"
+#include "optimizer/tlist.h"
+#include "optimizer/var.h"
 
 static Node *flatten_tlistentry(Node *tlistentry, List *flat_tlist);
 
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index f1740b90b5..733452a352 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -15,16 +15,10 @@
 
 #include "postgres.h"
 
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/nodeFuncs.h"
 
-#include "optimizer/internal.h"
 #include "optimizer/clauses.h"
 #include "optimizer/var.h"
 
-#include "parser/parsetree.h"
 
 
 static bool pull_varnos_walker(Node *node, List **listptr);
-- 
2.39.5