18 files changed, 27 insertions, 48 deletions
diff --git a/src/include/optimizer/xfunc.h b/src/include/optimizer/_deadcode/xfunc.h
index 41414dba4d..d925be5630 100644
--- a/src/include/optimizer/xfunc.h
+++ b/src/include/optimizer/_deadcode/xfunc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xfunc.h,v 1.18 1999/05/25 22:43:14 momjian Exp $
+ * $Id: xfunc.h,v 1.1 1999/07/15 15:21:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -33,12 +33,6 @@
 
 extern int	XfuncMode;			/* defined in tcop/postgres.c */
 
-/* defaults for function attributes used for expensive function calculations */
-#define BYTE_PCT 100
-#define PERBYTE_CPU 0
-#define PERCALL_CPU 0
-#define OUTIN_RATIO 100
-
 /* default width assumed for variable length attributes */
 #define VARLEN_DEFAULT 128;
 
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index 3cd74b1e25..1416cc2545 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: clauses.h,v 1.19 1999/06/19 03:41:44 tgl Exp $
+ * $Id: clauses.h,v 1.20 1999/07/15 15:21:19 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef CLAUSES_H
 #define CLAUSES_H
 
-#include <nodes/primnodes.h>
 #include <nodes/relation.h>
 
 extern Expr *make_clause(int type, Node *oper, List *args);
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index e7f8452f24..b9fc710370 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -6,18 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.20 1999/05/25 22:43:04 momjian Exp $
+ * $Id: cost.h,v 1.21 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef COST_H
 #define COST_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
+/* defaults for function attributes used for expensive function calculations */
+#define BYTE_PCT 100
+#define PERBYTE_CPU 0
+#define PERCALL_CPU 0
+#define OUTIN_RATIO 100
+
 /*
  * prototypes for costsize.c
  *	  routines to compute costs and sizes
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index f02510e21e..1558bd6a99 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo.h,v 1.16 1999/05/25 22:43:05 momjian Exp $
+ * $Id: geqo.h,v 1.17 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -21,8 +21,6 @@
 #ifndef GEQO_H
 #define GEQO_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 #include "optimizer/geqo_gene.h"
 
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 00b5b9385e..d8d4e8ff56 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_gene.h,v 1.7 1999/02/13 23:21:45 momjian Exp $
+ * $Id: geqo_gene.h,v 1.8 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,8 +23,6 @@
 #define GEQO_GENE_H
 
 #include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "optimizer/geqo_gene.h"
 
 /* we presume that int instead of Relid
    is o.k. for Gene; so don't change it! */
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 9fadc318d4..abb6398a70 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_misc.h,v 1.11 1999/05/25 22:43:07 momjian Exp $
+ * $Id: geqo_misc.h,v 1.12 1999/07/15 15:21:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,9 +23,8 @@
 
 #include <stdio.h>
 
-#include "nodes/parsenodes.h"
-#include "optimizer/geqo_gene.h"
 #include "optimizer/geqo_recombination.h"
+#include "nodes/relation.h"
 
 extern void print_pool(FILE *fp, Pool *pool, int start, int stop);
 extern void print_gen(FILE *fp, Pool *pool, int generation);
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index f8e047c888..3d6f2aa7df 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: geqo_pool.h,v 1.7 1999/02/13 23:21:47 momjian Exp $
+ * $Id: geqo_pool.h,v 1.8 1999/07/15 15:21:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -23,6 +23,7 @@
 #define GEQO_POOL_H
 
 #include "optimizer/geqo_gene.h"
+#include "nodes/parsenodes.h"
 
 extern Pool *alloc_pool(int pool_size, int string_length);
 extern void free_pool(Pool *pool);
diff --git a/src/include/optimizer/internal.h b/src/include/optimizer/internal.h
index 3812d421f9..faa573bbe7 100644
--- a/src/include/optimizer/internal.h
+++ b/src/include/optimizer/internal.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: internal.h,v 1.21 1999/07/07 09:27:28 momjian Exp $
+ * $Id: internal.h,v 1.22 1999/07/15 15:21:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef INTERNAL_H
 #define INTERNAL_H
 
+#include "catalog/pg_index.h"
+
 /*
  *		---------- SHARED MACROS
  *
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 3a4451dd35..ac72326184 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.12 1999/05/25 22:43:08 momjian Exp $
+ * $Id: joininfo.h,v 1.13 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef JOININFO_H
 #define JOININFO_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "nodes/primnodes.h"
 
 extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
diff --git a/src/include/optimizer/keys.h b/src/include/optimizer/keys.h
index 423b8e4216..67910c283f 100644
--- a/src/include/optimizer/keys.h
+++ b/src/include/optimizer/keys.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: keys.h,v 1.15 1999/05/25 22:43:09 momjian Exp $
+ * $Id: keys.h,v 1.16 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef KEYS_H
 #define KEYS_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
 
 extern bool match_indexkey_operand(int indexkey, Var *operand, RelOptInfo *rel);
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index d7019fc446..0860ab7f18 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pathnode.h,v 1.17 1999/05/25 22:43:10 momjian Exp $
+ * $Id: pathnode.h,v 1.18 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHNODE_H
 #define PATHNODE_H
 
-#include "nodes/nodes.h"
 #include "nodes/relation.h"
-#include "nodes/parsenodes.h"
 
 /*
  * prototypes for pathnode.c
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index ee39919245..a26085d05e 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -7,15 +7,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: paths.h,v 1.30 1999/05/26 12:56:35 momjian Exp $
+ * $Id: paths.h,v 1.31 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PATHS_H
 #define PATHS_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 /*
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 96bf3ebfc1..9e37617446 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.28 1999/06/06 17:38:09 tgl Exp $
+ * $Id: planmain.h,v 1.29 1999/07/15 15:21:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANMAIN_H
 #define PLANMAIN_H
 
-#include "nodes/nodes.h"
 #include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 /*
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 6bad60b6ad..a8f85001e6 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planner.h,v 1.11 1999/05/13 07:29:11 tgl Exp $
+ * $Id: planner.h,v 1.12 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,6 @@
 
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
-#include "parser/parse_node.h"
 
 extern Plan *planner(Query *parse);
 extern Plan *union_planner(Query *parse);
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index 0d1e741bc2..2f5c4dca20 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: restrictinfo.h,v 1.4 1999/05/25 22:43:12 momjian Exp $
+ * $Id: restrictinfo.h,v 1.5 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RESTRICTINFO_H
 #define RESTRICTINFO_H
 
-#include "nodes/pg_list.h"
 #include "nodes/relation.h"
 
 extern bool valid_or_clause(RestrictInfo *restrictinfo);
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index 5e9e16e51d..d4970e4848 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -7,7 +7,6 @@
 #ifndef SUBSELECT_H
 #define SUBSELECT_H
 
-#include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
 
 extern int	PlannerQueryLevel;	/* level of current query */
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index de57eb59dd..860b077de2 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.18 1999/05/25 22:43:13 momjian Exp $
+ * $Id: tlist.h,v 1.19 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TLIST_H
 #define TLIST_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "nodes/relation.h"
 
 extern TargetEntry *tlistentry_member(Var *var, List *targetlist);
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index e903025bed..16f9f4f663 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: var.h,v 1.7 1999/02/13 23:21:54 momjian Exp $
+ * $Id: var.h,v 1.8 1999/07/15 15:21:23 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef VAR_H
 #define VAR_H
 
-#include "nodes/nodes.h"
 #include "nodes/primnodes.h"
 
 extern List *pull_varnos(Node *me);