diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 48872cdf68..fc7ac6dcb1 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.44 2000/05/30 04:24:32 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.45 2000/06/08 22:36:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -207,6 +207,7 @@ StrategyEvaluationIsValid(StrategyEvaluation evaluation)
 
 #endif
 
+#ifdef NOT_USED
 /* ----------------
  *		StrategyTermEvaluate
  * ----------------
@@ -262,7 +263,7 @@ StrategyTermEvaluate(StrategyTerm term,
 
 	return result;
 }
-
+#endif
 
 /* ----------------
  *		RelationGetStrategy
@@ -340,6 +341,7 @@ RelationGetStrategy(Relation relation,
 	return strategy;
 }
 
+#ifdef NOT_USED
 /* ----------------
  *		RelationInvokeStrategy
  * ----------------
@@ -463,6 +465,7 @@ RelationInvokeStrategy(Relation relation,
 
 
 }
+#endif
 
 /* ----------------
  *		OperatorRelationFillScanKeyEntry
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 0ec7af2cf9..7d65c63dc8 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.58 2000/05/30 04:24:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.59 2000/06/08 22:36:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,8 @@ static OffsetNumber _bt_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey it
 static bool _bt_goesonpg(Relation rel, Buffer buf, Size keysz, ScanKey scankey, BTItem afteritem);
 static void _bt_updateitem(Relation rel, Size keysz, Buffer buf, BTItem oldItem, BTItem newItem);
 static bool _bt_isequal(TupleDesc itupdesc, Page page, OffsetNumber offnum, int keysz, ScanKey scankey);
+static int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
+				 IndexTuple tuple1, IndexTuple tuple2);
 
 /*
  *	_bt_doinsert() -- Handle insertion of a single btitem in the tree.
@@ -1360,7 +1362,7 @@ _bt_goesonpg(Relation rel,
  *							  return -1, 0, or +1
  *
  */
-int32
+static int32
 _bt_tuplecompare(Relation rel,
 				 Size keysz,
 				 ScanKey scankey,
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 18ac77cd9e..cd20e231ec 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.65 2000/05/30 00:49:41 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.66 2000/06/08 22:36:54 momjian Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -901,6 +901,7 @@ StartTransaction()
 
 }
 
+#ifdef NOT_USED
 /* ---------------
  * Tell me if we are currently in progress
  * ---------------
@@ -910,6 +911,7 @@ CurrentXactInProgress()
 {
 	return CurrentTransactionState->state == TRANS_INPROGRESS;
 }
+#endif
 
 /* --------------------------------
  *		CommitTransaction
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 445f1caf2a..52d36477ca 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.113 2000/05/30 04:24:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.114 2000/06/08 22:36:59 momjian Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -75,6 +75,7 @@ static void DefaultBuild(Relation heapRelation, Relation indexRelation,
 			 IndexStrategy indexStrategy, uint16 parameterCount,
 		Datum *parameter, FuncIndexInfoPtr funcInfo, PredInfo *predInfo);
 static Oid	IndexGetRelation(Oid indexId);
+static bool activate_index(Oid indexId, bool activate);
 
 static bool reindexing = false;
 extern bool
@@ -2044,7 +2045,7 @@ IndexIsUniqueNoCache(Oid indexId)
  *		status per index
  * ---------------------------------
  */
