diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index b1aa7342a9566c3a050a8e0090fa977f9b3aa2b4..4dfa6fd2558d2b731c1d0eb84659d27cbe8c9494 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.16 1997/06/10 07:28:47 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.17 1997/08/20 14:53:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,9 +35,6 @@ 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);
-#if 0
-static InsertIndexResult _bt_shift (Relation rel, Buffer buf, BTStack stack, int keysz, ScanKey scankey, BTItem btitem, BTItem hikey);
-#endif
 
 /*
  *  _bt_doinsert() -- Handle insertion of a single btitem in the tree.
@@ -1449,7 +1446,7 @@ _bt_isequal (TupleDesc itupdesc, Page page, OffsetNumber offnum,
     return (true);
 }
 
-#if 0
+#ifdef NOT_USED
 /*
  * _bt_shift - insert btitem on the passed page after shifting page 
  *	       to the right in the tree.
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 05973cb030cf8ad6b71270859278de18c66bc45f..e51a52d385759153692888409ba35d9f28c2d9b9 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.11 1997/08/19 21:31:06 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.12 1997/08/20 14:53:20 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -467,7 +467,7 @@ ExecAssignScanTypeFromOuterPlan(Plan *node, CommonScanState *csstate)
  *	    to share common code.
  * ----------------
  */
-#if 0 
+#ifdef NOT_USED 
 void
 ExecSetTypeInfo(int index,
 		TupleDesc typeInfo,
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 282113fad5fddee4d874a394c6bb79b3dd9ad559..daf324bb77a2d3968aff370effaf44a0b6d7011b 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.5 1996/11/08 00:45:58 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.6 1997/08/20 14:53:24 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -336,7 +336,7 @@ ExecEndMaterial(Material *node)
     ExecClearTuple(matstate->csstate.css_ScanTupleSlot);
 } 
 
-#if 0	/* not used */
+#ifdef NOT_USED	/* not used */
 /* ----------------------------------------------------------------
  *	ExecMaterialMarkPos
  * ----------------------------------------------------------------
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index aa6a088c492668ef0b49fd3b90f6dbd760e57662..148f9638089050ee19585a5adf67f7388a68ea55 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.2 1996/10/31 10:59:27 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.3 1997/08/20 14:53:30 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -543,7 +543,7 @@ remove_ands(Expr *qual)
  *    are referenced in the target list.
  *    
  */
