From ff36ebc922566542f4f18c4e76a379bc620dfde4 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sun, 3 Nov 1996 12:13:35 +0000
Subject: [PATCH] More cleans of the inter-dependencies in the #include files

---
 src/include/access/genam.h         |  7 +---
 src/include/access/gist.h          |  5 ++-
 src/include/access/gistscan.h      |  4 +++
 src/include/catalog/index.h        |  8 ++---
 src/include/catalog/pg_proc.h      |  5 +--
 src/include/executor/executor.h    | 55 ++++++------------------------
 src/include/executor/tuptable.h    |  4 +--
 src/include/nodes/execnodes.h      | 11 +++---
 src/include/nodes/nodes.h          |  3 +-
 src/include/nodes/parsenodes.h     |  6 ++--
 src/include/nodes/plannodes.h      |  5 +--
 src/include/nodes/primnodes.h      |  4 +--
 src/include/parser/catalog_utils.h |  6 +---
 src/include/storage/bufmgr.h       |  9 +++--
 src/include/tcop/dest.h            |  5 ++-
 src/include/utils/builtins.h       | 10 +++---
 src/include/utils/memutils.h       | 12 +------
 17 files changed, 48 insertions(+), 111 deletions(-)

diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index b23533cbe3..ea81219993 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -6,20 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: genam.h,v 1.2 1996/10/31 09:46:37 scrappy Exp $
+ * $Id: genam.h,v 1.3 1996/11/03 12:12:22 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	GENAM_H
 #define GENAM_H
 
-
-#include "access/attnum.h"
-#include "access/htup.h"
-#include "access/istrat.h"
 #include "access/itup.h"
 #include "access/relscan.h"
-#include "access/skey.h"
 #include "access/sdir.h"
 #include "access/funcindex.h"
 
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 4befdd8ae9..38ef591d46 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -12,11 +12,10 @@
 #ifndef GIST_H
 #define GIST_H
 
-#include "utils/rel.h"
 #include "storage/off.h"
+#include "utils/rel.h"
 #include "storage/block.h"
-#include "storage/bufpage.h"
-#include "access/skey.h"
+#include "storage/page.h"
 
 /* 
 ** You can have as many strategies as you please in GiSTs, as
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 5fa7abbcc4..3eb1eba625 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -11,6 +11,10 @@
  */
 #ifndef GISTSCAN_H
 
+#include "utils/rel.h"
+#include "storage/block.h"
+#include "storage/off.h"
+
 void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
 
 #endif /* GISTSCAN_H */
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index f59af4f0ec..82e7f09e8e 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -6,18 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: index.h,v 1.1 1996/08/28 01:56:27 scrappy Exp $
+ * $Id: index.h,v 1.2 1996/11/03 12:12:28 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	INDEX_H 
 #define INDEX_H
 
-#include "access/funcindex.h"
-#include "access/itup.h"
 #include "nodes/execnodes.h"
+#include "access/htup.h"
+#include "access/itup.h"
 #include "nodes/parsenodes.h"
-
+#include "storage/buf.h"
 
 extern Form_pg_am
 AccessMethodObjectIdGetAccessMethodTupleForm(Oid accessMethodObjectId);
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 034fd26143..114b334222 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_proc.h,v 1.2 1996/10/31 09:47:52 scrappy Exp $
+ * $Id: pg_proc.h,v 1.3 1996/11/03 12:12:32 scrappy Exp $
  *
  * NOTES
  *    The script catalog/genbki.sh reads this file and generates .bki
