19 files changed, 20 insertions, 20 deletions
diff --git a/src/include/optimizer/appendinfo.h b/src/include/optimizer/appendinfo.h
index 604e36d73cb..790914c1b07 100644
--- a/src/include/optimizer/appendinfo.h
+++ b/src/include/optimizer/appendinfo.h
@@ -14,7 +14,7 @@
 #ifndef APPENDINFO_H
 #define APPENDINFO_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 #include "utils/relcache.h"
 
 extern AppendRelInfo *make_append_rel_info(Relation parentrel,
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index cfedd424ced..23073c0402d 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -15,7 +15,7 @@
 #define CLAUSES_H
 
 #include "access/htup.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 typedef struct
 {
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 48efbe58f7f..ac6de0f6bec 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -14,8 +14,8 @@
 #ifndef COST_H
 #define COST_H
 
+#include "nodes/pathnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 
 /* defaults for costsize.c's Cost parameters */
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index dc88fbbc1ba..5b3327665e9 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -22,7 +22,7 @@
 #ifndef GEQO_H
 #define GEQO_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 #include "optimizer/geqo_gene.h"
 
 
diff --git a/src/include/optimizer/inherit.h b/src/include/optimizer/inherit.h
index b2687abd4e0..d2418f15cfa 100644
--- a/src/include/optimizer/inherit.h
+++ b/src/include/optimizer/inherit.h
@@ -14,7 +14,7 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 extern void expand_inherited_tables(PlannerInfo *root);
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 65981743314..c6e4be6cf4e 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -14,7 +14,7 @@
 #ifndef JOININFO_H
 #define JOININFO_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 extern bool have_relevant_joinclause(PlannerInfo *root,
diff --git a/src/include/optimizer/optimizer.h b/src/include/optimizer/optimizer.h
index 1cd5c80e768..ffaf5b9450b 100644
--- a/src/include/optimizer/optimizer.h
+++ b/src/include/optimizer/optimizer.h
@@ -25,10 +25,10 @@
 #include "nodes/parsenodes.h"
 
 /*
- * We don't want to include nodes/relation.h here, because non-planner
+ * We don't want to include nodes/pathnodes.h here, because non-planner
  * code should generally treat PlannerInfo as an opaque typedef.
  * But we'd like such code to use that typedef name, so define the
- * typedef either here or in relation.h, whichever is read first.
+ * typedef either here or in pathnodes.h, whichever is read first.
  */
 #ifndef HAVE_PLANNERINFO_TYPEDEF
 typedef struct PlannerInfo PlannerInfo;
diff --git a/src/include/optimizer/orclauses.h b/src/include/optimizer/orclauses.h
index 8ccb98e5678..b5279001896 100644
--- a/src/include/optimizer/orclauses.h
+++ b/src/include/optimizer/orclauses.h
@@ -14,7 +14,7 @@
 #ifndef ORCLAUSES_H
 #define ORCLAUSES_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 extern void extract_restriction_or_clauses(PlannerInfo *root);
 
diff --git a/src/include/optimizer/paramassign.h b/src/include/optimizer/paramassign.h
index d18c85c938b..e18f420eb40 100644
--- a/src/include/optimizer/paramassign.h
+++ b/src/include/optimizer/paramassign.h
@@ -13,7 +13,7 @@
 #ifndef PARAMASSIGN_H
 #define PARAMASSIGN_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 extern Param *replace_outer_var(PlannerInfo *root, Var *var);
 extern Param *replace_outer_placeholdervar(PlannerInfo *root,
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index aaaf3f4ff50..d0c8f99d0a5 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -15,7 +15,7 @@
 #define PATHNODE_H
 
 #include "nodes/bitmapset.h"
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 /*
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 666217c1895..1b02b3b889f 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -14,7 +14,7 @@
 #ifndef PATHS_H
 #define PATHS_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 /*
diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h
index c7764a72263..86a1e5d039d 100644
--- a/src/include/optimizer/placeholder.h
+++ b/src/include/optimizer/placeholder.h
@@ -14,7 +14,7 @@
 #ifndef PLACEHOLDER_H
 #define PLACEHOLDER_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 extern PlaceHolderVar *make_placeholder_expr(PlannerInfo *root, Expr *expr,
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index a1b23251a11..40f70f9f2b1 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -14,7 +14,7 @@
 #ifndef PLANCAT_H
 #define PLANCAT_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 #include "utils/relcache.h"
 
 /* Hook for plugins to get control in get_relation_info() */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index b2e1c077320..3bbdb5e2f74 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -14,8 +14,8 @@
 #ifndef PLANMAIN_H
 #define PLANMAIN_H
 
+#include "nodes/pathnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 /* GUC parameters */
 #define DEFAULT_CURSOR_TUPLE_FRACTION 0.1
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 769a2f8e011..cb41e409dc3 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -18,8 +18,8 @@
 #ifndef PLANNER_H
 #define PLANNER_H
 
+#include "nodes/pathnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 
 /* Hook for plugins to get control in planner() */
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index 5277e990ed9..a9b2c9026cb 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -14,8 +14,8 @@
 #ifndef PREP_H
 #define PREP_H
 
+#include "nodes/pathnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 
 /*
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index bca480f446f..feeaf0e674e 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -14,7 +14,7 @@
 #ifndef RESTRICTINFO_H
 #define RESTRICTINFO_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 /* Convenience macro for the common case of a valid-everywhere qual */
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 22959ff4238..2d2c3bcbc06 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -13,8 +13,8 @@
 #ifndef SUBSELECT_H
 #define SUBSELECT_H
 
+#include "nodes/pathnodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/relation.h"
 
 extern void SS_process_ctes(PlannerInfo *root);
 extern JoinExpr *convert_ANY_sublink_to_join(PlannerInfo *root,
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 13ac7b88b46..58db79203bc 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -14,7 +14,7 @@
 #ifndef TLIST_H
 #define TLIST_H
 
-#include "nodes/relation.h"
+#include "nodes/pathnodes.h"
 
 
 extern TargetEntry *tlist_member(Expr *node, List *targetlist);