Clean up #include in /include directory. Add scripts for checking includes.

22 files changed, 27 insertions, 66 deletions

diff --git a/src/include/executor/execFlatten.h b/src/include/executor/execFlatten.h
index be72695412a..e7df6135d0c 100644
--- a/src/include/executor/execFlatten.h
+++ b/src/include/executor/execFlatten.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execFlatten.h,v 1.8 1999/02/13 23:21:22 momjian Exp $
+ * $Id: execFlatten.h,v 1.9 1999/07/15 15:21:04 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include "nodes/relation.h"
 #include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
 
 extern Datum ExecEvalIter(Iter *iterNode, ExprContext *econtext, bool *resultIsNull, bool *iterIsDone);
 
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index 14aacc8bd3a..cd67bd3f32a 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execdebug.h,v 1.9 1999/07/14 01:20:16 momjian Exp $
+ * $Id: execdebug.h,v 1.10 1999/07/15 15:21:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECDEBUG_H
 #define EXECDEBUG_H
 
+#include <nodes/print.h>
+
 /* ----------------------------------------------------------------
  *		debugging defines.
  *
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 43c1eb53cfc..e979441a15b 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.34 1999/06/17 15:15:53 momjian Exp $
+ * $Id: executor.h,v 1.35 1999/07/15 15:21:06 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECUTOR_H
 #define EXECUTOR_H
 
-#include <catalog/pg_index.h>
-#include <storage/bufmgr.h>
-#include <access/itup.h>
 #include <stdio.h>
 #include <executor/execdesc.h>
 
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 48a3d63fe3d..4cc3a471c7e 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: functions.h,v 1.9 1999/02/13 23:21:24 momjian Exp $
+ * $Id: functions.h,v 1.10 1999/07/15 15:21:07 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,
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index e98c99d99fb..724a7ddd313 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hashjoin.h,v 1.13 1999/05/25 22:42:45 momjian Exp $
+ * $Id: hashjoin.h,v 1.14 1999/07/15 15:21:08 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define HASHJOIN_H
 
 #include "access/htup.h"
-#include "storage/fd.h"
-#include "utils/mcxt.h"
 
 /* ----------------------------------------------------------------
  *				hash-join hash table structures
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index 5462f31c64d..7ee15e47486 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAgg.h,v 1.9 1999/02/13 23:21:24 momjian Exp $
+ * $Id: nodeAgg.h,v 1.10 1999/07/15 15:21:09 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);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 6bc60806544..34212d22df1 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeAppend.h,v 1.10 1999/02/13 23:21:25 momjian Exp $
+ * $Id: nodeAppend.h,v 1.11 1999/07/15 15:21:10 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);
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index 9be307b2a23..ee740efcd80 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeGroup.h,v 1.11 1999/07/13 21:17:37 momjian Exp $
+ * $Id: nodeGroup.h,v 1.12 1999/07/15 15:21:11 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);
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 4544d6416e3..605ab0b126b 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -6,19 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHash.h,v 1.13 1999/05/25 16:13:55 momjian Exp $
+ * $Id: nodeHash.h,v 1.14 1999/07/15 15:21:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEHASH_H
 #define NODEHASH_H
 
-#include "executor/hashjoin.h"
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/plannodes.h"
-#include "utils/syscache.h"
 
 extern TupleTableSlot *ExecHash(Hash *node);
 extern bool ExecInitHash(Hash *node, EState *estate, Plan *parent);
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 336e9b4d1f6..2061ac7bdca 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeHashjoin.h,v 1.14 1999/05/25 22:42:46 momjian Exp $
+ * $Id: nodeHashjoin.h,v 1.15 1999/07/15 15:21:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define NODEHASHJOIN_H
 
 #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);
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 2d959a8ca84..d8b284f8d53 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeIndexscan.h,v 1.8 1999/02/13 23:21:26 momjian Exp $
+ * $Id: nodeIndexscan.h,v 1.9 1999/07/15 15:21:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEINDEXSCAN_H
 #define NODEINDEXSCAN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecIndexScan(IndexScan *node);
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index fddc4d1edbe..f10b252c1cd 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMaterial.h,v 1.10 1999/02/21 03:49:44 scrappy Exp $
+ * $Id: nodeMaterial.h,v 1.11 1999/07/15 15:21:13 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);
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index 779408df65e..27078d5a39c 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeMergejoin.h,v 1.10 1999/02/13 23:21:26 momjian Exp $
+ * $Id: nodeMergejoin.h,v 1.11 1999/07/15 15:21:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEMERGEJOIN_H
 #define NODEMERGEJOIN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern TupleTableSlot *ExecMergeJoin(MergeJoin *node);
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 7a701896725..f0a11d01008 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeNestloop.h,v 1.10 1999/05/25 16:13:56 momjian Exp $
+ * $Id: nodeNestloop.h,v 1.11 1999/07/15 15:21:13 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);
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index c5ad4ea715c..506e6e580d3 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeResult.h,v 1.8 1999/02/13 23:21:27 momjian Exp $
+ * $Id: nodeResult.h,v 1.9 1999/07/15 15:21:14 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);
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index d8586784716..a2358c4aa61 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSeqscan.h,v 1.8 1999/02/13 23:21:28 momjian Exp $
+ * $Id: nodeSeqscan.h,v 1.9 1999/07/15 15:21:14 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);
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index 590f49dfd28..a8c8f99c62e 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeSort.h,v 1.8 1999/02/13 23:21:28 momjian Exp $
+ * $Id: nodeSort.h,v 1.9 1999/07/15 15:21:14 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);
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index b74fbc00af8..98251c24872 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -7,8 +7,6 @@
 #ifndef NODESUBPLAN_H
 #define NODESUBPLAN_H
 
-#include "executor/tuptable.h"
-#include "nodes/execnodes.h"
 #include "nodes/plannodes.h"
 
 extern Datum ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext);
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index cece9f3f936..f5355b5d32e 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeUnique.h,v 1.8 1999/02/13 23:21:29 momjian Exp $
+ * $Id: nodeUnique.h,v 1.9 1999/07/15 15:21:14 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);
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index ea9bda89b85..80af87f16a4 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -10,6 +10,11 @@
 
 #include <string.h>
 #include "postgres.h"
+
+/*
+ *	These are not needed by this file, but used by other programs
+ *	using SPI
+ */
 #include "nodes/primnodes.h"
 #include "nodes/relation.h"
 #include "nodes/execnodes.h"
