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

src/include/access/gist.h

@@ -16,12 +16,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <storage/page.h>
-#include <storage/block.h>
-#include <utils/rel.h>
-#include <storage/off.h>
-
-#include <fmgr.h>
 
 /*
 ** You can have as many strategies as you please in GiSTs, as

src/include/access/gistscan.h

@@ -12,9 +12,6 @@
 #ifndef GISTSCAN_H
 
 #include <access/relscan.h>
-#include <storage/off.h>
-#include <storage/block.h>
-#include <utils/rel.h>
 
 extern IndexScanDesc gistbeginscan(Relation r, bool fromEnd,
 			  uint16 nkeys, ScanKey key);

src/include/access/giststrat.h

@@ -12,7 +12,6 @@
 #ifndef GISTSTRAT_H
 #define GISTSTRAT_H
 
-#include <access/strat.h>
 #include <utils/rel.h>
 
 extern StrategyNumber RelationGetGISTStrategy(Relation r,

src/include/access/hash.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hash.h,v 1.24 1999/05/25 22:42:30 momjian Exp $
+ * $Id: hash.h,v 1.25 1999/07/15 15:20:53 momjian Exp $
  *
  * NOTES
  *		modeled after Margo Seltzer's hash implementation for unix.
@@ -18,7 +18,6 @@
 
 #include <access/sdir.h>
 #include <access/funcindex.h>
-#include <storage/bufpage.h>
 #include <access/relscan.h>
 #include <access/itup.h>
 #include <utils/int8.h>

src/include/access/heapam.h

@@ -6,20 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: heapam.h,v 1.43 1999/07/10 22:06:26 tgl Exp $
+ * $Id: heapam.h,v 1.44 1999/07/15 15:20:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HEAPAM_H
 #define HEAPAM_H
 
+#include <time.h>
 #include "access/tupmacs.h"
 #include "access/htup.h"
 #include "access/relscan.h"
 #include "storage/block.h"
 #include "utils/rel.h"
 #include "utils/tqual.h"
-#include <time.h>
 
 /* ----------------------------------------------------------------
  *				heap access method statistics

src/include/access/hio.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: hio.h,v 1.11 1999/05/25 16:13:29 momjian Exp $
+ * $Id: hio.h,v 1.12 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,8 +14,6 @@
 #define HIO_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
-
 
 extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
 					 HeapTuple tuple);

src/include/access/htup.h

@@ -1,4 +1,4 @@
-/*-------------------------------------------------------------------------
+ /*-------------------------------------------------------------------------
  *
  * htup.h
  *	  POSTGRES heap tuple definitions.
@@ -6,17 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: htup.h,v 1.22 1999/07/12 13:32:38 momjian Exp $
+ * $Id: htup.h,v 1.23 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef HTUP_H
 #define HTUP_H
 
-#include <utils/nabstime.h>
 #include <storage/bufpage.h>
-#include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MinHeapTupleBitmapSize	32		/* 8 * 4 */
 

src/include/access/istrat.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.13 1999/05/25 16:13:32 momjian Exp $
+ * $Id: istrat.h,v 1.14 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define ISTRAT_H
 
 #include <utils/rel.h>
-#include <access/strat.h>
 
 /*
  * StrategyNumberIsValid

src/include/access/itup.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itup.h,v 1.17 1999/02/13 23:20:55 momjian Exp $
+ * $Id: itup.h,v 1.18 1999/07/15 15:20:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <access/tupmacs.h>
 #include <access/tupdesc.h>
 #include <storage/itemptr.h>
-#include <utils/memutils.h>
 
 #define MaxIndexAttributeNumber 7
 

src/include/access/nbtree.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.27 1999/05/25 22:04:55 momjian Exp $
+ * $Id: nbtree.h,v 1.28 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,13 +15,8 @@
 
 #include <access/sdir.h>
 #include <access/relscan.h>
-#include <storage/itemid.h>
-#include <storage/page.h>
 #include <access/funcindex.h>
 #include <access/itup.h>
-#include <storage/bufmgr.h>		/* don't remove, required by
-								 * BT_READ/BT_WRITE */
-#include <storage/itemptr.h>
 
 /*
  *	BTPageOpaqueData -- At the end of every page, we store a pointer

src/include/access/relscan.h

@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relscan.h,v 1.15 1999/05/25 16:13:33 momjian Exp $
+ * $Id: relscan.h,v 1.16 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef RELSCAN_H
 #define RELSCAN_H
 
-#include <storage/buf.h>
-#include <utils/rel.h>
-#include <access/htup.h>
 #include <utils/tqual.h>
 
 typedef ItemPointerData MarkData;

src/include/access/rtree.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtree.h,v 1.14 1999/02/13 23:20:57 momjian Exp $
+ * $Id: rtree.h,v 1.15 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,10 +17,6 @@
 #include <access/itup.h>
 #include <access/relscan.h>
 #include <access/sdir.h>
-#include <access/skey.h>
-#include <access/strat.h>
-#include <storage/block.h>
-#include <storage/off.h>
 
 /* see rtstrat.c for what all this is about */
 #define RTNStrategies					8

