Cleanup up include files.

15 files changed, 76 insertions, 30 deletions

diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index 8dc8236e22e..3ecb90810b0 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.5 1997/09/08 21:51:49 momjian Exp $
+ * $Id: execFlatten.h,v 1.6 1997/11/26 01:12:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECFLATTEN_H
 #define EXECFLATTEN_H
 
+#include "nodes/relation.h"
+#include "nodes/execnodes.h"
+#include "nodes/parsenodes.h"
+
 extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone);
 
 extern void ExecEvalFjoin(TargetEntry *tlist, ExprContext *econtext, bool *isNullVect, bool *fj_isDone);
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index a1bed2a7385..c6ca0829711 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,13 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: functions.h,v 1.4 1997/09/08 21:51:59 momjian Exp $
+ * $Id: functions.h,v 1.5 1997/11/26 01:12:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef FUNCTIONS_H
 #define FUNCTIONS_H
 
+#include "access/tupdesc.h"
+#include "nodes/parsenodes.h"
+#include "nodes/primnodes.h"
+#include "utils/syscache.h"
+
 extern Datum
 ProjectAttribute(TupleDesc TD, TargetEntry *tlist,
 				 HeapTuple tup, bool *isnullP);
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index c752c6ce176..69f791b9c9a 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.5 1997/09/08 21:52:01 momjian Exp $
+ * $Id: nodeAgg.h,v 1.6 1997/11/26 01:12:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAGG_H
 #define NODEAGG_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecAgg(Agg *node);
 extern bool ExecInitAgg(Agg *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsAgg(Agg *node);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index c0aa2d1c753..335cf4a33a8 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.6 1997/09/08 21:52:02 momjian Exp $
+ * $Id: nodeAppend.h,v 1.7 1997/11/26 01:12:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern bool ExecInitAppend(Append *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsAppend(Append *node);
 extern TupleTableSlot *ExecProcAppend(Append *node);
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index 294f59103b2..97ded95c947 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeGroup.h,v 1.4 1997/09/08 21:52:02 momjian Exp $
+ * $Id: nodeGroup.h,v 1.5 1997/11/26 01:12:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEGROUP_H
 #define NODEGROUP_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecGroup(Group *node);
 extern bool ExecInitGroup(Group *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsGroup(Group *node);
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 96ed987718a..3a34a70973d 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,21 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.5 1997/09/08 21:52:05 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.6 1997/11/26 01:12:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEHASHJOIN_H
 #define NODEHASHJOIN_H
 
-extern TupleTableSlot *ExecHashJoin(HashJoin *node);
+#include "nodes/plannodes.h"
+#include "nodes/execnodes.h"
+#include "utils/syscache.h"
 
+extern TupleTableSlot *ExecHashJoin(HashJoin *node);
 extern bool ExecInitHashJoin(HashJoin *node, EState *estate, Plan *parent);
-
 extern int	ExecCountSlotsHashJoin(HashJoin *node);
-
 extern void ExecEndHashJoin(HashJoin *node);
-
 extern char *
 ExecHashJoinSaveTuple(HeapTuple heapTuple, char *buffer,
 					  File file, char *position);
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 5b149d8aed8..1e13cc9666b 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,29 +6,25 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeIndexscan.h,v 1.5 1997/09/08 21:52:06 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.6 1997/11/26 01:12:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEINDEXSCAN_H
 #define NODEINDEXSCAN_H
 
-extern TupleTableSlot *ExecIndexScan(IndexScan *node);
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
 
+extern TupleTableSlot *ExecIndexScan(IndexScan *node);
 extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent);
-
 extern void ExecEndIndexScan(IndexScan *node);
-
 extern void ExecIndexMarkPos(IndexScan *node);
-
 extern void ExecIndexRestrPos(IndexScan *node);
-
 extern void ExecUpdateIndexScanKeys(IndexScan *node, ExprContext *econtext);
-
 extern bool ExecInitIndexScan(IndexScan *node, EState *estate, Plan *parent);
-
 extern int	ExecCountSlotsIndexScan(IndexScan *node);
-
 extern void ExecIndexReScan(IndexScan *node, ExprContext *exprCtxt, Plan *parent);
 
 #endif							/* NODEINDEXSCAN_H */
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index 98daa35f319..de010d3ab21 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.4 1997/09/08 21:52:07 momjian Exp $
+ * $Id: nodeMaterial.h,v 1.5 1997/11/26 01:12:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMATERIAL_H
 #define NODEMATERIAL_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecMaterial(Material *node);
 extern bool ExecInitMaterial(Material *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsMaterial(Material *node);
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 96a74e0fc9d..1f8e774c1c5 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,19 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMergejoin.h,v 1.6 1997/09/08 21:52:09 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.7 1997/11/26 01:12:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMERGEJOIN_H
 #define NODEMERGEJOIN_H
 
-extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
 
+extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
 extern bool ExecInitMergeJoin(MergeJoin *node, EState *estate, Plan *parent);
-
 extern int	ExecCountSlotsMergeJoin(MergeJoin *node);
-
 extern void ExecEndMergeJoin(MergeJoin *node);
 
 #endif							/* NODEMERGEJOIN_H; */
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 2c4fa13fe1b..ec08d3a9ed8 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeNestloop.h,v 1.4 1997/09/08 21:52:10 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.5 1997/11/26 01:12:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODENESTLOOP_H
 #define NODENESTLOOP_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecNestLoop(NestLoop *node, Plan *parent);
 extern bool ExecInitNestLoop(NestLoop *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsNestLoop(NestLoop *node);
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index c66e069f468..e3ebe2241e6 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeResult.h,v 1.4 1997/09/08 21:52:11 momjian Exp $
+ * $Id: nodeResult.h,v 1.5 1997/11/26 01:12:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODERESULT_H
 #define NODERESULT_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecResult(Result *node);
 extern bool ExecInitResult(Result *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsResult(Result *node);
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index d6afe03ac93..2c980d8eaad 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSeqscan.h,v 1.5 1997/09/08 21:52:12 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.6 1997/11/26 01:13:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODESEQSCAN_H
 #define NODESEQSCAN_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecSeqScan(SeqScan *node);
 extern bool ExecInitSeqScan(SeqScan *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsSeqScan(SeqScan *node);
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 69b4dbe9a86..a69b15c6751 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSort.h,v 1.4 1997/09/08 21:52:12 momjian Exp $
+ * $Id: nodeSort.h,v 1.5 1997/11/26 01:13:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODESORT_H
 #define NODESORT_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecSort(Sort *node);
 extern bool ExecInitSort(Sort *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsSort(Sort *node);
diff --git a/src/include/executor/nodeTee.h b/src/include/executor/nodeTee.h
index c4a603aa3a9..d58b0b1cf6d 100644
--- a/src/include/executor/nodeTee.h
+++ b/src/include/executor/nodeTee.h
@@ -5,7 +5,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeTee.h,v 1.4 1997/09/08 21:52:13 momjian Exp $
+ * $Id: nodeTee.h,v 1.5 1997/11/26 01:13:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -13,6 +13,10 @@
 #ifndef NODETEE_H
 #define NODETEE_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecTee(Tee *node, Plan *parent);
 extern bool ExecInitTee(Tee *node, EState *estate, Plan *parent);
 extern void ExecTeeReScan(Tee *node, ExprContext *exprCtxt, Plan *parent);
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 61ab85828cf..65b210c1d27 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -6,13 +6,17 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeUnique.h,v 1.4 1997/09/08 21:52:14 momjian Exp $
+ * $Id: nodeUnique.h,v 1.5 1997/11/26 01:13:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEUNIQUE_H
 #define NODEUNIQUE_H
 
+#include "executor/tuptable.h"
+#include "nodes/execnodes.h"
+#include "nodes/plannodes.h"
+
 extern TupleTableSlot *ExecUnique(Unique *node);
 extern bool ExecInitUnique(Unique *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsUnique(Unique *node);