@@ -23,10 +28,7 @@
 #include "nodes/params.h"
 #include "utils/fcache.h"
 #include "utils/datum.h"
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/syscache.h"
-#include "utils/mcxt.h"
 #include "utils/portal.h"
 #include "utils/builtins.h"
 #include "catalog/pg_language.h"
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index 3e7988aa09e..916d7141d28 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -3,7 +3,7 @@
  * spi.c
  *				Server Programming Interface private declarations
  *
- * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.5 1999/07/14 01:20:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/executor/spi_priv.h,v 1.6 1999/07/15 15:21:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -11,8 +11,6 @@
 #define SPI_PRIV_H
 
 #include "executor/spi.h"
-#include "catalog/pg_type.h"
-#include "access/printtup.h"
 
 typedef struct
 {
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index de582ba387c..ad6390fa203 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.12 1999/05/25 16:13:58 momjian Exp $
+ * $Id: tuptable.h,v 1.13 1999/07/15 15:21:14 momjian Exp $
  *
  * NOTES
  *	  The tuple table interface is getting pretty ugly.
@@ -17,8 +17,6 @@
 #ifndef TUPTABLE_H
 #define TUPTABLE_H
 
-#include <storage/buf.h>
-#include <access/tupdesc.h>
 #include <access/htup.h>
 
 /* ----------------