src/include/access/rtstrat.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rtstrat.h,v 1.9 1999/02/13 23:20:58 momjian Exp $
+ * $Id: rtstrat.h,v 1.10 1999/07/15 15:20:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RTSTRAT_H
 
 #include <utils/rel.h>
-#include <access/attnum.h>
 
 extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
 			  RegProcedure proc);

src/include/access/tupmacs.h

@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tupmacs.h,v 1.10 1999/05/25 16:13:36 momjian Exp $
+ * $Id: tupmacs.h,v 1.11 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef TUPMACS_H
 #define TUPMACS_H
 
+#include "utils/memutils.h"
+
 /*
  * check to see if the ATT'th bit of an array of 8-bit bytes is set.
  */

src/include/access/xact.h

@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.20 1999/02/13 23:21:00 momjian Exp $
+ * $Id: xact.h,v 1.21 1999/07/15 15:20:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef XACT_H
 #define XACT_H
 
-#include <access/transam.h>
 #include <utils/nabstime.h>
+#include <access/transam.h>
 
 /* ----------------
  *		transaction state structure

src/include/catalog/index.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.16 1999/05/25 16:13:40 momjian Exp $
+ * $Id: index.h,v 1.17 1999/07/15 15:20:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,9 +14,7 @@
 #define INDEX_H
 
 #include <nodes/execnodes.h>
-#include <nodes/parsenodes.h>
 #include <access/itup.h>
-#include <access/funcindex.h>
 
 extern Form_pg_am AccessMethodObjectIdGetForm(Oid accessMethodObjectId);
 

src/include/catalog/indexing.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: indexing.h,v 1.19 1999/02/13 23:21:03 momjian Exp $
+ * $Id: indexing.h,v 1.20 1999/07/15 15:20:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 #define INDEXING_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
 
 /*
  * Some definitions for indices on pg_attribute

src/include/commands/dbcommands.h

@@ -6,14 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dbcommands.h,v 1.9 1999/07/14 01:20:12 momjian Exp $
+ * $Id: dbcommands.h,v 1.10 1999/07/15 15:21:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DBCOMMANDS_H
 #define DBCOMMANDS_H
 
+#include <signal.h>
 #include "tcop/dest.h"
+
 /*
  * Originally from tmp/daemon.h. The functions declared in daemon.h does not
  * exist; hence removed.		-- AY 7/29/94

src/include/commands/trigger.h

@@ -9,11 +9,8 @@
 #ifndef TRIGGER_H
 #define TRIGGER_H
 
-#include "access/tupdesc.h"
-#include "access/htup.h"
 #include "nodes/parsenodes.h"
 #include "nodes/execnodes.h"
-#include "utils/rel.h"
 
 typedef uint32 TriggerEvent;
 

src/include/commands/vacuum.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: vacuum.h,v 1.21 1999/07/14 01:20:15 momjian Exp $
+ * $Id: vacuum.h,v 1.22 1999/07/15 15:21:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,9 +18,7 @@
 #include "catalog/pg_index.h"
 #include "catalog/pg_attribute.h"
 #include "nodes/pg_list.h"
-#include "storage/block.h"
 #include "storage/itemptr.h"
-#include "storage/off.h"
 
 
 typedef struct VAttListData

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);
 

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.
  *

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>
 

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,

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

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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"

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
 {

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>
 
 /* ----------------

src/include/libpq/libpq-be.h

@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-be.h,v 1.14 1999/02/13 23:21:35 momjian Exp $
+ * $Id: libpq-be.h,v 1.15 1999/07/15 15:21:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "libpq/pqcomm.h"
 #include "libpq/hba.h"
 
 

src/include/libpq/libpq.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq.h,v 1.31 1999/07/07 17:17:50 momjian Exp $
+ * $Id: libpq.h,v 1.32 1999/07/15 15:21:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,7 +19,7 @@
 
 #include "libpq/libpq-be.h"
 #include "tcop/dest.h"
-
+#include "utils/exc.h"
 
 /* ----------------
  * PQArgBlock

src/include/libpq/pqformat.h

@@ -5,14 +5,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pqformat.h,v 1.4 1999/05/25 16:14:01 momjian Exp $
+ * $Id: pqformat.h,v 1.5 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PQFORMAT_H
 #define PQFORMAT_H
 
-#include "postgres.h"
 #include "lib/stringinfo.h"
 
 #define pq_beginmessage(buf)  initStringInfo(buf)

src/include/nodes/execnodes.h

@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.30 1999/05/25 22:42:54 momjian Exp $
+ * $Id: execnodes.h,v 1.31 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include <nodes/memnodes.h>
 #include <nodes/primnodes.h>
 #include <executor/hashjoin.h>
 #include <access/relscan.h>

src/include/nodes/makefuncs.h

@@ -6,16 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: makefuncs.h,v 1.18 1999/05/25 16:14:08 momjian Exp $
+ * $Id: makefuncs.h,v 1.19 1999/07/15 15:21:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MAKEFUNC_H
 #define MAKEFUNC_H
 
-#include <nodes/primnodes.h>
 #include <nodes/parsenodes.h>
-#include <utils/fcache.h>
 
 extern Oper *makeOper(Oid opno,
 		 Oid opid,

src/include/nodes/nodeFuncs.h

@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.8 1999/02/13 23:21:38 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.9 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODEFUNCS_H
 #define NODEFUNCS_H
 
-#include <nodes/nodes.h>
 #include <nodes/primnodes.h>
 
 extern bool single_node(Node *node);

src/include/nodes/nodes.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.49 1999/05/26 12:56:33 momjian Exp $
+ * $Id: nodes.h,v 1.50 1999/07/15 15:21:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -262,13 +262,7 @@ typedef struct Node
  */
 extern Node *newNode(Size size, NodeTag tag);
 