@@ -754,9 +754,6 @@ DATA(insert OID =  1239 (  texticregexne       PGUID 11 f t f 2 f 16 "25 25" 100
 DATA(insert OID =  1240 (  nameicregexeq     PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
 DATA(insert OID =  1241 (  nameicregexne     PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100  foo bar ));
 
-
-#include "nodes/pg_list.h"
-
 /* 
  * prototypes for functions pg_proc.c 
  */
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index c849a06616..b91d857f93 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: executor.h,v 1.2 1996/10/31 09:48:30 scrappy Exp $
+ * $Id: executor.h,v 1.3 1996/11/03 12:12:39 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,57 +17,22 @@
  *     #includes
  * ----------------------------------------------------------------
  */
+
 #include <stdio.h>
-#include <string.h>
 
-#include "nodes/pg_list.h"
-
-/* ----------------
- * executor debugging definitions are kept in a separate file
- * so people can customize what debugging they want to see and not
- * have this information clobbered every time a new version of
- * executor.h is checked in -cim 10/26/89
- * ----------------
- */
-#include "executor/execdebug.h"
-
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/istrat.h"
 #include "access/itup.h"
+#include "access/relscan.h"
 #include "access/skey.h"
-#include "utils/tqual.h"
-#include "catalog/catname.h"
-#include "utils/syscache.h"
-#include "executor/execdefs.h"
-#include "executor/tuptable.h"
-
-#include "nodes/parsenodes.h"
-
-#include "storage/buf.h"
-#include "miscadmin.h"
-#include "fmgr.h"
-#include "utils/elog.h"
-#include "utils/mcxt.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
-
+#include "access/sdir.h"
 #include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
-#include "catalog/pg_aggregate.h"
-
-#include "access/printtup.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-
-#include "tcop/dest.h"
-#include "storage/smgr.h"
-
-#include "access/genam.h"
 #include "executor/execdesc.h"
 
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
 /*
  * prototypes from functions in execAmi.c
  */
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 0134645689..e9596739e4 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tuptable.h,v 1.2 1996/10/23 07:41:36 scrappy Exp $
+ * $Id: tuptable.h,v 1.3 1996/11/03 12:12:42 scrappy Exp $
  *
  * NOTES
  *    The tuple table interface is getting pretty ugly.
@@ -18,7 +18,7 @@
 #define TUPTABLE_H
 
 #include "access/htup.h"
-#include "access/relscan.h"
+#include "storage/buf.h"
 
 /* ----------------
  *	Note:  the executor tuple table is managed and manipulated by special
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 63cbe32b46..7cd8593172 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -6,20 +6,21 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: execnodes.h,v 1.4 1996/10/23 07:41:56 scrappy Exp $
+ * $Id: execnodes.h,v 1.5 1996/11/03 12:12:50 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef EXECNODES_H
 #define EXECNODES_H
 
-#include "nodes/params.h"
-#include "access/sdir.h"
-#include "access/funcindex.h"
 #include "executor/hashjoin.h"
 #include "nodes/primnodes.h"
-#include "nodes/memnodes.h"
+#include "access/funcindex.h"
+#include "access/relscan.h"
 #include "executor/tuptable.h"
+#include "nodes/params.h"
+#include "access/sdir.h"
+#include "nodes/memnodes.h"
 
 /* ----------------
  *    IndexInfo information
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 6c6d48ae8c..992933c59f 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: nodes.h,v 1.2 1996/10/31 09:49:10 scrappy Exp $
+ * $Id: nodes.h,v 1.3 1996/11/03 12:12:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef NODES_H
 #define	NODES_H
 
-
 /*
  * The first field of every node is NodeTag. Each node created (with makeNode)
  * will have one of the following tags as the value of its first field.
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 61e20dc2be..b46a77ebe3 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parsenodes.h,v 1.4 1996/10/30 02:02:08 momjian Exp $
+ * $Id: parsenodes.h,v 1.5 1996/11/03 12:12:55 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PARSENODES_H
 #define	PARSENODES_H
 
-#include "nodes/primnodes.h"
-#include "utils/tqual.h"
+#include "utils/tqual.h" 
+#include "nodes/primnodes.h" 
 
 /*****************************************************************************
  *  Query Tree 
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index b431a45b79..856a4ef4c6 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -6,16 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: plannodes.h,v 1.2 1996/10/31 09:49:16 scrappy Exp $
+ * $Id: plannodes.h,v 1.3 1996/11/03 12:12:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PLANNODES_H
 #define	PLANNODES_H
 
-
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index cbdb723d06..41e98fbb5d 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: primnodes.h,v 1.4 1996/10/23 07:42:02 scrappy Exp $
+ * $Id: primnodes.h,v 1.5 1996/11/03 12:12:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,9 +14,7 @@
 #define	PRIMNODES_H
 
 #include "nodes/pg_list.h"
-#include "nodes/nodes.h"
 #include "access/attnum.h"
-
 #include "utils/fcache.h"
 
 /* ----------------------------------------------------------------
diff --git a/src/include/parser/catalog_utils.h b/src/include/parser/catalog_utils.h
index 8fed6eb8b8..f6e479ab4f 100644
--- a/src/include/parser/catalog_utils.h
+++ b/src/include/parser/catalog_utils.h
@@ -6,17 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: catalog_utils.h,v 1.2 1996/10/31 09:49:33 scrappy Exp $
+ * $Id: catalog_utils.h,v 1.3 1996/11/03 12:13:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	CATALOG_UTILS_H
 #define	CATALOG_UTILS_H
 
-
-
-#include "access/htup.h"
-#include "utils/rel.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "utils/syscache.h"
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 3d72f1f503..e1b397a2a3 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.5 1996/11/01 09:31:05 scrappy Exp $
+ * $Id: bufmgr.h,v 1.6 1996/11/03 12:13:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,11 +14,10 @@
 #define BUFMGR_H
 
 #include <stdio.h>
-
-#include "storage/ipc.h"
-#include "storage/buf.h"
-#include "utils/rel.h"
 #include "storage/block.h"
+#include "storage/buf.h"
+#include "storage/ipc.h"
+#include "utils/rel.h"
 
 /*
  * the maximum size of a disk block for any possible installation.
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index 9acdff5670..740d23c2b6 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -26,15 +26,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: dest.h,v 1.1 1996/08/28 07:27:49 scrappy Exp $
+ * $Id: dest.h,v 1.2 1996/11/03 12:13:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef DEST_H
 #define DEST_H
 
-#include "catalog/pg_attribute.h"
-#include "access/tupdesc.h"
+#include "access/tupdesc.h" 
 
 /* ----------------
  *	CommandDest is used to allow the results of calling
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index d5a61cfaed..055aa45306 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.2 1996/10/31 09:51:07 scrappy Exp $
+ * $Id: builtins.h,v 1.3 1996/11/03 12:13:34 scrappy Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -18,12 +18,10 @@
 #ifndef BUILTINS_H
 #define BUILTINS_H
 
-
 #include "storage/itemptr.h"
-
-#include "storage/large_object.h"
-
-#include "utils/geo-decls.h"
+#include "utils/nabstime.h"
+#include "utils/geo-decls.h" 
+#include "utils/rel.h"
 
 /*
  *	Defined in adt/
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index bcac77fb1b..be5ef43eac 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.2 1996/10/31 09:51:27 scrappy Exp $
+ * $Id: memutils.h,v 1.3 1996/11/03 12:13:35 scrappy Exp $
  *
  * NOTES
  *    some of the information in this file will be moved to
@@ -81,11 +81,6 @@ s...)
 #define MAXALIGN(LEN)\
 	(((long)(LEN) + (sizeof (double) - 1)) & ~(sizeof (double) -1))
 
-/*****************************************************************************
- *    bit.h                                                                  *
- *****************************************************************************/
-#include "utils/bit.h"
-
 /*****************************************************************************
  *    oset.h -- 	Fixed format ordered set definitions.                *
  *****************************************************************************/
@@ -95,8 +90,6 @@ s...)
  *	XXX semantics of the external definitions.  Otherwise, the
  *	XXX functional interface should not change.
  *
- * Identification:
- *	$Header: /cvsroot/pgsql/src/include/utils/memutils.h,v 1.2 1996/10/31 09:51:27 scrappy Exp $
  */
 
 typedef struct OrderedElemData OrderedElemData;
@@ -244,9 +237,6 @@ extern void AllocSetDump(AllocSet set);
  *	This file is OPERATING SYSTEM dependent!!!
  *
  */
-/* #include <memory.h> */
-/* use <string.h> because it's ANSI */
-#include <string.h>
 
 /* 
  *	LibCCopyLength is only used within this file. -cim 6/12/90