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/rewrite/rewriteSupport.c

@@ -7,29 +7,28 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.19 1998/04/26 04:07:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.20 1998/04/27 04:06:26 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "catalog/catname.h"
-#include "catalog/pg_rewrite.h"
-#include "utils/syscache.h"		/* for SearchSysCache */
-#include "nodes/pg_list.h"
-#include "nodes/parsenodes.h"
-#include "utils/builtins.h"		/* for textout */
-#include "utils/rel.h"			/* for Relation, RelationData ... */
-#include "utils/elog.h"			/* for elog */
-#include "storage/buf.h"		/* for InvalidBuffer */
-#include "rewrite/rewriteSupport.h"
+
 #include "access/heapam.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_proc.h"
+#include "catalog/catname.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_class.h"
+#include "catalog/pg_rewrite.h"
+#include "fmgr.h"
+#include "nodes/parsenodes.h"
+#include "nodes/pg_list.h"
+#include "storage/buf.h"		/* for InvalidBuffer */
+#include "utils/builtins.h"		/* for textout */
 #include "utils/catcache.h"		/* for CacheContext */
 #include "utils/mcxt.h"			/* MemoryContext stuff */
-#include "utils/palloc.h"
-#include "fmgr.h"
+#include "utils/rel.h"			/* for Relation, RelationData ... */
+#include "utils/syscache.h"		/* for SearchSysCache */
+
+#include "rewrite/rewriteSupport.h"
 
 /*
  * RuleIdGetActionInfo -