-/*
- * nodes/{outfuncs.c,print.c}
- */
-#define nodeDisplay		pprint
-
 extern char *nodeToString(void *obj);
-extern void print(void *obj);
 
 /*
  * nodes/{readfuncs.c,read.c}

src/include/nodes/print.h

@@ -6,18 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: print.h,v 1.10 1999/02/13 23:21:41 momjian Exp $
+ * $Id: print.h,v 1.11 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRINT_H
 #define PRINT_H
 
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
 #include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "executor/tuptable.h"
+#include "nodes/plannodes.h"
+
+/*
+ * nodes/{outfuncs.c,print.c}
+ */
+#define nodeDisplay		pprint
 
 extern void print(void *obj);
 extern void pprint(void *obj);

src/include/nodes/relation.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: relation.h,v 1.32 1999/05/25 22:43:01 momjian Exp $
+ * $Id: relation.h,v 1.33 1999/07/15 15:21:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define RELATION_H
 
 #include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 
 /*
  * Relids

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;
 

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);

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

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"
 

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! */

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);

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);

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
  *

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);

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);

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

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"
 
 /*

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"
 
 /*

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);

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);

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 */

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);

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);

src/include/parser/parse_agg.h

@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_agg.h,v 1.10 1999/05/25 22:43:16 momjian Exp $
+ * $Id: parse_agg.h,v 1.11 1999/07/15 15:21:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_AGG_H
 #define PARSE_AGG_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 extern void AddAggToParseState(ParseState *pstate, Aggref *aggref);

src/include/parser/parse_clause.h

@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_clause.h,v 1.9 1999/05/26 12:56:41 momjian Exp $
+ * $Id: parse_clause.h,v 1.10 1999/07/15 15:21:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_CLAUSE_H
 #define PARSE_CLAUSE_H
 
