This patch...

1. Removes the unnecessary "#define AbcRegProcedure 123"'s from
pg_proc.h.

2. Changes those #defines to use the names already defined in
fmgr.h.

3. Forces the make of fmgr.h in backend/Makefile instead of having
it
   made as a dependency in access/common/Makefile  *hack*hack*hack*

4. Rearranged the #includes to a less helter-skelter arrangement,
also
    changing <file.h> to "file.h" to signify a non-system header.

5. Removed "pg_proc.h" from files where its only purpose was for
the
   #defines removed in item #1.

6. Added "fmgr.h" to each file changed for completeness sake.

Turns out that #6 was not necessary for some files because fmgr.h
was being included in a roundabout way SIX levels deep by the first
include.

"access/genam.h"
 ->"access/relscan.h"
   ->"utils/rel.h"
     ->"access/strat.h"
       ->"access/skey.h"
	 ->"fmgr.h"

So adding fmgr.h really didn't add anything to the compile, hopefully
just made it clearer to the programmer.

S Darren.

src/backend/optimizer/path/clausesel.c

@@ -7,30 +7,26 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.6 1998/02/26 04:32:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.7 1998/04/27 04:05:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
+#include "catalog/pg_operator.h"
+#include "fmgr.h"
 #include "nodes/pg_list.h"
-#include "nodes/relation.h"
 #include "nodes/primnodes.h"
-
-#include "optimizer/internal.h"
+#include "nodes/relation.h"
 #include "optimizer/clauses.h"
 #include "optimizer/clauseinfo.h"
 #include "optimizer/cost.h"
+#include "optimizer/internal.h"
 #include "optimizer/plancat.h"
-
 #include "parser/parsetree.h"	/* for getrelid() */
-
-#include "catalog/pg_proc.h"
-#include "catalog/pg_operator.h"
-
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 
+
 static Cost compute_selec(Query *root, List *clauses, List *or_selectivities);
 
 /****************************************************************************
@@ -254,7 +250,7 @@ compute_selec(Query *root, List *clauses, List *or_selectivities)
 		 * of that info.
 		 */
 
-		s1 = restriction_selectivity(EqualSelectivityProcedure,
+		s1 = restriction_selectivity(F_EQSEL,
 									 BooleanEqualOperator,
 									 relid,
 									 ((Var *) clause)->varoattno,