-bool
+static bool
 activate_index(Oid indexId, bool activate)
 {
 	if (!activate)				/* Currently does nothing */
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index f80ed61123..ae5d3d2e9f 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.64 2000/06/07 04:09:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.65 2000/06/08 22:37:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -193,14 +193,11 @@ Async_Listen(char *relname, int pid)
 {
 	Relation	lRel;
 	TupleDesc	tdesc;
-	HeapScanDesc scan;
 	HeapTuple	tuple,
 				newtup;
 	Datum		values[Natts_pg_listener];
 	char		nulls[Natts_pg_listener];
-	Datum		d;
 	int			i;
-	bool		isnull;
 	TupleDesc	tupDesc;
 
 	if (Trace_notify)
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 9739c68ffd..2b9bf4d772 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -49,6 +49,7 @@ static void CommentAggregate(char *aggregate, char *aggtype, char *comment);
 static void CommentProc(char *function, List *arguments, char *comment);
 static void CommentOperator(char *opname, List *arguments, char *comment);
 static void CommentTrigger(char *trigger, char *relation, char *comments);
+static void	CreateComments(Oid oid, char *comment);
 
 /*------------------------------------------------------------------
  * CommentObject --
@@ -120,7 +121,7 @@ CommentObject(int objtype, char *objname, char *objproperty,
  *------------------------------------------------------------------
  */
 
-void
+static void
 CreateComments(Oid oid, char *comment)
 {
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 01dd8567e1..62d88caf39 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.68 2000/05/30 00:49:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.69 2000/06/08 22:37:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -38,6 +38,9 @@ static HeapTuple GetTupleForTrigger(EState *estate, ItemPointer tid,
 static HeapTuple ExecCallTriggerFunc(Trigger *trigger,
 									 TriggerData *trigdata);
 
+static void DeferredTriggerSaveEvent(Relation rel, int event,
+						 HeapTuple oldtup, HeapTuple newtup);
+
 
 void
 CreateTrigger(CreateTrigStmt *stmt)
@@ -1776,7 +1779,7 @@ DeferredTriggerSetState(ConstraintsSetStmt *stmt)
  *	Called by ExecAR...Triggers() to add the event to the queue.
  * ----------
  */
-void
+static void
 DeferredTriggerSaveEvent(Relation rel, int event,
 						 HeapTuple oldtup, HeapTuple newtup)
 {
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index f33f4f1b1b..e4fbf34727 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.7 2000/05/30 00:49:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.8 2000/06/08 22:37:03 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@
  *		ExecTidReScan		rescans the tid relation.
  *		ExecEndTidScan		releases all storage.
  *		ExecTidMarkPos		marks scan position.
- *		ExecTidRestrPos		restores scan position.
  *
  */
 #include "postgres.h"
@@ -353,6 +352,7 @@ ExecTidMarkPos(TidScan *node)
 	tidstate->tss_MarkTidPtr = tidstate->tss_TidPtr;
 }
 
+#ifdef NOT_USED
 /* ----------------------------------------------------------------
  *		ExecTidRestrPos
  *
@@ -370,6 +370,7 @@ ExecTidRestrPos(TidScan *node)
 	tidstate = node->tidstate;
 	tidstate->tss_TidPtr = tidstate->tss_MarkTidPtr;
 }
+#endif
 
 /* ----------------------------------------------------------------
  *		ExecInitTidScan
diff --git a/src/backend/lib/dllist.c b/src/backend/lib/dllist.c
index 5711f70b69..f38251934c 100644
--- a/src/backend/lib/dllist.c
+++ b/src/backend/lib/dllist.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.17 2000/04/12 17:15:10 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/lib/dllist.c,v 1.18 2000/06/08 22:37:05 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -109,11 +109,13 @@ DLGetTailVal(Dllist *l)
 
 #endif
 
+#ifdef NOT_USED
 Dlelem *
 DLGetPred(Dlelem *e)			/* get predecessor */
 {
 	return e ? e->dle_prev : 0;
 }
+#endif
 
 Dlelem *
 DLGetSucc(Dlelem *e)			/* get successor */
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 870dcc04a1..1fcb40c929 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.11 2000/01/26 05:56:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.12 2000/06/08 22:37:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -98,6 +98,7 @@ replace_opid(Oper *oper)
  *		constant (CONST, PARAM) nodes
  *****************************************************************************/
 
+#ifdef NOT_USED
 /*
  * non_null -
  *		Returns t if the node is a non-null constant, e.g., if the node has a
@@ -113,3 +114,5 @@ non_null(Expr *c)
 	else
 		return false;
 }
+#endif
+
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 62a5b0295c..ba2e7e67b3 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.37 2000/05/31 15:38:53 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.38 2000/06/08 22:37:09 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -40,6 +40,9 @@ typedef struct RangeQueryClause
 
 static void addRangeClause(RangeQueryClause **rqlist, Node *clause,
 			   int flag, bool isLTsel, Selectivity s2);
+static Selectivity clause_selectivity(Query *root,
+				   Node *clause,
+				   int varRelid);
 
 
 /****************************************************************************
@@ -357,7 +360,7 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
  * When varRelid is 0, all variables are treated as variables.	This
  * is appropriate for ordinary join clauses and restriction clauses.
  */
-Selectivity
+static Selectivity
 clause_selectivity(Query *root,
 				   Node *clause,
 				   int varRelid)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 4109ab2536..3bbb03f878 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.90 2000/05/23 16:56:36 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.91 2000/06/08 22:37:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,6 +74,7 @@ static Material *make_material(List *tlist, Oid nonameid, Plan *lefttree,
 			  int keycount);
 static void copy_path_costsize(Plan *dest, Path *src);
 static void copy_plan_costsize(Plan *dest, Plan *src);
+static SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
 
 /*
  * create_plan
@@ -1119,7 +1120,7 @@ make_noname(List *tlist,
 }
 
 
-SeqScan    *
+static SeqScan    *
 make_seqscan(List *qptlist,
 			 List *qpqual,
 			 Index scanrelid)
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index fed6f66f6a..c13cc59848 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.25 2000/04/14 00:19:17 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.26 2000/06/08 22:37:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -223,6 +223,7 @@ cnfify(Expr *qual, bool removeAndFlag)
 	return (List *) newqual;
 }
 
+#ifdef NOT_USED
 /*
  * dnfify
  *	  Convert a qualification to disjunctive normal form by applying
@@ -233,7 +234,7 @@ cnfify(Expr *qual, bool removeAndFlag)
  * We do not offer a 'removeOrFlag' in this case; the usages are
  * different.
  */
-Expr *
+static Expr *
 dnfify(Expr *qual)
 {
 	Expr	   *newqual;
@@ -259,6 +260,7 @@ dnfify(Expr *qual)
 
 	return newqual;
 }
+#endif
 
 /*--------------------
  * The parser regards AND and OR as purely binary operators, so a qual like
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index d29fcc2f48..b4b4304a42 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.26 2000/02/06 03:27:33 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.27 2000/06/08 22:37:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,6 +17,7 @@
 
 #include "optimizer/joininfo.h"
 
+static JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 
 /*
  * joininfo_member
@@ -32,7 +33,7 @@
  * exists.
  *
  */
-JoinInfo   *
+static JoinInfo   *
 joininfo_member(List *join_relids, List *joininfo_list)
 {
 	List	   *i;
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 959cb8e222..d55c517708 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.45 2000/05/30 00:49:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.46 2000/06/08 22:37:16 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,8 @@
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
 
+static TargetEntry *tlistentry_member(Node *node, List *targetlist);
+
 /*****************************************************************************
  *	---------- RELATION node target list routines ----------
  *****************************************************************************/
@@ -27,7 +29,7 @@
  *	  Finds the (first) member of the given tlist whose expression is
  *	  equal() to the given expression.	Result is NULL if no such member.
  */
-TargetEntry *
+static TargetEntry *
 tlistentry_member(Node *node, List *targetlist)
 {
 	List	   *temp;
@@ -42,6 +44,7 @@ tlistentry_member(Node *node, List *targetlist)
 	return NULL;
 }
 
+#ifdef NOT_USED
 /*
  * matching_tlist_expr
  *	  Same as tlistentry_member(), except returns the tlist expression
@@ -58,6 +61,7 @@ matching_tlist_expr(Node *node, List *targetlist)
 
 	return (Node *) NULL;
 }
+#endif
 
 /*
  * tlist_member
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 8b39c3d6e9..34f67fb4a1 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.62 2000/05/30 00:49:50 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.63 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ static char *clauseText[] = {"ORDER BY", "GROUP BY", "DISTINCT ON"};
 static TargetEntry *findTargetlistEntry(ParseState *pstate, Node *node,
 					List *tlist, int clause);
 static void parseFromClause(ParseState *pstate, List *frmList);
-RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
+static RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
 static List *addTargetToSortList(TargetEntry *tle, List *sortlist,
 					List *targetlist, char *opname);
 static bool exprIsInSortList(Node *expr, List *sortList, List *targetList);
@@ -245,13 +245,11 @@ makeAttrList(Attr *attr)
 
 	return result;
 }
-
+#ifdef NOT_USED
 /* ExpandAttrs()
  * Take an existing attribute node and return a list of attribute nodes
  * with one attribute name per node.
  */
-List *
-			ExpandAttrs(Attr *attr);
 List *
 ExpandAttrs(Attr *attr)
 {
@@ -273,6 +271,7 @@ ExpandAttrs(Attr *attr)
 
 	return rlist;
 }
+#endif
 
 /* transformUsingClause()
  * Take an ON or USING clause from a join expression and expand if necessary.
@@ -335,7 +334,7 @@ transformUsingClause(ParseState *pstate, List *usingList,
 #endif
 
 
-RangeTblEntry *
+static RangeTblEntry *
 transformTableEntry(ParseState *pstate, RangeVar *r)
 {
 	RelExpr    *baserel = r->relExpr;
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 9360c1486c..c871222ab3 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.41 2000/06/03 04:41:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.42 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -65,6 +65,7 @@ static char *attnum_type[SPECIALS] = {
 	"cid",
 };
 
+#ifdef NOT_USED
 /* refnameRangeTableEntries()
  * Given refname, return a list of range table entries
  * This is possible with JOIN syntax, where tables in a join
@@ -75,10 +76,8 @@ static char *attnum_type[SPECIALS] = {
  * to support outer joins in place yet.
  * - thomas 2000-03-04
  */
-List *
-			refnameRangeTableEntries(ParseState *pstate, char *refname);
 
-List *
+static List *
 refnameRangeTableEntries(ParseState *pstate, char *refname)
 {
 	List	   *rteList = NULL;
@@ -97,6 +96,7 @@ refnameRangeTableEntries(ParseState *pstate, char *refname)
 	}
 	return rteList;
 }
+#endif
 
 /* given refname, return a pointer to the range table entry */
 RangeTblEntry *
@@ -466,6 +466,7 @@ specialAttNum(char *a)
 }
 
 
+#ifdef NOT_USED
 /*
  * Given range variable, return whether attribute of this name
  * is a set.
@@ -491,7 +492,9 @@ attnameIsSet(Relation rd, char *name)
 	}
 	return get_attisset(RelationGetRelid(rd), name);
 }
+#endif
 
+#ifdef NOT_USED
 /*
  *	This should only be used if the relation is already
  *	heap_open()'ed.  Use the cache version
@@ -502,6 +505,7 @@ attnumAttNelems(Relation rd, int attid)
 {
 	return rd->rd_att->attrs[attid - 1]->attnelems;
 }
+#endif
 
 /* given attribute id, return type of that attribute */
 /*
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 6903733842..c582bd54ab 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.31 2000/06/06 16:50:37 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.32 2000/06/08 22:37:18 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -199,6 +199,7 @@ typeTypeRelid(Type typ)
 	return typtup->typrelid;
 }
 
+#ifdef NOT_USED
 Oid
 typeTypElem(Type typ)
 {
@@ -208,10 +209,11 @@ typeTypElem(Type typ)
 
 	return typtup->typelem;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given the attribute type of an array return the attribute type of
    an element of the array */
-
 Oid
 GetArrayElementType(Oid typearray)
 {
@@ -237,7 +239,9 @@ GetArrayElementType(Oid typearray)
 
 	return type_struct_array->typelem;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given a type structure, return the in-conversion function of the type */
 Oid
 typeInfunc(Type typ)
@@ -248,7 +252,9 @@ typeInfunc(Type typ)
 
 	return typtup->typinput;
 }
+#endif
 
+#ifdef NOT_USED
 /* Given a type structure, return the out-conversion function of the type */
 Oid
 typeOutfunc(Type typ)
@@ -259,3 +265,4 @@ typeOutfunc(Type typ)
 
 	return typtup->typoutput;
 }
+#endif
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index aa93a04b3c..77b82b82c3 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.81 2000/05/19 03:22:28 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.82 2000/06/08 22:37:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,7 +75,6 @@ static void WaitIO(BufferDesc *buf, SPINLOCK spinlock);
 static void StartBufferIO(BufferDesc *buf, bool forInput);
 static void TerminateBufferIO(BufferDesc *buf);
 static void ContinueBufferIO(BufferDesc *buf, bool forInput);
-extern void InitBufferIO(void);
 extern void AbortBufferIO(void);
 
 /*
@@ -2488,11 +2487,13 @@ ContinueBufferIO(BufferDesc *buf, bool forInput)
 	IsForInput = forInput;
 }
 
+#ifdef NOT_USED
 void
 InitBufferIO(void)
 {
 	InProgressBuf = (BufferDesc *) 0;
 }
+#endif
 
 /*
  *	This function is called from ProcReleaseSpins().
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index d62ed2670c..844ba9b4e6 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.5 2000/04/12 17:15:35 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/file/buffile.c,v 1.6 2000/06/08 22:37:22 momjian Exp $
  *
  * NOTES:
  *
@@ -149,6 +149,7 @@ BufFileCreateTemp(void)
 	return file;
 }
 
+#ifdef NOT_USED
 /*
  * Create a BufFile and attach it to an already-opened virtual File.
  *
@@ -161,6 +162,7 @@ BufFileCreate(File file)
 {
 	return makeBufFile(file);
 }
+#endif
 
 /*
  * Close a BufFile
@@ -529,12 +531,14 @@ BufFileSeek(BufFile *file, int fileno, long offset, int whence)
 	return 0;
 }
 
+#ifdef NOT_USED
 void
 BufFileTell(BufFile *file, int *fileno, long *offset)
 {
 	*fileno = file->curFile;
 	*offset = file->curOffset + file->pos;
 }
+#endif
 
 /*
  * BufFileSeekBlock --- block-oriented seek
@@ -556,6 +560,7 @@ BufFileSeekBlock(BufFile *file, long blknum)
 					   SEEK_SET);
 }
 
+#ifdef NOT_USED
 /*
  * BufFileTellBlock --- block-oriented tell
  *
@@ -570,3 +575,5 @@ BufFileTellBlock(BufFile *file)
 	blknum += file->curFile * RELSEG_SIZE;
 	return blknum;
 }
+#endif
+
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index 59f724f4b7..f1b9f87466 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.40 2000/05/31 00:28:30 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.41 2000/06/08 22:37:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -227,6 +227,7 @@ XactLockTableInsert(TransactionId xid)
 		elog(ERROR, "XactLockTableInsert: LockAcquire failed");
 }
 
+#ifdef NOT_USED
 void
 XactLockTableDelete(TransactionId xid)
 {
@@ -242,6 +243,7 @@ XactLockTableDelete(TransactionId xid)
 
 	LockRelease(LockTableId, &tag, ExclusiveLock);
 }
+#endif
 
 void
 XactLockTableWait(TransactionId xid)
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 0595f38fe4..0c1c4aa338 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.158 2000/06/04 01:44:33 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.159 2000/06/08 22:37:26 momjian Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -136,6 +136,8 @@ static int	SocketBackend(StringInfo inBuf);
 static int	ReadCommand(StringInfo inBuf);
 static void pg_exec_query(char *query_string);
 static void SigHupHandler(SIGNAL_ARGS);
+static void FloatExceptionHandler(SIGNAL_ARGS);
+static void quickdie(SIGNAL_ARGS);
 
 /*
  * Flag to mark SIGHUP. Whenever the main loop comes around it
@@ -537,11 +539,13 @@ pg_exec_query(char *query_string)
 	pg_exec_query_dest(query_string, whereToSendOutput, FALSE);
 }
 
+#ifdef NOT_USED
 void
 pg_exec_query_acl_override(char *query_string)
 {
 	pg_exec_query_dest(query_string, whereToSendOutput, TRUE);
 }
+#endif
 
 void
 pg_exec_query_dest(char *query_string,	/* string to execute */
@@ -681,7 +685,7 @@ handle_warn(SIGNAL_ARGS)
 	siglongjmp(Warn_restart, 1);
 }
 
-void
+static void
 quickdie(SIGNAL_ARGS)
 {
 	PG_SETMASK(&BlockSig);
@@ -722,7 +726,7 @@ die(SIGNAL_ARGS)
 }
 
 /* signal handler for floating point exception */
-void
+static void
 FloatExceptionHandler(SIGNAL_ARGS)
 {
 	elog(ERROR, "floating point exception!"
@@ -752,7 +756,7 @@ CancelQuery(void)
 static void
 SigHupHandler(SIGNAL_ARGS)
 {
-    got_SIGHUP = true;
+	got_SIGHUP = true;
 }
 
 
@@ -1153,8 +1157,8 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (Show_query_stats &&
 		(Show_parser_stats || Show_planner_stats || Show_executor_stats))
 	{
-        elog(NOTICE, "Query statistics are disabled because parser, planner, or executor statistics are on.");
-        Show_query_stats = false;
+		elog(NOTICE, "Query statistics are disabled because parser, planner, or executor statistics are on.");
+		Show_query_stats = false;
 	}
 
 	if (!DataDir)
@@ -1379,7 +1383,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 	if (!IsUnderPostmaster)
 	{
 		puts("\nPOSTGRES backend interactive interface ");
-		puts("$Revision: 1.158 $ $Date: 2000/06/04 01:44:33 $\n");
+		puts("$Revision: 1.159 $ $Date: 2000/06/08 22:37:26 $\n");
 	}
 
 	/*
@@ -1530,10 +1534,10 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
 					DeferredTriggerEndQuery();
 
 					if (Show_query_stats)
-                    {
-                        fprintf(StatFp, "QUERY STATISTICS\n");
+					{
+						fprintf(StatFp, "QUERY STATISTICS\n");
 						ShowUsage();
-                    }
+					}
 				}
 				break;
 
@@ -1696,8 +1700,8 @@ ShowUsage(void)
 /*	   DisplayTupleCount(StatFp); */
 }
 
-#ifdef USE_ASSERT_CHECKING
-int
+#ifdef NOT_USED
+static int
 assertEnable(int val)
 {
 	assert_enabled = val;
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index aa45b0ed51..790c166ad4 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.48 2000/05/29 19:16:57 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.49 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,6 +31,17 @@
 #include "miscadmin.h"
 #include "utils/datetime.h"
 
+static int DecodeNumber(int flen, char *field,
+			 int fmask, int *tmask,
+			 struct tm * tm, double *fsec, int *is2digits);
+static int DecodeNumberField(int len, char *str,
+				  int fmask, int *tmask,
+				  struct tm * tm, double *fsec, int *is2digits);
+static int DecodeTime(char *str, int fmask, int *tmask,
+		   struct tm * tm, double *fsec);
+static int	DecodeTimezone(char *str, int *tzp);
+static datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
+static int DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
 
 #define USE_DATE_CACHE 1
 #define ROUND_ALL 0
@@ -1155,12 +1166,11 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 	return 0;
 }	/* DecodeTimeOnly() */
 
-
 /* DecodeDate()
  * Decode date string which includes delimiters.
  * Insist on a complete set of fields.
  */
-int
+static int
 DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
 {
 	double		fsec;
@@ -1288,7 +1298,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm)
  * Only check the lower limit on hours, since this same code
  *	can be used to represent time spans.
  */
-int
+static int
 DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 {
 	char	   *cp;
@@ -1341,7 +1351,7 @@ DecodeTime(char *str, int fmask, int *tmask, struct tm * tm, double *fsec)
 /* DecodeNumber()
  * Interpret numeric field as a date value in context.
  */
-int
+static int
 DecodeNumber(int flen, char *str, int fmask,
 			 int *tmask, struct tm * tm, double *fsec, int *is2digits)
 {
@@ -1445,7 +1455,7 @@ DecodeNumber(int flen, char *str, int fmask,
 /* DecodeNumberField()
  * Interpret numeric string as a concatenated date field.
  */
-int
+static int
 DecodeNumberField(int len, char *str, int fmask,
 				int *tmask, struct tm * tm, double *fsec, int *is2digits)
 {
@@ -1513,13 +1523,13 @@ DecodeNumberField(int len, char *str, int fmask,
 		return -1;
 
 	return 0;
-}	/* DecodeNumberField() */
+}	/*  DecodeNumberField() */
 
 
 /* DecodeTimezone()
  * Interpret string as a numeric timezone.
  */
-int
+static int
 DecodeTimezone(char *str, int *tzp)
 {
 	int			tz;
@@ -1908,7 +1918,7 @@ DecodeUnits(int field, char *lowtoken, int *val)
  * Binary search -- from Knuth (6.2.1) Algorithm B.  Special case like this
  * is WAY faster than the generic bsearch().
  */
-datetkn    *
+static datetkn    *
 datebsearch(char *key, datetkn *base, unsigned int nel)
 {
 	datetkn    *last = base + nel - 1,
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index b7b654cc32..93800b067d 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.58 2000/06/05 07:28:51 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.59 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -67,6 +67,8 @@
 #include "fmgr.h"
 #include "utils/builtins.h"
 
+static void CheckFloat8Val(double val);
+
 #ifndef NAN
 #define NAN		(0.0/0.0)
 #endif
@@ -154,7 +156,7 @@ CheckFloat4Val(double val)
 
    raise an elog warning if it is
 */
-void
+static void
 CheckFloat8Val(double val)
 {
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 24297b6845..c2a9e2c798 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.18 2000/05/30 00:49:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.19 2000/06/08 22:37:28 momjian Exp $
  *
  * NOTES
  *	  input routine largely stolen from boxin().
@@ -114,6 +114,7 @@ tideq(ItemPointer arg1, ItemPointer arg2)
 			arg1->ip_posid == arg2->ip_posid);
 }
 
+#ifdef NOT_USED
 bool
 tidne(ItemPointer arg1, ItemPointer arg2)
 {
@@ -123,7 +124,9 @@ tidne(ItemPointer arg1, ItemPointer arg2)
 			BlockIdGetBlockNumber(&(arg2->ip_blkid)) ||
 			arg1->ip_posid != arg2->ip_posid);
 }
+#endif
 
+#ifdef NOT_USED
 text *
 tid_text(ItemPointer tid)
 {
@@ -135,7 +138,9 @@ tid_text(ItemPointer tid)
 
 	return textin(str);
 }	/* tid_text() */
+#endif
 
+#ifdef NOT_USED
 ItemPointer
 text_tid(const text *string)
 {
@@ -151,7 +156,7 @@ text_tid(const text *string)
 
 	return result;
 }	/* text_tid() */
-
+#endif
 
 /*
  *	Functions to get latest tid of a specified tuple.
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 2bcb33cbcc..a2d8faf05b 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.27 2000/05/29 01:59:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/timestamp.c,v 1.28 2000/06/08 22:37:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,6 +35,11 @@
 
 
 static double time2t(const int hour, const int min, const double sec);
+static int	EncodeSpecialTimestamp(Timestamp dt, char *str);
+static Timestamp dt2local(Timestamp dt, int timezone);
+static void dt2time(Timestamp dt, int *hour, int *min, double *sec);
+static int	interval2tm(Interval span, struct tm * tm, float8 *fsec);
+static int	tm2interval(struct tm * tm, double fsec, Interval *span);
 
 
 /*****************************************************************************
@@ -120,15 +125,9 @@ timestamp_out(Timestamp *dt)
 		return NULL;
 
 	if (TIMESTAMP_IS_RESERVED(*dt))
-	{
 		EncodeSpecialTimestamp(*dt, buf);
-
-	}
 	else if (timestamp2tm(*dt, &tz, tm, &fsec, &tzn) == 0)
-	{
 		EncodeDateTime(tm, fsec, &tz, &tzn, DateStyle, buf);
-
-	}
 	else
 		EncodeSpecialTimestamp(DT_INVALID, buf);
 
@@ -228,7 +227,7 @@ interval_out(Interval *span)
 /* EncodeSpecialTimestamp()
  * Convert reserved timestamp data type to string.
  */
-int
+static int
 EncodeSpecialTimestamp(Timestamp dt, char *str)
 {
 	if (TIMESTAMP_IS_RESERVED(dt))
@@ -266,7 +265,7 @@ now(void)
 	return result;
 }
 
-void
+static void
 dt2time(Timestamp jd, int *hour, int *min, double *sec)
 {
 	double		time;
@@ -434,7 +433,7 @@ tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *result)
 /* interval2tm()
  * Convert a interval data type to a tm structure.
  */
-int
+static int
 interval2tm(Interval span, struct tm * tm, float8 *fsec)
 {
 	double		time;
@@ -466,7 +465,7 @@ interval2tm(Interval span, struct tm * tm, float8 *fsec)
 	return 0;
 }	/* interval2tm() */
 
-int
+static int
 tm2interval(struct tm * tm, double fsec, Interval *span)
 {
 	span->month = ((tm->tm_year * 12) + tm->tm_mon);
@@ -485,7 +484,7 @@ time2t(const int hour, const int min, const double sec)
 	return (((hour * 60) + min) * 60) + sec;
 }	/* time2t() */
 
-Timestamp
+static Timestamp
 dt2local(Timestamp dt, int tz)
 {
 	dt -= tz;
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index d91f47b7ca..19556fce66 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.41 2000/04/12 17:15:53 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.42 2000/06/08 22:37:30 momjian Exp $
  *
  * NOTES
  *	  Eventually, the index information should go through here, too.
@@ -513,6 +513,7 @@ get_func_rettype(Oid funcid)
 
 /*				---------- RELATION CACHE ----------					 */
 
+#ifdef NOT_USED
 /*
  * get_relnatts -
  *
@@ -536,6 +537,7 @@ get_relnatts(Oid relid)
 	else
 		return InvalidAttrNumber;
 }
+#endif
 
 /*
  * get_rel_name -
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 2bbc75c60f..be9f2647d2 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.17 2000/01/26 05:57:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.18 2000/06/08 22:37:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,6 +32,8 @@
 #define S_IXOTH		 ((S_IXUSR)>>6)
 #endif
 
+static int	ValidateBinary(char *path);
+
 /*
  * ValidateBinary -- validate "path" as a POSTMASTER/POSTGRES executable file
  *
@@ -39,7 +41,7 @@
  *		  -1 if the regular file "path" does not exist or cannot be executed.
  *		  -2 if the file is otherwise valid but cannot be read.
  */
-int
+static int
 ValidateBinary(char *path)
 {
 	struct stat buf;
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 3f3d4b166d..12facde811 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.47 2000/06/02 15:57:32 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.48 2000/06/08 22:37:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,8 @@
 #include "miscadmin.h"
 #include "utils/syscache.h"
 
+static char *GetPidFname(void);
+
 
 #ifdef CYR_RECODE
 unsigned char RecodeForwTable[128];
@@ -406,7 +408,7 @@ SetPidFname(char *datadir)
 /*
  * Get path to the pid file
  */
-char *
+static char *
 GetPidFname(void)
 {
 	return (PidFile);
diff --git a/src/include/access/istrat.h b/src/include/access/istrat.h
index 9a7a370630..99d4901bcd 100644
--- a/src/include/access/istrat.h
+++ b/src/include/access/istrat.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: istrat.h,v 1.16 2000/01/26 05:57:50 momjian Exp $
+ * $Id: istrat.h,v 1.17 2000/06/08 22:37:36 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -55,9 +55,6 @@ extern Size AttributeNumberGetIndexStrategySize(AttrNumber maxAttributeNumber,
 extern StrategyNumber RelationGetStrategy(Relation relation,
 			   AttrNumber attributeNumber, StrategyEvaluation evaluation,
 					RegProcedure procedure);
-extern bool RelationInvokeStrategy(Relation relation,
-			   StrategyEvaluation evaluation, AttrNumber attributeNumber,
-					   StrategyNumber strategy, Datum left, Datum right);
 extern void IndexSupportInitialize(IndexStrategy indexStrategy,
 					   RegProcedure *indexSupport, Oid indexObjectId,
 			  Oid accessMethodObjectId, StrategyNumber maxStrategyNumber,
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index 94d27b1a23..5880a4047e 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nbtree.h,v 1.35 2000/04/12 17:16:26 momjian Exp $
+ * $Id: nbtree.h,v 1.36 2000/06/08 22:37:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -205,8 +205,6 @@ typedef struct BTPageState
  */
 extern InsertIndexResult _bt_doinsert(Relation rel, BTItem btitem,
 			 bool index_is_unique, Relation heapRel);
-extern int32 _bt_tuplecompare(Relation rel, Size keysz, ScanKey scankey,
-				 IndexTuple tuple1, IndexTuple tuple2);
 extern bool _bt_itemcmp(Relation rel, Size keysz, ScanKey scankey,
 			BTItem item1, BTItem item2, StrategyNumber strat);
 
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 787b4402d2..960538f4b5 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: xact.h,v 1.25 2000/06/05 07:28:57 tgl Exp $
+ * $Id: xact.h,v 1.26 2000/06/08 22:37:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -102,7 +102,6 @@ extern bool CommandIdIsCurrentCommandId(CommandId cid);
 extern bool CommandIdGEScanCommandId(CommandId cid);
 extern void CommandCounterIncrement(void);
 extern void InitializeTransactionSystem(void);
-extern bool CurrentXactInProgress(void);
 extern void StartTransactionCommand(void);
 extern void CommitTransactionCommand(void);
 extern void AbortCurrentTransaction(void);
diff --git a/src/include/c.h b/src/include/c.h
index 4e981f9238..36caac611f 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.73 2000/06/02 16:40:09 momjian Exp $
+ * $Id: c.h,v 1.74 2000/06/08 22:37:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -751,8 +751,6 @@ extern int	assert_enabled;
 #define LogAssertState(condition, printArgs) \
 		LogTrap(!(condition), BadState, printArgs)
 
-extern int	assertEnable(int val);
-
 #ifdef ASSERT_CHECKING_TEST
 extern int	assertTest(int val);
 
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 4a74367421..66021d6405 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.23 2000/04/12 17:16:27 momjian Exp $
+ * $Id: index.h,v 1.24 2000/06/08 22:37:39 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,6 @@ extern void index_build(Relation heapRelation, Relation indexRelation,
 extern bool IndexIsUnique(Oid indexId);
 extern bool IndexIsUniqueNoCache(Oid indexId);
 
-extern bool activate_index(Oid indexId, bool activate);
 extern bool reindex_index(Oid indexId, bool force);
 extern bool activate_indexes_of_a_table(Oid relid, bool activate);
 extern bool reindex_relation(Oid relid, bool force);
diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index 7f400411b4..c9a5b63821 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -23,9 +23,8 @@
  *------------------------------------------------------------------
  */
 
-void		CreateComments(Oid oid, char *comment);
-void		DeleteComments(Oid oid);
-void CommentObject(int objtype, char *objname, char *objproperty,
-			  List *objlist, char *comment);
+extern void	DeleteComments(Oid oid);
+extern void CommentObject(int objtype, char *objname, char *objproperty,
+				List *objlist, char *comment);
 
 #endif	 /* COMMENT_H */
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index c6d5b5413c..22dac3f5fe 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: trigger.h,v 1.20 2000/05/29 01:59:11 tgl Exp $
+ * $Id: trigger.h,v 1.21 2000/06/08 22:37:42 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -137,9 +137,6 @@ extern void DeferredTriggerAbortXact(void);
 
 extern void DeferredTriggerSetState(ConstraintsSetStmt *stmt);
 
-extern void DeferredTriggerSaveEvent(Relation rel, int event,
-						 HeapTuple oldtup, HeapTuple newtup);
-
 
 /*
  * in utils/adt/ri_triggers.c
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index 58f18e4b8f..5cefac6666 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeTidscan.h,v 1.3 2000/04/12 17:16:33 momjian Exp $
+ * $Id: nodeTidscan.h,v 1.4 2000/06/08 22:37:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,7 +20,6 @@ extern TupleTableSlot *ExecTidScan(TidScan *node);
 extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);
 extern void ExecEndTidScan(TidScan *node);
 extern void ExecTidMarkPos(TidScan *node);
-extern void ExecTidRestrPos(TidScan *node);
 extern bool ExecInitTidScan(TidScan *node, EState *estate, Plan *parent);
 extern int	ExecCountSlotsTidScan(TidScan *node);
 extern void ExecTidReScan(TidScan *node, ExprContext *exprCtxt, Plan *parent);
diff --git a/src/include/lib/dllist.h b/src/include/lib/dllist.h
index 46192e1333..9e357a7fd7 100644
--- a/src/include/lib/dllist.h
+++ b/src/include/lib/dllist.h
@@ -27,7 +27,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dllist.h,v 1.12 2000/04/12 17:16:34 momjian Exp $
+ * $Id: dllist.h,v 1.13 2000/06/08 22:37:46 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -61,7 +61,6 @@ extern void DLFreeElem(Dlelem *);
 extern Dlelem *DLGetHead(Dllist *);
 extern Dlelem *DLGetTail(Dllist *);
 extern Dlelem *DLRemTail(Dllist *l);
-extern Dlelem *DLGetPred(Dlelem *);		/* get predecessor */
 extern Dlelem *DLGetSucc(Dlelem *);		/* get successor */
 extern void DLRemove(Dlelem *); /* removes node from list */
 extern void DLAddHead(Dllist *list, Dlelem *node);
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index 95a05164aa..dd778e7e3e 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: miscadmin.h,v 1.57 2000/05/31 00:28:36 petere Exp $
+ * $Id: miscadmin.h,v 1.58 2000/06/08 22:37:35 momjian Exp $
  *
  * NOTES
  *	  some of the information in this file will be moved to
@@ -142,7 +142,6 @@ extern char *getpgusername(void);
 extern void SetPgUserName(void);
 extern int	GetUserId(void);
 extern void SetUserId(void);
-extern int	ValidateBinary(char *path);
 extern int	FindExec(char *backend, char *argv0, char *binary_name);
 extern int	CheckPathAccess(char *path, char *name, int open_mode);
 
@@ -233,7 +232,6 @@ extern void SetWaitingForLock(bool);
 #define PIDFNAME	"postmaster.pid"
 
 extern void SetPidFname(char *datadir);
-extern char *GetPidFname(void);
 extern void UnlinkPidFile(void);
 extern int	SetPidFile(pid_t pid);
 
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 964e9fb0f2..24ffaeb425 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodeFuncs.h,v 1.11 2000/01/26 05:58:16 momjian Exp $
+ * $Id: nodeFuncs.h,v 1.12 2000/06/08 22:37:48 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,5 @@ extern bool single_node(Node *node);
 extern bool var_is_outer(Var *var);
 extern bool var_is_rel(Var *var);
 extern Oper *replace_opid(Oper *oper);
-extern bool non_null(Expr *c);
 
 #endif	 /* NODEFUNCS_H */
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 783dd96e48..7bb0262e9a 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: cost.h,v 1.33 2000/05/31 00:28:38 petere Exp $
+ * $Id: cost.h,v 1.34 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -81,8 +81,5 @@ extern Selectivity restrictlist_selectivity(Query *root,
 extern Selectivity clauselist_selectivity(Query *root,
 					   List *clauses,
 					   int varRelid);
-extern Selectivity clause_selectivity(Query *root,
-				   Node *clause,
-				   int varRelid);
 
 #endif	 /* COST_H */
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index d28bcbe621..f3b0c57384 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: joininfo.h,v 1.15 2000/01/26 05:58:20 momjian Exp $
+ * $Id: joininfo.h,v 1.16 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,6 @@
 
 #include "nodes/relation.h"
 
-extern JoinInfo *joininfo_member(List *join_relids, List *joininfo_list);
 extern JoinInfo *find_joininfo_node(RelOptInfo *this_rel, List *join_relids);
 
 #endif	 /* JOININFO_H */
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index 9a14d2ea59..e76ba20144 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: planmain.h,v 1.40 2000/05/31 00:28:38 petere Exp $
+ * $Id: planmain.h,v 1.41 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,7 +27,6 @@ extern Plan *query_planner(Query *root, List *tlist, List *qual,
  * prototypes for plan/createplan.c
  */
 extern Plan *create_plan(Query *root, Path *best_path);
-extern SeqScan *make_seqscan(List *qptlist, List *qpqual, Index scanrelid);
 extern Sort *make_sort(List *tlist, Oid nonameid, Plan *lefttree,
 		  int keycount);
 extern Agg *make_agg(List *tlist, List *qual, Plan *lefttree);
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index c4b01263eb..f641f4a0fa 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prep.h,v 1.21 2000/01/26 05:58:21 momjian Exp $
+ * $Id: prep.h,v 1.22 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,6 @@
  */
 extern List *canonicalize_qual(Expr *qual, bool removeAndFlag);
 extern List *cnfify(Expr *qual, bool removeAndFlag);
-extern Expr *dnfify(Expr *qual);
 
 /*
  * prototypes for preptlist.c
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 3f1c17c995..8d3eb20d02 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tlist.h,v 1.25 2000/04/12 17:16:42 momjian Exp $
+ * $Id: tlist.h,v 1.26 2000/06/08 22:37:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,8 +16,6 @@
 
 #include "nodes/relation.h"
 
-extern TargetEntry *tlistentry_member(Node *node, List *targetlist);
-extern Node *matching_tlist_expr(Node *node, List *targetlist);
 extern Resdom *tlist_member(Node *node, List *targetlist);
 
 extern void add_var_to_tlist(RelOptInfo *rel, Var *var);
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 15945680bc..4f89bcc65c 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_relation.h,v 1.17 2000/06/03 04:41:33 momjian Exp $
+ * $Id: parse_relation.h,v 1.18 2000/06/08 22:37:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -32,8 +32,6 @@ extern List *expandAll(ParseState *pstate, char *relname, Attr *ref,
 		  int *this_resno);
 extern int	attnameAttNum(Relation rd, char *a);
 extern int	specialAttNum(char *a);
-extern bool attnameIsSet(Relation rd, char *name);
-extern int	attnumAttNelems(Relation rd, int attid);
 extern Oid	attnumTypeId(Relation rd, int attid);
 extern void warnAutoRange(ParseState *pstate, char *refname);
 
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 190d65db4d..e2cfd7f4a2 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_type.h,v 1.13 2000/03/16 06:35:06 tgl Exp $
+ * $Id: parse_type.h,v 1.14 2000/06/08 22:37:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,10 +30,6 @@ extern char typeTypeFlag(Type t);
 extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
 extern Oid	typeidTypeRelid(Oid type_id);
 extern Oid	typeTypeRelid(Type typ);
-extern Oid	typeTypElem(Type typ);
-extern Oid	GetArrayElementType(Oid typearray);
-extern Oid	typeInfunc(Type typ);
-extern Oid	typeOutfunc(Type typ);
 
 #define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid)
 
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index 3f79e5bfab..078abebae5 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -18,7 +18,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buffile.h,v 1.4 2000/04/12 17:16:51 momjian Exp $
+ * $Id: buffile.h,v 1.5 2000/06/08 22:37:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,13 +37,10 @@ typedef struct BufFile BufFile;
  */
 
 extern BufFile *BufFileCreateTemp(void);
-extern BufFile *BufFileCreate(File file);
 extern void BufFileClose(BufFile *file);
 extern size_t BufFileRead(BufFile *file, void *ptr, size_t size);
 extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
 extern int	BufFileSeek(BufFile *file, int fileno, long offset, int whence);
-extern void BufFileTell(BufFile *file, int *fileno, long *offset);
 extern int	BufFileSeekBlock(BufFile *file, long blknum);
-extern long BufFileTellBlock(BufFile *file);
 
 #endif	 /* BUFFILE_H */
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index e7cb6ac54f..71a59cb9cc 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.24 2000/01/26 05:58:33 momjian Exp $
+ * $Id: lmgr.h,v 1.25 2000/06/08 22:37:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -45,7 +45,6 @@ extern void UnlockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode);
 
 /* and this is for transactions */
 extern void XactLockTableInsert(TransactionId xid);
-extern void XactLockTableDelete(TransactionId xid);
 extern void XactLockTableWait(TransactionId xid);
 
 /* proc.c */
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index 98018c321c..a19e75a085 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.28 2000/05/31 00:28:39 petere Exp $
+ * $Id: tcopprot.h,v 1.29 2000/06/08 22:37:56 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -37,7 +37,6 @@ extern List *pg_parse_and_rewrite(char *query_string,
 					 Oid *typev, int nargs,
 					 bool aclOverride);
 extern Plan *pg_plan_query(Query *querytree);
-extern void pg_exec_query_acl_override(char *query_string);
 extern void pg_exec_query_dest(char *query_string,
 				   CommandDest dest,
 				   bool aclOverride);
@@ -45,9 +44,7 @@ extern void pg_exec_query_dest(char *query_string,
 #endif	 /* BOOTSTRAP_INCLUDE */
 
 extern void handle_warn(SIGNAL_ARGS);
-extern void quickdie(SIGNAL_ARGS);
 extern void die(SIGNAL_ARGS);
-extern void FloatExceptionHandler(SIGNAL_ARGS);
 extern void CancelQuery(void);
 extern int PostgresMain(int argc, char *argv[],
 			 int real_argc, char *real_argv[]);
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 6dc9aa8165..c53398f9a7 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.113 2000/06/05 07:29:07 tgl Exp $
+ * $Id: builtins.h,v 1.114 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -209,7 +209,6 @@ extern char *filename_in(char *file);
 extern char *filename_out(char *s);
 
 /* float.c */
-extern void CheckFloat8Val(double val); /* used by lex */
 extern float32 float4in(char *num);
 extern char *float4out(float32 num);
 extern float64 float8in(char *num);
@@ -408,9 +407,6 @@ extern char *make_greater_string(const char *str, Oid datatype);
 extern ItemPointer tidin(const char *str);
 extern char *tidout(ItemPointer itemPtr);
 extern bool tideq(ItemPointer, ItemPointer);
-extern bool tidne(ItemPointer, ItemPointer);
-extern text *tid_text(ItemPointer);
-extern ItemPointer text_tid(const text *);
 extern ItemPointer currtid_byreloid(Oid relOid, ItemPointer);
 extern ItemPointer currtid_byrelname(const text *relName, ItemPointer);
 
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 2e8ca5bc9b..15d8ab9284 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -9,7 +9,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: datetime.h,v 1.14 2000/05/29 19:16:56 tgl Exp $
+ * $Id: datetime.h,v 1.15 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -255,19 +255,8 @@ extern int	EncodeTimeOnly(struct tm * tm, double fsec, int *tzp, int style, char
 extern int	EncodeDateTime(struct tm * tm, double fsec, int *tzp, char **tzn, int style, char *str);
 extern int	EncodeTimeSpan(struct tm * tm, double fsec, int style, char *str);
 
-extern int	DecodeDate(char *str, int fmask, int *tmask, struct tm * tm);
-extern int DecodeNumber(int flen, char *field,
-			 int fmask, int *tmask,
-			 struct tm * tm, double *fsec, int *is2digits);
-extern int DecodeNumberField(int len, char *str,
-				  int fmask, int *tmask,
-				  struct tm * tm, double *fsec, int *is2digits);
 extern int	DecodeSpecial(int field, char *lowtoken, int *val);
-extern int DecodeTime(char *str, int fmask, int *tmask,
-		   struct tm * tm, double *fsec);
-extern int	DecodeTimezone(char *str, int *tzp);
 extern int	DecodeUnits(int field, char *lowtoken, int *val);
-extern datetkn *datebsearch(char *key, datetkn *base, unsigned int nel);
 
 extern int	j2day(int jd);
 
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index b6c02a1192..5c6c09ccbc 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lsyscache.h,v 1.23 2000/04/12 17:16:55 momjian Exp $
+ * $Id: lsyscache.h,v 1.24 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,7 +34,6 @@ extern Oid	get_negator(Oid opid);
 extern RegProcedure get_oprrest(Oid opid);
 extern RegProcedure get_oprjoin(Oid opid);
 extern Oid	get_func_rettype(Oid funcid);
-extern int	get_relnatts(Oid relid);
 extern char *get_rel_name(Oid relid);
 extern struct varlena *get_relstub(Oid relid, int no, bool *islast);
 extern Oid	get_ruleid(char *rulename);
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index bce73ae080..b7c1d0dc3a 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: timestamp.h,v 1.4 2000/04/12 17:16:56 momjian Exp $
+ * $Id: timestamp.h,v 1.5 2000/06/08 22:37:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -158,11 +158,6 @@ extern int	tm2timestamp(struct tm * tm, double fsec, int *tzp, Timestamp *dt);
 extern int	timestamp2tm(Timestamp dt, int *tzp, struct tm * tm, double *fsec, char **tzn);
 
 extern Timestamp SetTimestamp(Timestamp timestamp);
-extern Timestamp dt2local(Timestamp dt, int timezone);
-extern void dt2time(Timestamp dt, int *hour, int *min, double *sec);
-extern int	EncodeSpecialTimestamp(Timestamp dt, char *str);
-extern int	interval2tm(Interval span, struct tm * tm, float8 *fsec);
-extern int	tm2interval(struct tm * tm, double fsec, Interval *span);
 extern Timestamp *now(void);
 
 #endif	 /* TIMESTAMP_H */
diff --git a/src/tools/find_static b/src/tools/find_static
index 5951484d71..f2b10e7a86 100755
--- a/src/tools/find_static
+++ b/src/tools/find_static
@@ -16,7 +16,7 @@ find . -name '[a-z]*.o' -type f -print | while read FILE
 do
 	nm $FILE | cut -c10-100 |awk '{printf "%s\t%s\t%s\n", "'"$FILE"'",$1,$2}'
 done >/tmp/$$
-destroydb debug
+dropdb debug
 createdb debug
 echo "
 	create table debug (file text, scope char, func text);
@@ -43,6 +43,7 @@ echo "
 
 	select 	*
 	from 	debug2
-	where	scope = 'T';
+	where	scope = 'T'
+        order by file, func;
 " |psql debug