-#include <nodes/pg_list.h>
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 extern void makeRangeTable(ParseState *pstate, char *relname, List *frmList, Node **qual);

src/include/parser/parse_coerce.h

@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_coerce.h,v 1.13 1999/07/14 01:20:25 momjian Exp $
+ * $Id: parse_coerce.h,v 1.14 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_COERCE_H
 #define PARSE_COERCE_H
 
-#include "nodes/pg_list.h"
 #include "parser/parse_node.h"
+#include "catalog/pg_type.h"
 
 typedef enum CATEGORY
 {

src/include/parser/parse_expr.h

@@ -6,17 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_expr.h,v 1.11 1999/05/26 12:56:41 momjian Exp $
+ * $Id: parse_expr.h,v 1.12 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_EXPR_H
 #define PARSE_EXPR_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
+#include "parser/parse_type.h"
 
 extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence);
 extern Oid	exprType(Node *expr);

src/include/parser/parse_func.h

@@ -6,18 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.16 1999/06/17 22:21:40 tgl Exp $
+ * $Id: parse_func.h,v 1.17 1999/07/15 15:21:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSER_FUNC_H
 #define PARSER_FUNC_H
 
-#include <nodes/nodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
-#include <parser/parse_func.h>
 #include <parser/parse_node.h>
 
 

src/include/parser/parse_node.h

@@ -5,18 +5,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_node.h,v 1.12 1999/05/13 07:29:19 tgl Exp $
+ * $Id: parse_node.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_NODE_H
 #define PARSE_NODE_H
 
-#include <nodes/nodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
 #include <nodes/parsenodes.h>
-#include <parser/parse_type.h>
 #include <utils/rel.h>
 
 /* state information used during parse analysis */

src/include/parser/parse_oper.h

@@ -6,15 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_oper.h,v 1.7 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parse_oper.h,v 1.8 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_OPER_H
 #define PARSE_OPER_H
 
-#include <parser/parse_func.h>
-#include <parser/parse_node.h>
+#include "access/htup.h"
 
 typedef HeapTuple Operator;
 

src/include/parser/parse_relation.h