-#if 0 
+#ifdef NOT_USED 
 static List *
 update_relations(List *tlist)
 {
diff --git a/src/backend/optimizer/util/internal.c b/src/backend/optimizer/util/internal.c
index a10dbf8fea4b55742b560b91bb3c2aea38a42d03..8b2dfd43bcbb1a61a773555a1e6a86c8430323fc 100644
--- a/src/backend/optimizer/util/internal.c
+++ b/src/backend/optimizer/util/internal.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.2 1996/10/31 10:59:39 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/internal.c,v 1.3 1997/08/20 14:53:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -31,7 +31,7 @@
 #include "nodes/primnodes.h"
 #include "utils/palloc.h"
 
-#if 0 
+#ifdef NOT_USED 
 /*****************************************************************************
  *
  *****************************************************************************/
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 8048767455b72d384a6700ca8253f270e7c8093d..c0f11ff3293da62190c47f1b465d8690335abe05 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.3 1997/08/19 21:32:08 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.4 1997/08/20 14:53:47 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -532,7 +532,7 @@ get_expr(TargetEntry *tle)
  *    append the group attribute to the target list if it's not already
  *    in there.
  */
-#if 0
+#ifdef NOT_USED
 void
 AddGroupAttrToTlist(List *tlist, List *grpCl)
 {
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index c29e8c839d819502b28b8bc5b7e01b39af0741b5..69e34d3aa4c8f6c100dff83ce07f8b7401c3c9ba 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.15 1997/08/19 21:35:13 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.16 1997/08/20 14:54:07 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -90,6 +90,22 @@ static void RelationFlushRelation(Relation *relationPtr,
 static Relation RelationNameCacheGetRelation(char *relationName);
 static void init_irels(void);
 static void write_irels(void);
+/* non-export function prototypes */
+static void formrdesc(char *relationName, u_int natts,
+		      FormData_pg_attribute att[]);
+static HeapTuple ScanPgRelation(RelationBuildDescInfo buildinfo);
+static HeapTuple scan_pg_rel_seq(RelationBuildDescInfo buildinfo);
+static HeapTuple scan_pg_rel_ind(RelationBuildDescInfo buildinfo);
+static Relation AllocateRelationDesc(u_int natts, Form_pg_class relp);
+static void RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,    
+		Relation relation, AttributeTupleForm attp, u_int natts);
+static void build_tupdesc_seq(RelationBuildDescInfo buildinfo,
+		Relation relation, AttributeTupleForm attp, u_int natts);
+static void build_tupdesc_ind(RelationBuildDescInfo buildinfo,
+		Relation relation, AttributeTupleForm attp, u_int natts);
+static Relation RelationBuildDesc(RelationBuildDescInfo buildinfo);
+static void IndexedAccessMethodInitialize(Relation relation);
+
 
 /* ----------------
  *	defines
@@ -238,27 +254,6 @@ typedef struct relnamecacheent {
 	  } \
     }
 
-/* non-export function prototypes */
-static void formrdesc(char *relationName, u_int natts,
-		      FormData_pg_attribute att[]);
-
-#if 0		/* See comments at line 1304 */
-static void RelationFlushIndexes(Relation *r, Oid accessMethodId);
-#endif
-
-static HeapTuple ScanPgRelation(RelationBuildDescInfo buildinfo);
-static HeapTuple scan_pg_rel_seq(RelationBuildDescInfo buildinfo);
-static HeapTuple scan_pg_rel_ind(RelationBuildDescInfo buildinfo);
-static Relation AllocateRelationDesc(u_int natts, Form_pg_class relp);
-static void RelationBuildTupleDesc(RelationBuildDescInfo buildinfo,    
-		Relation relation, AttributeTupleForm attp, u_int natts);
-static void build_tupdesc_seq(RelationBuildDescInfo buildinfo,
-		Relation relation, AttributeTupleForm attp, u_int natts);
-static void build_tupdesc_ind(RelationBuildDescInfo buildinfo,
-		Relation relation, AttributeTupleForm attp, u_int natts);
-static Relation RelationBuildDesc(RelationBuildDescInfo buildinfo);
-static void IndexedAccessMethodInitialize(Relation relation);
-
 /*
  * newlyCreatedRelns -
  *    relations created during this transaction. We need to keep track of
@@ -273,7 +268,7 @@ static List *newlyCreatedRelns = NULL;
  */
  
 
-#if 0		/* XXX This doesn't seem to be used anywhere */
+#ifdef NOT_USED		/* XXX This doesn't seem to be used anywhere */
 /* --------------------------------
  *	BuildDescInfoError returns a string appropriate to
  *	the buildinfo passed to it
@@ -1351,7 +1346,7 @@ RelationIdInvalidateRelationCacheByRelationId(Oid relationId)
     }
 }
 
-#if 0		/* See comments at line 1304 */
+#ifdef NOT_USED		/* See comments at line 1304 */
 /* --------------------------------
  *	RelationIdInvalidateRelationCacheByAccessMethodId
  *
diff --git a/src/include/parser/parse_query.h b/src/include/parser/parse_query.h
index d87556707a1f2c4a34993cd7c8c808760457f953..dc6f16dbc47d7cd4df2f153e57f7a372659083c0 100644
--- a/src/include/parser/parse_query.h
+++ b/src/include/parser/parse_query.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_query.h,v 1.8 1997/08/19 21:39:37 momjian Exp $
+ * $Id: parse_query.h,v 1.9 1997/08/20 14:54:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -58,11 +58,6 @@ extern void handleTargetColname(ParseState *pstate, char **resname,
  * analyze.c
  */
 
-#if 0
-extern List *p_rtable;
-extern int NumLevels;
-#endif
-
 Oid exprType(Node *expr);
 QueryTreeList *parse_analyze(List *querytree_list);
 
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 979b9f798443e13ff3d876f8dde26361bf73f4bb..01dfc067970546e784edca53bdbcebaaa4815567 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -15,7 +15,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: memutils.h,v 1.7 1997/08/19 21:40:43 momjian Exp $
+ * $Id: memutils.h,v 1.8 1997/08/20 14:54:35 momjian Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -27,7 +27,7 @@
 #define MEMUTILS_H
 
 
-#if 0
+#ifdef NOT_USED
 /*****************************************************************************
  *	align.h		- alignment macros                                   *
  ****************************************************************************