@@ -6,19 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.9 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parse_relation.h,v 1.10 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_QUERY_H
 #define PARSE_RANGE_H
 
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
-#include <utils/rel.h>
 
 extern RangeTblEntry *refnameRangeTableEntry(ParseState *pstate, char *refname);
 extern int refnameRangeTablePosn(ParseState *pstate,

src/include/parser/parse_target.h

@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_target.h,v 1.12 1999/05/17 17:03:46 momjian Exp $
+ * $Id: parse_target.h,v 1.13 1999/07/15 15:21:27 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSE_TARGET_H
 #define PARSE_TARGET_H
 
-#include <nodes/pg_list.h>
-#include <nodes/nodes.h>
-#include <nodes/parsenodes.h>
-#include <nodes/primnodes.h>
 #include <parser/parse_node.h>
 
 #define EXPR_COLUMN_FIRST	1

src/include/parser/parsetree.h

@@ -7,13 +7,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsetree.h,v 1.6 1999/02/13 23:21:57 momjian Exp $
+ * $Id: parsetree.h,v 1.7 1999/07/15 15:21:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PARSETREE_H
 #define PARSETREE_H				/* include once only */
 
+#include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+
 /* ----------------
  *		need pg_list.h for definitions of CAR(), etc. macros
  * ----------------

src/include/postgres.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.23 1999/06/10 22:59:22 momjian Exp $
+ * $Id: postgres.h,v 1.24 1999/07/15 15:20:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,8 +40,9 @@
 #include "config.h"
 #endif
 #include "c.h"
-#include "utils/elog.h"
 #include "utils/palloc.h"
+#include "utils/mcxt.h"
+#include "utils/elog.h"
 
 /* ----------------------------------------------------------------
  *				Section 1:	simple type definitions

src/include/rewrite/locks.h

@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: locks.h,v 1.11 1999/02/13 23:21:59 momjian Exp $
+ * $Id: locks.h,v 1.12 1999/07/15 15:21:29 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LOCKS_H
 #define LOCKS_H
 
-#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 #include "rewrite/prs2lock.h"
 

src/include/rewrite/rewriteHandler.h

@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteHandler.h,v 1.10 1999/05/26 12:56:48 momjian Exp $
+ * $Id: rewriteHandler.h,v 1.11 1999/07/15 15:21:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEHANDLER_H
 #define REWRITEHANDLER_H
 
-#include "nodes/nodes.h"
 #include "nodes/parsenodes.h"
 
 struct _rewrite_meta_knowledge

src/include/rewrite/rewriteManip.h

@@ -6,15 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rewriteManip.h,v 1.16 1999/05/26 12:56:50 momjian Exp $
+ * $Id: rewriteManip.h,v 1.17 1999/07/15 15:21:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef REWRITEMANIP_H
 #define REWRITEMANIP_H
 
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
 #include "rewrite/rewriteHandler.h"
 
 /* RewriteManip.c */

src/include/storage/bufmgr.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.26 1999/05/25 16:14:39 momjian Exp $
+ * $Id: bufmgr.h,v 1.27 1999/07/15 15:21:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,17 +54,6 @@ typedef bits16 BufferLock;
  */
 #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1)
 
-/*
- * BufferIsPinned
- *		True iff the buffer is pinned (and therefore valid)
- *
- * Note:
- *		Smenatics are identical to BufferIsValid
- *		XXX - need to remove either one eventually.
- */
-#define BufferIsPinned BufferIsValid
-
-
 extern int	ShowPinTrace;
 
 /*
@@ -101,6 +90,17 @@ extern int	ShowPinTrace;
 	) \
 )
 
+/*
+ * BufferIsPinned
+ *		True iff the buffer is pinned (and therefore valid)
+ *
+ * Note:
+ *		Smenatics are identical to BufferIsValid
+ *		XXX - need to remove either one eventually.
+ */
+#define BufferIsPinned BufferIsValid
+
+
 #define IncrBufferRefCount(buffer) \
 ( \
 	BufferIsLocal(buffer) ? \

src/include/storage/bufpage.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.23 1999/07/03 00:32:59 momjian Exp $
+ * $Id: bufpage.h,v 1.24 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <storage/item.h>
 #include <storage/buf.h>
 #include <storage/page.h>
+#include <storage/bufmgr.h>
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres

src/include/storage/lmgr.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $
+ * $Id: lmgr.h,v 1.21 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <storage/lock.h>
 #include <utils/rel.h>
-#include <catalog/catname.h>
 
 #define AccessShareLock			1		/* SELECT */
 #define RowShareLock			2		/* SELECT FOR UPDATE */

src/include/storage/off.h

@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $
+ * $Id: off.h,v 1.8 1999/07/15 15:21:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef OFF_H
 #define OFF_H
 
+#include "storage/itemid.h"
 /*
  * OffsetNumber:
  *

src/include/storage/pos.h

@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $
+ * $Id: pos.h,v 1.8 1999/07/15 15:21:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef POS_H
 #define POS_H
 
+#include "storage/off.h"
+
 /*
  * a 'position' used to be <pagenumber, offset> in postgres.  this has
  * been changed to just <offset> as the notion of having multiple pages

src/include/tcop/dest.h

@@ -44,7 +44,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.20 1999/05/25 22:43:29 momjian Exp $
+ * $Id: dest.h,v 1.21 1999/07/15 15:21:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,7 +52,6 @@
 #define DEST_H
 
 #include <access/htup.h>
-#include <access/tupdesc.h>
 
 /* ----------------
  *		CommandDest is a simplistic means of identifying the desired

src/include/utils/acl.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: acl.h,v 1.20 1999/07/09 03:28:53 momjian Exp $
+ * $Id: acl.h,v 1.21 1999/07/15 15:21:38 momjian Exp $
  *
  * NOTES
  *	  For backward-compatability purposes we have to allow there
@@ -24,6 +24,7 @@
 
 #include <nodes/parsenodes.h>
 #include <utils/array.h>
+#include "utils/memutils.h"
 
 /*
  * AclId		system identifier for the user, group, etc.

src/include/utils/array.h

@@ -10,7 +10,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: array.h,v 1.18 1999/05/25 16:14:49 momjian Exp $
+ * $Id: array.h,v 1.19 1999/07/15 15:21:38 momjian Exp $
  *
  * NOTES
  *	  XXX the data array should be LONGALIGN'd -- notice that the array
@@ -23,6 +23,7 @@
 #define ARRAY_H
 
 #include <stdio.h>
+#include "utils/memutils.h"
 
 typedef struct
 {
@@ -97,11 +98,7 @@ typedef struct
  *------------------------------------------------------------------------
  */
 
-/* #if defined(irix5) */
-/* #define RETURN_NULL {*isNull = true; return(0); }*/
- /* #else *//* irix5 */
 #define RETURN_NULL {*isNull = true; return(0); }
- /* #endif *//* irix5 */
 #define NAME_LEN	30
 #define MAX_BUFF_SIZE BLCKSZ
 

src/include/utils/builtins.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.81 1999/05/26 12:57:03 momjian Exp $
+ * $Id: builtins.h,v 1.82 1999/07/15 15:21:39 momjian Exp $
  *
  * NOTES
  *	  This should normally only be included by fmgr.h.
@@ -28,9 +28,7 @@
 #include <utils/datetime.h>
 #include <utils/nabstime.h>
 #include <utils/int8.h>
-#include <utils/cash.h>
 #include <utils/inet.h>
-#include <utils/rel.h>
 #include <utils/numeric.h>
 
 /*

src/include/utils/catcache.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catcache.h,v 1.16 1999/07/14 01:20:26 momjian Exp $
+ * $Id: catcache.h,v 1.17 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,6 @@
 
 #include <access/htup.h>
 #include <lib/dllist.h>
-#include <nodes/memnodes.h>
-#include <utils/rel.h>
-#include <utils/mcxt.h>
 
 /*
  *		struct catctup:			tuples in the cache.

src/include/utils/dt.h

@@ -8,7 +8,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dt.h,v 1.40 1999/05/25 16:14:53 momjian Exp $
+ * $Id: dt.h,v 1.41 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include <time.h>
 #include <math.h>
+#include <limits.h>
 
 /*
  * DateTime represents absolute time.

src/include/utils/dynamic_loader.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dynamic_loader.h,v 1.10 1999/02/13 23:22:18 momjian Exp $
+ * $Id: dynamic_loader.h,v 1.11 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,6 +16,7 @@
 #include <sys/types.h>
 #include <sys/param.h>			/* For MAXPATHLEN */
 
+/* we need this include because port files use them */
 #include <postgres.h>
 
 #ifdef MIN

src/include/utils/inval.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: inval.h,v 1.11 1999/02/13 23:22:23 momjian Exp $
+ * $Id: inval.h,v 1.12 1999/07/15 15:21:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define INVAL_H
 
 #include <access/htup.h>
-#include <utils/rel.h>
 
 extern void InitLocalInvalidateData(void);
 

src/include/utils/lselect.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lselect.h,v 1.12 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lselect.h,v 1.13 1999/07/15 15:21:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,9 +15,6 @@
 
 #include <stdio.h>
 
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/htup.h"
 #include "utils/syscache.h"
 
 struct leftist

src/include/utils/lsyscache.h

@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.16 1999/02/13 23:22:24 momjian Exp $
+ * $Id: lsyscache.h,v 1.17 1999/07/15 15:21:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LSYSCACHE_H
 #define LSYSCACHE_H
 
-#include <access/attnum.h>
 #include <access/htup.h>
 
 extern bool op_class(Oid oprno, int32 opclass, Oid amopid);

src/include/utils/memutils.h

@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.29 1999/07/14 01:20:29 momjian Exp $
+ * $Id: memutils.h,v 1.30 1999/07/15 15:21:41 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -30,7 +30,6 @@
  *	This is not needed by this include file, but by almost every file
  *	that includes this file.
  */
-#include "utils/mcxt.h"
 
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.

src/include/utils/portal.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.15 1999/06/12 14:07:32 momjian Exp $
+ * $Id: portal.h,v 1.16 1999/07/15 15:21:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,9 +26,7 @@
 #define PORTAL_H
 
 #include <executor/execdesc.h>
-#include <lib/fstack.h>
 #include <nodes/memnodes.h>
-#include <utils/memutils.h>
 
 typedef struct PortalBlockData
 {