diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 626ffd14570302442054d5038a55b5e87e625606..ad1c7b252c9e94044f4bcba34e49847562820ba5 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.53 1999/06/12 14:07:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.54 1999/07/15 22:38:31 momjian Exp $
*
* NOTES
* The old interface functions have been converted to macros
@@ -20,15 +20,9 @@
#include <postgres.h>
#include <access/heapam.h>
-#include <access/htup.h>
-#include <access/transam.h>
-#include <access/tupmacs.h>
#include <catalog/pg_type.h>
-#include <storage/bufpage.h>
-#include <utils/memutils.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 5c779bcf6c7d1c09686d73444467df704a082699..61b1ae483ee7a29f3278143a6bc6e0432db5d00b 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.33 1999/02/13 23:14:11 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.34 1999/07/15 22:38:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,13 +16,10 @@
#include <postgres.h>
#include <access/heapam.h>
-#include <access/ibit.h>
#include <access/itup.h>
-#include <access/tupmacs.h>
#include <catalog/pg_type.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/common/indexvalid.c b/src/backend/access/common/indexvalid.c
index c2387dae24011c7a21e43d513d0c9aa57cbd2fc0..0d3f4bac42341e277927ee6d1874fd5adb50149a 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -7,18 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.21 1999/02/13 23:14:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/indexvalid.c,v 1.22 1999/07/15 22:38:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <fmgr.h>
-#include <access/htup.h>
#include <access/iqual.h>
-#include <access/itup.h>
-#include <access/skey.h>
#include <executor/execdebug.h>
/* ----------------------------------------------------------------
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index d2d990421baaaf68173188965c875becf8091943..2313e3e6c9673d55af6ca181626fdc49ead8964b 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.47 1999/05/25 22:40:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/printtup.c,v 1.48 1999/07/15 22:38:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,9 @@
#include "postgres.h"
-#include "fmgr.h"
#include "access/heapam.h"
#include "access/printtup.h"
#include "catalog/pg_type.h"
-#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "utils/syscache.h"
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 7dd9b6a9206c658ad647375e83e8128ae10cde42..ed95c0dfb8cbc8e1d64e7337dd8ac63d9f21555a 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -7,14 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.14 1999/05/25 16:06:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/scankey.c,v 1.15 1999/07/15 22:38:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <fmgr.h>
#include <access/skey.h>
/*
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 5692129d9edf300ebe5d0c384fd1939267fb9b70..27ffc2aec3c581812fc3054bc0161feef82853a8 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.50 1999/05/25 22:40:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.51 1999/07/15 22:38:33 momjian Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -24,11 +24,9 @@
#include <nodes/parsenodes.h>
#include <parser/parse_type.h>
#include <utils/builtins.h>
-#include <utils/fcache.h>
#include <utils/syscache.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index bf2499fa05fc94314172576b18b0562cbd633671..2e905427d894cdf381601b9ed760ebf0a75cb019 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -13,7 +13,6 @@
#include <postgres.h>
-#include <fmgr.h>
#include <catalog/pg_index.h>
#include <access/genam.h>
#include <access/gist.h>
@@ -21,14 +20,9 @@
#include <access/heapam.h>
#include <catalog/index.h>
#include <executor/executor.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <storage/lmgr.h>
#include <utils/syscache.h>
-#include <utils/tqual.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 665bc830357e1d247f11fe4c7ce1a915a95bcee1..07dbd2694713905bb91b2a5f7deeb332ce4bdfe2 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -13,16 +13,10 @@
#include <postgres.h>
-#include <access/relscan.h>
-#include <storage/bufpage.h>
-#include <access/sdir.h>
-#include <access/itup.h>
#include <access/gist.h>
#include <executor/execdebug.h>
-#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index d26387d8280c944c1a80ce9ec2c3475a97b4ecd6..2fe9222b2d44722158997e4093cdf34afc19690a 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -15,13 +15,8 @@
#include <access/gist.h>
#include <access/gistscan.h>
#include <access/genam.h>
-#include <access/rtree.h>
-#include <storage/bufmgr.h>
-#include <access/giststrat.h>
-#include <storage/lmgr.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 65d04658c50435e62502f0d453c1add20ea78941..525168b836d2cbf302338407c1afaa5e2a06aeb9 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.26 1999/05/25 16:06:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hash.c,v 1.27 1999/07/15 22:38:35 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -22,11 +22,9 @@
#include <access/heapam.h>
#include <access/genam.h>
#include <catalog/index.h>
-#include <storage/bufmgr.h>
#include <miscadmin.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index 1f607dcb3fde3fbaf23d58a2dd1427e042f6f7a0..7ccaf1ed759fd4eaf70c4b8f5a923e830d2df3af 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.18 1999/05/25 22:40:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashfunc.c,v 1.19 1999/07/15 22:38:35 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -19,7 +19,6 @@
#include "postgres.h"
#include "access/hash.h"
-#include "utils/int8.h"
uint32
hashint2(int16 key)
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index f1d5d56013d3bf1984a6a5d97603acf81473c61f..a4d51c2d1de7d42bf6f839622c23697626f67db8 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.15 1999/02/13 23:14:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.16 1999/07/15 22:38:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,8 +15,6 @@
#include <postgres.h>
#include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
static InsertIndexResult _hash_insertonpg(Relation rel, Buffer buf, int keysz, ScanKey scankey, HashItem hitem, Buffer metabuf);
static OffsetNumber _hash_pgaddtup(Relation rel, Buffer buf, int keysz, ScanKey itup_scankey, Size itemsize, HashItem hitem);
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index ab599abf05833d67911ebb174144285a52c4dc70..3fb38df0412a47b805ffa665acc5210e449fce60 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.20 1999/02/13 23:14:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashovfl.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
*
* NOTES
* Overflow pages look like ordinary relation pages.
@@ -17,11 +17,8 @@
#include <postgres.h>
#include <access/hash.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index bcda5f85e735ab3a6009c304fa0e17587679a3fa..0dec4c1fd833c4519124ec23932bfd84be46df73 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.20 1999/05/25 16:06:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashpage.c,v 1.21 1999/07/15 22:38:37 momjian Exp $
*
* NOTES
* Postgres hash pages look like ordinary relation pages. The opaque
@@ -26,14 +26,10 @@
#include <postgres.h>
#include <access/hash.h>
-#include <storage/bufmgr.h>
#include <miscadmin.h>
-#include <utils/memutils.h>
-#include <storage/lmgr.h>
#include <access/genam.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 5e00180c6098cabba109063cb4bd8d7da1cece41..9a868fed2162780566ca988137fcc8ecb981db68 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.17 1999/02/13 23:14:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashsearch.c,v 1.18 1999/07/15 22:38:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,10 +15,8 @@
#include <postgres.h>
#include <access/hash.h>
-#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
#else
#include <string.h>
#endif
diff --git a/src/backend/access/hash/hashstrat.c b/src/backend/access/hash/hashstrat.c
index 91c18729ff54749499c0e9e9e032a76cf161a1f6..72a29c1c196bb2f0c6cbeef5d7eed28172333e3c 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -7,15 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.13 1999/02/13 23:14:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/Attic/hashstrat.c,v 1.14 1999/07/15 22:38:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <access/hash.h>
-#include <access/istrat.h>
/*
* only one valid strategy for hash tables: equality.
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 3d420f8d2ffe2e8f4bdacf7d699566ea09e5d9b7..6948145b6198a1eb18850c9b9b300fb8c84a6c57 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.17 1999/07/15 15:18:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.18 1999/07/15 22:38:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,12 +15,9 @@
#include <postgres.h>
#include <access/hash.h>
-#include <fmgr.h>
-#include <utils/memutils.h>
#include <access/iqual.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 6c5bfa353139d92cb426906909cbc016a9fcd1f7..232149c71ed4f4c46bae7d697bb268136b6d6ef4 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.48 1999/07/15 15:18:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.49 1999/07/15 22:38:40 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -75,23 +75,17 @@
#include <postgres.h>
-#include <storage/bufpage.h>
#include <access/heapam.h>
#include <miscadmin.h>
#include <utils/relcache.h>
#include <access/valid.h>
#include <access/hio.h>
-#include <storage/lmgr.h>
#include <storage/smgr.h>
#include <catalog/catalog.h>
-#include <access/transam.h>
-#include <access/xact.h>
#include <utils/inval.h>
-#include <utils/memutils.h>
#include <utils/builtins.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index c71b71e6e1b13892a227512d588193c0115a3fb3..1a680d8d709438d76325beec8dccc8bef7584154 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -7,19 +7,15 @@
*
*
* IDENTIFICATION
- * $Id: hio.c,v 1.22 1999/07/03 01:56:16 momjian Exp $
+ * $Id: hio.c,v 1.23 1999/07/15 22:38:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <storage/bufpage.h>
#include <access/hio.h>
-#include <access/htup.h>
#include <access/heapam.h>
-#include <storage/bufmgr.h>
-#include <utils/memutils.h>
/*
* amputunique - place tuple at tid
diff --git a/src/backend/access/heap/stats.c b/src/backend/access/heap/stats.c
index 222af071dd400629b62b1ef4ee40c247535eb8cc..e9e87664dda77a1c1c861e6b61a0687f263e5b31 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.17 1999/07/15 15:18:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/heap/Attic/stats.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
*
* NOTES
* initam should be moved someplace else.
@@ -23,7 +23,6 @@
#include <access/heapam.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 70b9ae2a4b04b2533677beacb2ad27ef8cf1feec..517eb93357e7d9021540db39cc5d6c2c339a32bd 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.17 1999/05/25 16:07:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/genam.c,v 1.18 1999/07/15 22:38:42 momjian Exp $
*
* NOTES
* many of the old access method routines have been turned into
@@ -46,12 +46,9 @@
#include <postgres.h>
-#include <utils/catcache.h>
#include <access/genam.h>
-#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index 59ebb29e2e92d1384027356562f3a2ac504e9bb3..7d59e2b1283bfb835788489a349cfc8bfbd96bbc 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.32 1999/07/15 15:18:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.33 1999/07/15 22:38:43 momjian Exp $
*
* INTERFACE ROUTINES
* index_open - open an index relation by relationId
@@ -67,8 +67,6 @@
#include <access/genam.h>
#include <utils/relcache.h>
-#include <fmgr.h>
-#include <storage/lmgr.h>
#include <access/heapam.h>
/* ----------------
diff --git a/src/backend/access/index/istrat.c b/src/backend/access/index/istrat.c
index 268df6946e5868a5e9da8cb6235d9ed18d0a4a7b..ad0215dfb4044c3e45d8795bf77d0e1260285de5 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.33 1999/06/19 04:54:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.34 1999/07/15 22:38:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,8 +24,6 @@
#include "catalog/pg_index.h"
#include "catalog/pg_operator.h"
#include "utils/syscache.h"
-#include "fmgr.h"
-#include "utils/memutils.h" /* could have been access/itup.h */
#ifdef USE_ASSERT_CHECKING
static bool StrategyEvaluationIsValid(StrategyEvaluation evaluation);
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 505d4ab55d6a361cdc2634e5995444c698e04ad0..df164bd6ffaf73a5b8ede009734558f9b1e98eb2 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.24 1999/05/25 22:40:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtcompare.c,v 1.25 1999/07/15 22:38:45 momjian Exp $
*
* NOTES
* These functions are stored in pg_amproc. For each operator class
@@ -25,7 +25,6 @@
#include <postgres.h>
#include <utils/builtins.h>
-#include <utils/nabstime.h>
int32
btint2cmp(int16 a, int16 b)
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index d71cf12d4a049535b38e8f406d0bf3439cd7cdf1..b4d3994550d2cb84601c33a10ef649375b8e60c1 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -7,24 +7,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.44 1999/07/15 15:18:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.45 1999/07/15 22:38:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <utils/memutils.h>
-#include <storage/bufpage.h>
#include <access/nbtree.h>
#include <access/heapam.h>
-#include <access/xact.h>
-#include <storage/bufmgr.h>
-#include <access/transam.h>
-#include <fmgr.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 436edadcf0a50c1f153795e250cd34edb225e9bd..522692ba9f148746a2be4556e5f6c44019931410 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.26 1999/07/15 15:18:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.27 1999/07/15 22:38:46 momjian Exp $
*
* NOTES
* Postgres btree pages look like ordinary relation pages. The opaque
@@ -24,14 +24,10 @@
#include <postgres.h>
-#include <storage/bufpage.h>
#include <access/nbtree.h>
#include <miscadmin.h>
-#include <storage/lmgr.h>
-#include <storage/bufmgr.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 59fa09094e7c8f7ac2ed6374788772a3bf381dc3..5961ebf4ec3ee8eb6fca83383a5420ed93399917 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.41 1999/06/07 15:14:54 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtree.c,v 1.42 1999/07/15 22:38:47 momjian Exp $
*
* NOTES
* This file contains only the public interface routines.
@@ -19,8 +19,6 @@
#include <postgres.h>
#include <access/genam.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
#include <access/nbtree.h>
#include <executor/executor.h>
#include <access/heapam.h>
@@ -28,14 +26,11 @@
#include <miscadmin.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
#ifdef BTREE_BUILD_STATS
-#include <tcop/tcopprot.h>
-#include <utils/trace.h>
#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
#endif
diff --git a/src/backend/access/nbtree/nbtscan.c b/src/backend/access/nbtree/nbtscan.c
index eea869776df4111985db1c8d1c678f25aa2ae25f..fbb6046ff757df93fbaa7b64c6baf71beb6fbf88 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.25 1999/07/15 15:18:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtscan.c,v 1.26 1999/07/15 22:38:48 momjian Exp $
*
*
* NOTES
@@ -29,8 +29,6 @@
#include <postgres.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
#include <access/nbtree.h>
typedef struct BTScanListData
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 17ac151acc24ea4ffffcb840d1dc9c2f47c9a2cf..fd98e18fac21d676c0299b73f4d450d173af051a 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.47 1999/07/15 15:18:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.48 1999/07/15 22:38:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,14 +15,9 @@
#include <postgres.h>
#include <access/genam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
-#include <storage/bufmgr.h>
#include <access/nbtree.h>
-#include <catalog/pg_proc.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index 30aca9e088abd7ad71b347b240ee7d4a2a9b54e0..1a90f8322f752143b5df6ca7c58c2315303e6724 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -5,7 +5,7 @@
*
*
* IDENTIFICATION
- * $Id: nbtsort.c,v 1.42 1999/07/15 15:18:41 momjian Exp $
+ * $Id: nbtsort.c,v 1.43 1999/07/15 22:38:49 momjian Exp $
*
* NOTES
*
@@ -52,19 +52,13 @@
#include "postgres.h"
#include "access/nbtree.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
-#include "utils/memutils.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
#ifdef BTREE_BUILD_STATS
-#include "tcop/tcopprot.h"
-#include <utils/trace.h>
#define ShowExecutorStats pg_options[TRACE_EXECUTORSTATS]
#endif
diff --git a/src/backend/access/nbtree/nbtstrat.c b/src/backend/access/nbtree/nbtstrat.c
index 902601a3baaaff9a56491009989899a0454f00d9..e1027215bb55d596ae629d7ea22599650a9fed07 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.8 1999/02/13 23:14:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/Attic/nbtstrat.c,v 1.9 1999/07/15 22:38:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,6 @@
#include <postgres.h>
#include <access/istrat.h>
-#include <storage/bufpage.h>
#include <access/nbtree.h>
/*
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 5368c090f94089eeddf28f79e271e770390ff285..2a178818121d5ee002a66b3f7e0957b4b0ce38e0 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.29 1999/07/15 15:18:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.30 1999/07/15 22:38:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,18 +15,14 @@
#include "postgres.h"
#include "access/genam.h"
-#include "access/iqual.h"
#include "access/istrat.h"
#include "access/nbtree.h"
#include "executor/execdebug.h"
-#include "fmgr.h"
-#include "storage/bufpage.h"
extern int NIndexTupleProcessed;
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index 7f2c4b9131bac4ef3bf203542b2d930392503913..212ddf79b169faae20e113410cf6f0de28289d9c 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,22 +7,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.15 1999/07/15 15:18:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.16 1999/07/15 22:38:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <storage/bufmgr.h>
-#include <access/sdir.h>
-#include <access/relscan.h>
#include <access/iqual.h>
#include <access/rtree.h>
-#include <storage/bufpage.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 36e971dc679494323f091c3d066e841c3625b1f9..cfae3bae75aa6e92f29ae3d16b0de2fb0c1c178a 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.20 1999/07/15 15:18:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.21 1999/07/15 22:38:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,10 +15,8 @@
#include <postgres.h>
#include <utils/builtins.h>
-#include <utils/geo_decls.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index f62a4bf648a1b0aed26b52b29fa9d5bb344a964d..7c5f6f4243d37cd4aa2b4f08c4c13754c2547b6c 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.32 1999/05/25 16:07:38 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.33 1999/07/15 22:38:51 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,18 +16,12 @@
#include <access/genam.h>
#include <catalog/index.h>
-#include <access/rtscan.h>
-#include <storage/lmgr.h>
#include <access/rtree.h>
-#include <storage/bufmgr.h>
#include <utils/geo_decls.h>
#include <executor/executor.h>
#include <access/heapam.h>
-#include <fmgr.h>
-#include <storage/bufpage.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 1e473ded8b18788a56130747b4c92ac0fd9f5d33..5a7e15b07d2ad24c7a8a4d2565273ac815bb8e65 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,22 +7,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.25 1999/07/15 15:18:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.26 1999/07/15 22:38:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <storage/bufmgr.h>
#include <access/genam.h>
-#include <storage/lmgr.h>
-#include <storage/bufpage.h>
#include <access/rtree.h>
-#include <access/rtstrat.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 6f838a4a4a9f1a4d16f391ced5096e609a403806..95c62a7ea6a427256222d54c9d78c88211df7894 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,14 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.11 1999/02/13 23:14:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.12 1999/07/15 22:38:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <utils/rel.h>
#include <access/rtree.h>
#include <access/istrat.h>
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 5cbf8123e7c3ff69fe8a3d9f6adc6357dac153bd..020dd389dd3af0894114474a44035aa101260c7c 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.28 1999/07/15 15:18:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/transam.c,v 1.29 1999/07/15 22:38:53 momjian Exp $
*
* NOTES
* This file contains the high level access-method interface to the
@@ -18,11 +18,8 @@
#include <postgres.h>
-#include <access/transam.h>
-#include <access/xact.h>
#include <access/heapam.h>
#include <catalog/catname.h>
-#include <storage/spin.h>
#include <commands/vacuum.h>
static int RecoveryCheckingEnabled(void);
diff --git a/src/backend/access/transam/transsup.c b/src/backend/access/transam/transsup.c
index a12b1ade2830d14499ca3cfed02a7983b37f61ad..c9788f12969599bb3feb4f6f63ea1a542ce337be 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.21 1999/03/30 01:37:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/Attic/transsup.c,v 1.22 1999/07/15 22:38:54 momjian Exp $
*
* NOTES
* This file contains support functions for the high
@@ -18,10 +18,8 @@
#include <postgres.h>
-#include <access/transam.h>
#include <utils/bit.h>
#include <access/xact.h>
-#include <storage/lmgr.h>
static XidStatus TransBlockGetXidStatus(Block tblock,
TransactionId transactionId);
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 0ec7ede4e79dec6966c6940fe597508ec701179e..0a95088cba466b5f58431cde4fdd55bd12f44433 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -7,16 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.22 1999/06/06 20:19:33 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/varsup.c,v 1.23 1999/07/15 22:38:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
-#include <access/transam.h>
-#include <storage/spin.h>
-#include <access/xact.h>
#include <access/heapam.h>
#include <catalog/catname.h>
#include <storage/proc.h>
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index add151c30ebb91c3cda201cb5565f8f6e64d0531..6a7a8201cce9394ee31d969cba883a9f94288079 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.43 1999/07/15 15:18:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.44 1999/07/15 22:38:54 momjian Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -144,15 +144,11 @@
*/
#include <postgres.h>
-#include <access/xact.h>
#include <utils/inval.h>
#include <utils/portal.h>
-#include <access/transam.h>
-#include <storage/fd.h>
#include <storage/proc.h>
#include <catalog/heap.h>
#include <utils/relcache.h>
-#include <miscadmin.h>
#include <commands/async.h>
#include <commands/sequence.h>
#include <libpq/be-fsstubs.h>
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 15c684f75644b0744a626f165c93d174cbdd61b9..35da114e31a8d15e0e9f33f07e22d34e123491ea 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.61 1999/07/15 15:18:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.62 1999/07/15 22:38:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,6 @@
#include <setjmp.h>
#include <string.h>
#ifdef __CYGWIN32__
-#include <getopt.h>
#endif
#define BOOTSTRAP_INCLUDE /* mask out stuff in tcop/tcopprot.h */
@@ -26,61 +25,20 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "fmgr.h"
-#include "access/attnum.h"
-#include "access/funcindex.h"
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
-#include "access/skey.h"
-#include "access/strat.h"
-#include "access/tupdesc.h"
-#include "access/xact.h"
#include "bootstrap/bootstrap.h"
#include "catalog/catname.h"
#include "catalog/index.h"
-#include "catalog/pg_am.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_class.h"
#include "catalog/pg_type.h"
-#include "executor/execdesc.h"
-#include "executor/hashjoin.h"
-#include "executor/tuptable.h"
#include "libpq/pqsignal.h"
-#include "nodes/execnodes.h"
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/params.h"
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "rewrite/prs2lock.h"
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
-#include "storage/itemptr.h"
-#include "storage/lock.h"
-#include "storage/off.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "tcop/dest.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
-#include "utils/geo_decls.h"
-#include "utils/hsearch.h"
#include "utils/lsyscache.h"
-#include "utils/nabstime.h"
#include "utils/portal.h"
-#include "utils/rel.h"
#ifndef HAVE_MEMMOVE
-#include "regex/utils.h"
#endif
#define ALLOC(t, c) (t *)calloc((unsigned)(c), sizeof(t))
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index a5f9bf9728ae654cb976d694c9465aa9adda7588..4f431fdfb48839dff1303e0f7b1d46c799c57582 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.22 1999/06/19 05:05:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/aclchk.c,v 1.23 1999/07/15 22:38:57 momjian Exp $
*
* NOTES
* See acl.h.
@@ -19,8 +19,6 @@
#include "utils/acl.h" /* where declarations for this file go */
#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/tupmacs.h"
#include "catalog/indexing.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
@@ -30,14 +28,9 @@
#include "catalog/pg_proc.h"
#include "catalog/pg_shadow.h"
#include "catalog/pg_type.h"
-#include "fmgr.h"
#include "parser/parse_agg.h"
#include "parser/parse_func.h"
-#include "storage/bufmgr.h"
-#include "utils/builtins.h"
-#include "utils/memutils.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#include "miscadmin.h"
static int32 aclcheck(char *relname, Acl *acl, AclId id, AclIdType idtype, AclMode mode);
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index e6486d336b51b5a9546c9de8597b8f935eda7002..4e4354b4ef635a202a977be0b489da9ac6c18945 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.90 1999/07/15 15:18:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.91 1999/07/15 22:38:58 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -40,30 +40,19 @@
#include "catalog/pg_inherits.h"
#include "catalog/pg_ipl.h"
#include "catalog/pg_relcheck.h"
-#include "catalog/pg_type.h"
#include "commands/trigger.h"
-#include "fmgr.h"
-#include "nodes/plannodes.h"
#include "optimizer/tlist.h"
#include "parser/parse_expr.h"
-#include "parser/parse_node.h"
-#include "parser/parse_target.h"
-#include "parser/parse_type.h"
#include "parser/parse_coerce.h"
#include "rewrite/rewriteRemove.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
#include "storage/smgr.h"
#include "tcop/tcopprot.h"
-#include "utils/catcache.h"
#include "utils/builtins.h"
#include "utils/relcache.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#include "utils/temprel.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 68abfc7b883d80c322424fc5c8a98d6ee41e5248..8e87a966d590cec6ffbf9202b51f019cdb70d9c9 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.82 1999/07/15 15:18:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.83 1999/07/15 22:38:58 momjian Exp $
*
*
* INTERFACE ROUTINES
@@ -20,12 +20,9 @@
#include "postgres.h"
#include "access/genam.h"
-#include "access/htup.h"
#include "access/heapam.h"
#include "access/istrat.h"
-#include "access/xact.h"
#include "bootstrap/bootstrap.h"
-#include "catalog/catalog.h"
#include "catalog/catname.h"
#include "catalog/heap.h"
#include "catalog/index.h"
@@ -34,23 +31,17 @@
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "executor/executor.h"
-#include "fmgr.h"
#include "miscadmin.h"
#include "optimizer/clauses.h"
#include "optimizer/prep.h"
#include "parser/parse_func.h"
-#include "storage/lmgr.h"
#include "storage/smgr.h"
-#include "storage/bufpage.h"
#include "utils/builtins.h"
-#include "utils/catcache.h"
#include "utils/relcache.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#include "utils/temprel.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index a7a1dda444cd8a8ea0e2f2f92a823e685cb3dc26..21ced7031b790a33b864f351c236cb47300b79fa 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.38 1999/05/25 16:08:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.39 1999/07/15 22:38:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,12 +23,7 @@
#include "catalog/index.h"
#include "catalog/indexing.h"
#include "catalog/pg_index.h"
-#include "catalog/pg_proc.h"
-#include "fmgr.h"
#include "miscadmin.h"
-#include "nodes/execnodes.h"
-#include "storage/bufmgr.h"
-#include "utils/builtins.h"
#include "utils/syscache.h"
#include "utils/temprel.h"
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index ef9b9c3afbd08551cbbb35b3d56360d7646e5fe2..96863e8a3fe84f9e274ed645a2c2813e380aebc4 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.20 1999/02/13 23:14:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_aggregate.c,v 1.21 1999/07/15 22:38:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,16 +15,13 @@
#include <access/heapam.h>
#include <utils/builtins.h>
-#include <fmgr.h>
#include <catalog/catname.h>
#include <utils/syscache.h>
-#include <catalog/pg_operator.h>
#include <catalog/pg_proc.h>
#include <catalog/pg_type.h>
#include <catalog/pg_aggregate.h>
#include <miscadmin.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index a8ce33d7bc0edd108a41c6cb73dc07844370ec07..e45b8143a8e557bea180244a5b1722108c7bd72d 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.38 1999/07/15 15:18:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_operator.c,v 1.39 1999/07/15 22:38:59 momjian Exp $
*
* NOTES
* these routines moved here from commands/define.c and somewhat cleaned up.
@@ -19,20 +19,14 @@
#include "access/heapam.h"
#include "catalog/catname.h"
#include "catalog/pg_operator.h"
-#include "parser/parse_type.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "parser/parse_func.h"
-#include "fmgr.h"
#include "miscadmin.h"
-#include "parser/parse_oper.h"
-#include "storage/bufmgr.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 9c79eec956142c9070a4ecd3f5595d3fc64595c4..a0fca3ec7d456cf74d5483126071a4dac109981d 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -7,23 +7,19 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.30 1999/07/15 15:18:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.31 1999/07/15 22:38:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
#include "catalog/catname.h"
#include "catalog/indexing.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
-#include "fmgr.h"
#include "miscadmin.h"
-#include "optimizer/internal.h"
#include "optimizer/planner.h"
-#include "parser/parse_node.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
#include "utils/fmgrtab.h"
@@ -33,7 +29,6 @@
#include "parser/parse_type.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 54856d4b76d5533c9b07a08d75189f6d7f93c361..e1461bcb980991d81da14e4ba459e501ab24e72c 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -7,28 +7,22 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.37 1999/05/25 16:08:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/catalog/pg_type.c,v 1.38 1999/07/15 22:38:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
#include "catalog/catname.h"
#include "catalog/indexing.h"
#include "catalog/pg_type.h"
-#include "fmgr.h"
#include "miscadmin.h"
#include "parser/parse_func.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/commands/_deadcode/version.c b/src/backend/commands/_deadcode/version.c
index 6eddfdccfaf9f7c0755c9348e65d4f6d41ff1661..a07c1423d77d2cae880f1f10d5d9131cb4c7f3cc 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -9,7 +9,7 @@
* doesn't work! - jolly 8/19/95
*
*
- * $Id: version.c,v 1.19 1999/05/25 16:08:32 momjian Exp $
+ * $Id: version.c,v 1.20 1999/07/15 22:39:03 momjian Exp $
*
* NOTES
* At the point the version is defined, 2 physical relations are created
@@ -25,12 +25,6 @@
#include <postgres.h>
-#include <access/heapam.h>
-#include <utils/builtins.h>
-#include <commands/version.h>
-#include <access/xact.h> /* for GetCurrentXactStartTime */
-#include <parser/parse_node.h>
-#include <tcop/tcopprot.h>
#define MAX_QUERY_LEN 1024
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index 0e3cb83aa934a8199812ff419c5493f590fb1b41..ffb2998c3585a9aac7a17dc51a0cf015856bda7f 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.47 1999/05/25 16:08:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/async.c,v 1.48 1999/07/15 22:38:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -87,18 +87,12 @@
#include "commands/async.h"
#include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/xact.h"
#include "catalog/catname.h"
#include "catalog/pg_listener.h"
-#include "fmgr.h"
#include "lib/dllist.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "miscadmin.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
-#include "tcop/dest.h"
#include "utils/syscache.h"
#include <utils/trace.h>
#include <utils/ps_status.h>
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 7eab1d213a182677aa8eb7d5a0c0307db09d14f4..a58cc85d15388073e4276b1c253c90dbea8fa4bf 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.40 1999/07/15 15:18:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.41 1999/07/15 22:39:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,30 +22,18 @@
#include <postgres.h>
-#include <catalog/pg_index.h>
#include <catalog/heap.h>
#include <access/heapam.h>
#include <access/genam.h>
-#include <access/xact.h>
-#include <catalog/catname.h>
#include <utils/syscache.h>
#include <catalog/index.h>
-#include <catalog/indexing.h>
#include <catalog/pg_type.h>
-#include <commands/copy.h>
#include <commands/cluster.h>
#include <commands/rename.h>
-#include <storage/bufmgr.h>
-#include <miscadmin.h>
-#include <tcop/dest.h>
-#include <commands/command.h>
#include <utils/builtins.h>
-#include <utils/excid.h>
#include <catalog/pg_proc.h>
-#include <catalog/pg_class.h>
#include <optimizer/internal.h>
#ifndef NO_SECURITY
-#include <utils/acl.h>
#endif /* !NO_SECURITY */
static Relation copy_heap(Oid OIDOldHeap);
diff --git a/src/backend/commands/command.c b/src/backend/commands/command.c
index 0ff886ded54aee9451423598905893668e99b418..7b4936387ce521d5f3f97ef5757c98fb5d0bdbce 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.48 1999/07/15 15:18:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.49 1999/07/15 22:39:00 momjian Exp $
*
* NOTES
* The PortalExecutorHeapMemory crap needs to be eliminated
@@ -23,7 +23,6 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
#include "catalog/indexing.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
@@ -31,13 +30,9 @@
#include "commands/command.h"
#include "executor/execdefs.h"
#include "executor/executor.h"
-#include "fmgr.h"
#include "optimizer/prep.h"
#include "utils/acl.h"
-#include "utils/array.h"
#include "utils/builtins.h"
-#include "utils/portal.h"
-#include "utils/relcache.h"
#include "utils/temprel.h"
#include "utils/syscache.h"
#include "miscadmin.h"
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index d7dced4c1688d926b888798f6ec7d59c7af85223..b1d4901fc6bd9578773d2df89f01ca4697783fc6 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.81 1999/07/03 00:32:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.82 1999/07/15 22:39:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,17 +17,13 @@
#include <postgres.h>
#include <access/heapam.h>
-#include <tcop/dest.h>
-#include <fmgr.h>
#include <miscadmin.h>
#include <utils/builtins.h>
#include <utils/acl.h>
#include <sys/stat.h>
#include <catalog/pg_index.h>
#include <utils/syscache.h>
-#include <utils/memutils.h>
#include <executor/executor.h>
-#include <access/transam.h>
#include <catalog/index.h>
#include <access/genam.h>
#include <catalog/pg_type.h>
@@ -35,11 +31,9 @@
#include <catalog/pg_shadow.h>
#include <commands/copy.h>
#include "commands/trigger.h"
-#include <storage/fd.h>
#include <libpq/libpq.h>
#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
#endif
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
diff --git a/src/backend/commands/creatinh.c b/src/backend/commands/creatinh.c
index e9c5fdcd8940efc05fb515cc84b44d9338b79b24..252763a48f32226bd11e986604b38e9ab0f31ecc 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.41 1999/05/25 16:08:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.42 1999/07/15 22:39:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,11 +16,8 @@
#include <postgres.h>
-#include <utils/rel.h>
-#include <nodes/parsenodes.h>
#include <catalog/heap.h>
#include <commands/creatinh.h>
-#include <access/xact.h>
#include <access/heapam.h>
#include <utils/syscache.h>
#include <catalog/catname.h>
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 06f0a8115a52a38e1642250ee58d313c5a46d8fa..f3959bb403c46401cd013d20855690553d2fe253 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.35 1999/05/25 16:08:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.36 1999/07/15 22:39:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,19 +19,12 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
#include "catalog/catname.h"
#include "catalog/pg_database.h"
#include "catalog/pg_shadow.h"
-#include "fmgr.h"
#include "miscadmin.h" /* for DataDir */
-#include "storage/bufmgr.h"
-#include "storage/fd.h"
-#include "storage/lmgr.h"
#include "tcop/tcopprot.h"
#include "commands/dbcommands.h"
-#include "utils/rel.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index dd83129be4bfb95ed28390afc55273c933bae3ee..5db5334f118cbc2870fc01b3cc7ea4c8667689da 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994-5, Regents of the University of California
*
- * $Id: explain.c,v 1.38 1999/06/17 23:45:32 tgl Exp $
+ * $Id: explain.c,v 1.39 1999/07/15 22:39:01 momjian Exp $
*
*/
#include <stdio.h>
@@ -12,15 +12,11 @@
#include <postgres.h>
-#include <nodes/plannodes.h>
#include <nodes/print.h>
-#include <tcop/tcopprot.h>
#include <lib/stringinfo.h>
#include <commands/explain.h>
#include <parser/parsetree.h>
-#include <parser/parse_node.h>
#include <optimizer/planner.h>
-#include <access/xact.h>
#include <utils/relcache.h>
#include <rewrite/rewriteHandler.h>
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index e7f047477ca1de6f959ca4c11891f3265a6f6cfc..91abbaf33216d1706cf879360caaaab8530f2e28 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.4 1999/05/25 16:08:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.5 1999/07/15 22:39:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,6 @@
#include <postgres.h>
-#include <access/attnum.h>
#include <access/genam.h>
#include <access/heapam.h>
#include <utils/builtins.h>
@@ -26,17 +25,10 @@
#include <catalog/pg_proc.h>
#include <catalog/pg_type.h>
#include <catalog/pg_opclass.h>
-#include <nodes/plannodes.h>
-#include <nodes/primnodes.h>
-#include <nodes/relation.h>
-#include <utils/relcache.h>
-#include <utils/lsyscache.h>
#include <commands/defrem.h>
#include <parser/parsetree.h> /* for getrelid() */
#include <optimizer/prep.h>
#include <optimizer/clauses.h>
-#include <storage/lmgr.h>
-#include <fmgr.h>
#define IsFuncIndex(ATTR_LIST) (((IndexElem*)lfirst(ATTR_LIST))->args!=NULL)
diff --git a/src/backend/commands/remove.c b/src/backend/commands/remove.c
index 7ae4c2c176d67dd049eb519ccad4ca087ace5219..e28156aaa8a57617005df6b5d62046694eb96dba 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.33 1999/05/25 16:08:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/remove.c,v 1.34 1999/07/15 22:39:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,22 +15,16 @@
#include "access/heapam.h"
#include "catalog/catname.h"
-#include "catalog/pg_aggregate.h"
#include "catalog/pg_language.h"
-#include "catalog/pg_operator.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_type.h"
#include "commands/defrem.h"
-#include "fmgr.h"
#include "miscadmin.h"
#include "parser/parse_func.h"
-#include "storage/bufmgr.h"
#include "utils/acl.h"
-#include "utils/builtins.h"
#include "utils/syscache.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/commands/rename.c b/src/backend/commands/rename.c
index f88d29b7a064d093982ea15524550dd81b683179..b5a3a5d307cdc3440fdcef6783bdfc1747c1e7f0 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -7,38 +7,25 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.26 1999/07/15 15:18:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/rename.c,v 1.27 1999/07/15 22:39:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
#include <access/heapam.h>
-#include <access/relscan.h>
-#include <utils/builtins.h>
#include <catalog/catname.h>
#include <utils/syscache.h>
#include <catalog/heap.h>
#include <catalog/indexing.h>
#include <catalog/catalog.h>
-#include <commands/copy.h>
#include <commands/rename.h>
-#include <executor/execdefs.h> /* for EXEC_{FOR,BACK,FDEBUG,BDEBUG} */
#include <miscadmin.h>
-#include <utils/portal.h>
-#include <tcop/dest.h>
-#include <commands/command.h>
-#include <storage/bufmgr.h>
-#include <utils/excid.h>
-#include <catalog/pg_proc.h>
-#include <catalog/pg_class.h>
-#include <optimizer/internal.h>
#include <optimizer/prep.h> /* for find_all_inheritors */
#ifndef NO_SECURITY
#include <utils/acl.h>
#endif /* !NO_SECURITY */
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index a6f18e01d3d732b33084031ba9c13ddd3ce0fd8c..f8fbf5f570f190239237b9625d700a0f41e6d167 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -11,11 +11,7 @@
#include <postgres.h>
#include <miscadmin.h>
-#include <storage/bufmgr.h>
-#include <storage/bufpage.h>
-#include <storage/lmgr.h>
#include <access/heapam.h>
-#include <nodes/parsenodes.h>
#include <commands/creatinh.h>
#include <commands/sequence.h>
#include <utils/builtins.h>
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index a710888d7f0e4a4d912767a06f1bcd3cc9eb6a9f..6107c4bd6fadff94ec956823bd175bb3540c3cc7 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -10,8 +10,6 @@
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/valid.h"
-#include "access/xact.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
#include "catalog/indexing.h"
@@ -19,12 +17,6 @@
#include "catalog/pg_proc.h"
#include "catalog/pg_trigger.h"
#include "commands/trigger.h"
-#include "fmgr.h"
-#include "nodes/memnodes.h"
-#include "nodes/parsenodes.h"
-#include "storage/lmgr.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "utils/inval.h"
#include "utils/builtins.h"
#include "utils/syscache.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 57ac35fb1f4d48c01827c4df3dc9360c5b790acc..0419cb527b80e4550b2041097bb29cc12e28c961 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: user.c,v 1.28 1999/05/25 16:08:27 momjian Exp $
+ * $Id: user.c,v 1.29 1999/07/15 22:39:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,12 +24,8 @@
#include <catalog/pg_shadow.h>
#include <libpq/crypt.h>
#include <access/heapam.h>
-#include <access/xact.h>
-#include <storage/bufmgr.h>
-#include <storage/lmgr.h>
#include <tcop/tcopprot.h>
#include <utils/acl.h>
-#include <utils/rel.h>
#include <utils/syscache.h>
#include <commands/user.h>
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index e475fba1e2cb7be9fc44b5ea7455abccf3394113..2c8cf527ac54bb42ec75d8d4b6fbc95b760731a5 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.111 1999/07/15 15:18:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.112 1999/07/15 22:39:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,25 +23,15 @@
#include "miscadmin.h"
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/transam.h"
-#include "access/xact.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
#include "catalog/index.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_index.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_statistic.h"
#include "catalog/pg_type.h"
#include "commands/vacuum.h"
-#include "fmgr.h"
#include "parser/parse_oper.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "storage/shmem.h"
#include "storage/smgr.h"
-#include "storage/itemptr.h"
-#include "storage/lmgr.h"
#include "utils/builtins.h"
#include "utils/inval.h"
#include "utils/portal.h"
@@ -49,7 +39,6 @@
#include "utils/syscache.h"
#ifndef HAVE_GETRUSAGE
-#include <rusagestub.h>
#else
#include <sys/time.h>
#include <sys/resource.h>
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index 1cea214613bddcb86f06b40fd0014f4bf1b33b7f..2176f0b6ea1310f4d952eff41a70a227ece02ef3 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: view.c,v 1.33 1999/05/25 16:08:28 momjian Exp $
+ * $Id: view.c,v 1.34 1999/07/15 22:39:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,14 +15,10 @@
#include <postgres.h>
#include <catalog/heap.h>
-#include <access/heapam.h>
#include <access/xact.h>
-#include <utils/builtins.h>
-#include <nodes/relation.h>
#include <parser/parse_relation.h>
#include <parser/parse_type.h>
#include <rewrite/rewriteDefine.h>
-#include <rewrite/rewriteHandler.h>
#include <rewrite/rewriteManip.h>
#include <rewrite/rewriteRemove.h>
#include <commands/creatinh.h>
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index 2facc9096bf79cb859c5c1a9cfc4e94a7f97183b..4423aeeea71383d36053618e43628d6fa6e1934a 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: execAmi.c,v 1.37 1999/07/15 15:18:56 momjian Exp $
+ * $Id: execAmi.c,v 1.38 1999/07/15 22:39:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,6 @@
#include "postgres.h"
#include "executor/executor.h"
-#include "storage/smgr.h"
#include "executor/nodeSeqscan.h"
#include "executor/nodeIndexscan.h"
#include "executor/nodeSort.h"
diff --git a/src/backend/executor/execFlatten.c b/src/backend/executor/execFlatten.c
index df1864c59aeeb883d13e70b94b8cf980e4fce64d..8a8d049f31738d070aab36fe8a9cd7f25d43c925 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.9 1999/02/23 07:33:09 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/Attic/execFlatten.c,v 1.10 1999/07/15 22:39:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,9 +26,6 @@
* node does the actual flattening work.
*/
#include "postgres.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/execnodes.h"
#include "executor/executor.h"
#include "executor/execFlatten.h"
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index bef6874861964d075f62993c3cd4ff4d1eac9064..d541f34825df59592d657c7320d2ed182afc4ec1 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.18 1999/07/15 15:18:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execJunk.c,v 1.19 1999/07/15 22:39:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,6 @@
#include "access/heapam.h"
#include "executor/executor.h"
-#include "nodes/relation.h"
#include "nodes/makefuncs.h"
/*-------------------------------------------------------------------------
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index d6cd6b1f8453c440012c3235560f3b40a4f0a4d8..cd411a0ede986357e4955de576126353f194f473 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.89 1999/07/15 15:18:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.90 1999/07/15 22:39:05 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,23 +37,15 @@
#include "executor/executor.h"
#include "executor/execdefs.h"
#include "executor/execdebug.h"
-#include "executor/nodeIndexscan.h"
#include "utils/builtins.h"
#include "utils/acl.h"
#include "utils/syscache.h"
-#include "utils/tqual.h"
#include "parser/parsetree.h" /* rt_fetch() */
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
-#include "storage/smgr.h"
-#include "commands/async.h"
/* #include "access/localam.h" */
#include "optimizer/var.h"
#include "access/heapam.h"
-#include "access/xact.h"
#include "catalog/heap.h"
#include "commands/trigger.h"
-#include "access/transam.h"
void ExecCheckPerms(CmdType operation, int resultRelation, List *rangeTable,
Query *parseTree);
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index b6af1fe6837887a560b7dd206087206c29319b07..d5a218a7ce37b0fe9397285ca5d04dc736340536 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.54 1999/07/15 15:18:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execQual.c,v 1.55 1999/07/15 22:39:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,16 +40,8 @@
#include "executor/execFlatten.h"
#include "executor/functions.h"
#include "executor/nodeSubplan.h"
-#include "fmgr.h"
-#include "nodes/memnodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "optimizer/clauses.h"
-#include "utils/array.h"
#include "utils/builtins.h"
-#include "utils/fcache.h"
#include "utils/fcache2.h"
-#include "utils/memutils.h"
/*
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index a41c4ff45648f92f176dc2c0bb0ef28a43fe6082..33d7f0bd6354e5781ba699749d58da907dc55f70 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -14,7 +14,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.26 1999/07/15 15:18:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execTuples.c,v 1.27 1999/07/15 22:39:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -124,11 +124,7 @@
#include "executor/executor.h"
#undef ExecStoreTuple
-#include "access/tupdesc.h"
#include "catalog/pg_type.h"
-#include "parser/parse_type.h"
-#include "storage/bufmgr.h"
-#include "utils/lsyscache.h"
static TupleTableSlot *NodeGetResultTupleSlot(Plan *node);
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 0b7c220acc66b2ac13f89d95b55606c1a9877046..6d2fb86f45fa5a20e93e07da705d1f39e86e2b07 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.46 1999/07/15 15:18:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/execUtils.c,v 1.47 1999/07/15 22:39:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,17 +44,10 @@
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/itup.h"
#include "catalog/catname.h"
#include "catalog/index.h"
-#include "catalog/pg_type.h"
-#include "commands/command.h"
#include "executor/execdebug.h"
#include "executor/executor.h"
-#include "fmgr.h"
-#include "optimizer/clauses.h"
-#include "parser/parsetree.h"
-#include "utils/lsyscache.h"
#include "catalog/pg_index.h"
static void ExecGetIndexKeyInfo(Form_pg_index indexTuple, int *numAttsOutP,
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 00fc00182d6e8df1aa03cbeec7f69246ad280034..1fbd578da8d46360df94deddf5b1a3bca3f2e22a 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -8,30 +8,19 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.27 1999/07/15 15:18:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "catalog/pg_proc.h"
#include "tcop/pquery.h"
#include "tcop/tcopprot.h"
#include "tcop/utility.h"
-#include "nodes/params.h"
-#include "fmgr.h"
-#include "utils/fcache.h"
#include "utils/datum.h"
-#include "utils/syscache.h"
-#include "catalog/pg_language.h"
#include "access/heapam.h"
-#include "access/xact.h"
#include "executor/executor.h"
#include "executor/execdefs.h"
#include "executor/functions.h"
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 44a14391b45dca815dba534003836f3cdcf7c051..a8535b5a98f68a7572a5d4994c3886b06a53fb04 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -18,15 +18,12 @@
#include <string.h>
#include "postgres.h"
-#include "fmgr.h"
#include "access/heapam.h"
#include "catalog/pg_aggregate.h"
-#include "catalog/catalog.h"
#include "parser/parse_type.h"
#include "executor/executor.h"
#include "executor/nodeAgg.h"
-#include "storage/bufmgr.h"
#include "utils/syscache.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 745269e07171418d132de5a72e7339a5e239e30a..c51b92bf4f9a39793c237bc520feba105aa833f7 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.21 1999/07/15 22:39:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,7 +60,6 @@
#include "executor/executor.h"
#include "executor/execdebug.h"
#include "executor/nodeAppend.h"
-#include "executor/nodeIndexscan.h"
#include "parser/parsetree.h" /* for rt_store() macro */
static bool exec_append_initialize_next(Append *node);
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index c5cb1d35234ebb61cf15ea6aa7f7c0226e6c3012..3c25447e247c97761b147fa047bb6205aa2a2a5a 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -13,17 +13,15 @@
* columns. (ie. tuples from the same group are consecutive)
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.27 1999/07/11 01:57:32 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeGroup.c,v 1.28 1999/07/15 22:39:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "fmgr.h"
#include "access/heapam.h"
-#include "catalog/catalog.h"
#include "access/printtup.h"
#include "executor/executor.h"
#include "executor/nodeGroup.h"
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index 3a76ef8c5d5d944f903efd18672e2c714f67f9e9..71da86f9c56e6ed5cc7f3a6cae12e987cade5cc3 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -6,7 +6,7 @@
* Copyright (c) 1994, Regents of the University of California
*
*
- * $Id: nodeHash.c,v 1.36 1999/05/25 16:08:41 momjian Exp $
+ * $Id: nodeHash.c,v 1.37 1999/07/15 22:39:08 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,12 +24,10 @@
#include <string.h>
#include "postgres.h"
-#include "miscadmin.h"
#include "executor/execdebug.h"
#include "executor/executor.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
-#include "utils/hsearch.h"
#include "utils/portal.h"
extern int SortMem;
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index e494c620261d2513d78bdb33a2eaa01ce3788040..4796e118af2d2fd787b4a27619420584f43639ea 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.22 1999/05/25 22:41:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeHashjoin.c,v 1.23 1999/07/15 22:39:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,7 +16,6 @@
#include "postgres.h"
-#include "executor/execdebug.h"
#include "executor/executor.h"
#include "executor/nodeHash.h"
#include "executor/nodeHashjoin.h"
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 57f2bb9d4d959d6023d4d2ba420348db8fedcff9..ade2a9130261fd571dd813971c68a7fb58d3ee6a 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.37 1999/07/15 15:19:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.38 1999/07/15 22:39:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,12 +37,8 @@
#include "optimizer/clauses.h" /* for get_op, get_leftop, get_rightop */
#include "parser/parsetree.h" /* for rt_fetch() */
-#include "access/skey.h"
#include "access/heapam.h"
#include "access/genam.h"
-#include "catalog/index.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
#include "nodes/nodeFuncs.h"
/* ----------------
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index b8cd808dc0cb5126eae0e9f3267368f3ffee8b7c..485b527cbeeaa47d8492099e2ff27bcd414bdfbe 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.22 1999/05/25 16:08:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeMaterial.c,v 1.23 1999/07/15 22:39:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,6 @@
#include "executor/executor.h"
#include "executor/nodeMaterial.h"
-#include "catalog/catalog.h"
#include "catalog/heap.h"
#include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
#include "access/heapam.h"
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index bd1fe24242ce6658c7d648908b7950d39bfedd6f..6ee64a60632fd89c7ee436ff6d79e29189c6e258 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.11 1999/02/13 23:15:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeNestloop.c,v 1.12 1999/07/15 22:39:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,6 @@
#include "executor/executor.h"
#include "executor/execdebug.h"
#include "executor/nodeNestloop.h"
-#include "executor/nodeIndexscan.h"
/* ----------------------------------------------------------------
* ExecNestLoop(node)
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 04a149341376e2e77e381a99245d9a926d636e1a..a45b7f347c0e9218a2db113fafef6e4924b7ed2a 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.18 1999/05/25 16:08:46 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.19 1999/07/15 22:39:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,7 +29,6 @@
#include "executor/nodeSeqscan.h"
#include "access/heapam.h"
#include "parser/parsetree.h"
-#include "nodes/print.h"
static Oid InitScanRelation(SeqScan *node, EState *estate,
CommonScanState *scanstate, Plan *outerPlan);
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 3f118e90cf97cef6cd6a8485eb1c3aca234efd49..a198b8914a25803b73b0fe0b800c7e4929f7b5db 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.20 1999/07/15 15:19:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.21 1999/07/15 22:39:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,12 +17,7 @@
#include "executor/executor.h"
#include "executor/execdebug.h"
#include "executor/nodeSort.h"
-#include "access/heapam.h"
#include "utils/psort.h"
-#include "catalog/catalog.h"
-#include "catalog/heap.h"
-#include "storage/bufmgr.h"
-#include "optimizer/internal.h" /* for _NONAME_RELATION_ID_ */
/* ----------------------------------------------------------------
* FormSortKeys(node)
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index ef65a7afb51bd89f281ae1c7eaaf69540e171194..6c88bbe85e71d8383a069bfe21df5ad533c77a43 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -16,7 +16,6 @@
#include "access/heapam.h"
#include "tcop/pquery.h"
#include "executor/executor.h"
-#include "executor/execdebug.h"
#include "executor/nodeSubplan.h"
/* ----------------------------------------------------------------
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 84d32384579108e6897ffff24d59ffb76c17f518..3693489a0d7d9605c5f5eff4a3d6e6c6b0065daf 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.20 1999/02/13 23:15:29 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeUnique.c,v 1.21 1999/07/15 22:39:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,14 +25,11 @@
#include <string.h>
#include "postgres.h"
-#include "fmgr.h"
#include "executor/executor.h"
#include "executor/nodeUnique.h"
-#include "optimizer/clauses.h"
#include "access/heapam.h"
#include "access/printtup.h" /* for getTypeOutAndElem() */
-#include "utils/builtins.h" /* for namecpy() */
/* ----------------------------------------------------------------
* ExecIdenticalTuples
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index bda75d64973276a0277bc9c20401cdd851ca2e49..b54fc62b42c973c5ef20420519baedba1500f5bf 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,15 +3,12 @@
* spi.c
* Server Programming Interface
*
- * $Id: spi.c,v 1.39 1999/05/25 22:41:02 momjian Exp $
+ * $Id: spi.c,v 1.40 1999/07/15 22:39:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
-#include "executor/spi.h"
#include "executor/spi_priv.h"
-#include "catalog/pg_type.h"
#include "access/printtup.h"
-#include "fmgr.h"
static Portal _SPI_portal = (Portal) NULL;
static _SPI_connection *_SPI_stack = NULL;
diff --git a/src/backend/lib/bit.c b/src/backend/lib/bit.c
index 92fdf3340fa57f177b275ccf27e224cad8841660..8dabbc658caa0849b810b37e9842ac0ab5417c52 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.6 1999/02/13 23:15:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/bit.c,v 1.7 1999/07/15 22:39:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,7 +18,6 @@
#include <postgres.h>
#include <utils/bit.h>
-#include <utils/memutils.h>
void
BitArraySetBit(BitArray bitArray, BitIndex bitIndex)
diff --git a/src/backend/lib/hasht.c b/src/backend/lib/hasht.c
index fc904fa3e97710b3d974cdc5299f443aa4e11e76..c57b43be8e2a40f2853620d84d255347b88e216b 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -8,14 +8,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.8 1999/02/13 23:15:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/hasht.c,v 1.9 1999/07/15 22:39:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <postgres.h>
#include <utils/memutils.h>
-#include <utils/hsearch.h>
#include <lib/hasht.h>
/* -----------------------------------
diff --git a/src/backend/lib/lispsort.c b/src/backend/lib/lispsort.c
index b2b62795bc998522c2d741ecfd49cb8c31738957..f4522aaa8505fd25bc68b73077f377fdeac190c9 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.10 1999/02/13 23:15:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/lib/Attic/lispsort.c,v 1.11 1999/07/15 22:39:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,12 +15,6 @@
#include <postgres.h>
-#include <nodes/pg_list.h>
-#include <nodes/primnodes.h>
-#include <nodes/plannodes.h>
-#include <nodes/relation.h>
-#include <lib/lispsort.h>
-#include <lib/qsort.h>
#ifdef NOT_USED
/*
diff --git a/src/backend/libpq/be-dumpdata.c b/src/backend/libpq/be-dumpdata.c
index 9b232e705da740410982df25ea6ad9f4d13c694a..326948faf0bc926c8b4d6074f6a0ec3b93366042 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: be-dumpdata.c,v 1.26 1999/07/15 15:19:03 momjian Exp $
+ * $Id: be-dumpdata.c,v 1.27 1999/07/15 22:39:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,13 +34,6 @@
#include <lib/dllist.h>
#include <libpq/libpq.h>
#include <access/heapam.h>
-#include <access/htup.h>
-#include <storage/buf.h>
-#include <utils/memutils.h>
-#include <fmgr.h>
-#include <utils/exc.h>
-#include <utils/syscache.h>
-#include <catalog/pg_type.h>
#include <catalog/catalog.h>
#include <access/printtup.h>
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index 871a7923a3e2da3c00147742d4957e71aae0fc32..25e87aae6427a26457653379ab0921208554dd15 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.36 1999/07/15 15:19:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.37 1999/07/15 22:39:13 momjian Exp $
*
* NOTES
* This should be moved to a more appropriate place. It is here
@@ -37,14 +37,8 @@
#include <postgres.h>
-#include <lib/dllist.h>
-#include <libpq/libpq.h>
#include <libpq/libpq-fs.h>
-#include <nodes/nodes.h>
-#include <utils/memutils.h>
-#include <lib/fstack.h>
#include <catalog/pg_shadow.h> /* for superuser() */
-#include <storage/fd.h> /* for O_ */
#include <storage/large_object.h>
#include <libpq/be-fsstubs.h>
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c
index 4b035311c3995aa71d6d1e43d1a593e681371a47..ea48d6ff62ca70b082c10d700f449fec7c17a82a 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.20 1999/02/13 23:15:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,17 +22,11 @@
*/
#include <postgres.h>
-#include <nodes/pg_list.h>
-#include <tcop/dest.h>
#include <tcop/fastpath.h>
#include <tcop/tcopprot.h>
-#include <lib/dllist.h>
#include <libpq/libpq.h>
-#include <fmgr.h>
-#include <utils/exc.h>
#include <utils/builtins.h>
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 86f5ef2a997d3fa43d6eada7d4cff5172431f1c2..a1073fa357c8764392a637828ee5c5d06d08ba7f 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -9,7 +9,7 @@
* Dec 17, 1997 - Todd A. Brandys
* Orignal Version Completed.
*
- * $Id: crypt.c,v 1.20 1999/07/15 15:19:05 momjian Exp $
+ * $Id: crypt.c,v 1.21 1999/07/15 22:39:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,6 @@
#include "libpq/crypt.h"
#ifdef HAVE_CRYPT_H
-#include <crypt.h>
#endif
char **pwd_cache = NULL;
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index dd64971c99dbf76ffdfe048a2e1cc5dd435b01f0..b6fa91e62656580aec1d1afa67b941ae572f2d35 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,7 +5,7 @@
* wherein you authenticate a user by seeing what IP address the system
* says he comes from and possibly using ident).
*
- * $Id: hba.c,v 1.43 1999/05/25 16:08:59 momjian Exp $
+ * $Id: hba.c,v 1.44 1999/07/15 22:39:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,10 +23,6 @@
#include <postgres.h>
#include <miscadmin.h>
#include <libpq/libpq.h>
-#include <libpq/pqcomm.h>
-#include <libpq/hba.h>
-#include <port/inet_aton.h> /* For inet_aton() */
-#include <storage/fd.h>
/* Some standard C libraries, including GNU, have an isblank() function.
Others, including Solaris, do not. So we have our own.
diff --git a/src/backend/libpq/password.c b/src/backend/libpq/password.c
index 98c05d3074901da71aa13deca04dad27d38db03e..1dd9382998443c76f9bb2945f4dc21fc22bd6f4c 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -1,7 +1,7 @@
/*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: password.c,v 1.21 1999/05/25 16:09:00 momjian Exp $
+ * $Id: password.c,v 1.22 1999/07/15 22:39:14 momjian Exp $
*
*/
@@ -9,11 +9,9 @@
#include <miscadmin.h>
#include <libpq/password.h>
#include <libpq/libpq.h>
-#include <storage/fd.h>
#include <string.h>
#include <unistd.h>
#ifdef HAVE_CRYPT_H
-#include <crypt.h>
#endif
int
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 6f7dca5cb5e4c3f8d9d18d5e1acef5d44679710e..7a7f1dbfc908ae042fabdcc3bf6a992f567f1342 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: portal.c,v 1.22 1999/05/25 16:09:01 momjian Exp $
+ * $Id: portal.c,v 1.23 1999/07/15 22:39:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,9 +55,7 @@
#include <postgres.h>
-#include <lib/dllist.h>
#include <libpq/libpq.h> /* where the declarations go */
-#include <utils/exc.h>
/* ----------------------------------------------------------------
diff --git a/src/backend/libpq/portalbuf.c b/src/backend/libpq/portalbuf.c
index 19e4b2dc637bae89e26b3a791fb98031f7cfaaf7..81e1fea503f091e35708d420d3f84b277db17f28 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.16 1999/06/19 05:00:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portalbuf.c,v 1.17 1999/07/15 22:39:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,7 +53,6 @@
#include <postgres.h>
#include <libpq/libpq.h> /* where the declarations go */
-#include <utils/exc.h>
PortalEntry **portals = (PortalEntry **) NULL;
size_t portals_array_size = 0;
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 1c9f7c29458161fd1976decca4476c9ad526c504..5bff53e54f3e83ee2e78bae54f6bf1945d4868d8 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -28,7 +28,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.c,v 1.73 1999/07/07 17:17:47 momjian Exp $
+ * $Id: pqcomm.c,v 1.74 1999/07/15 22:39:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -81,10 +81,6 @@
#include "libpq/libpq.h" /* where my declarations go */
#include "miscadmin.h"
-#include "libpq/pqsignal.h"
-#include "libpq/auth.h"
-#include "storage/ipc.h"
-#include "utils/trace.h"
#ifndef SOMAXCONN
#define SOMAXCONN 5 /* from Linux listen(2) man page */
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index 529b3115bdde1365d6a1cf556ee762b143c3f088..16112bfdf009a2e1faf0bc9f574d8c96e8b3b1e9 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -15,7 +15,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqformat.c,v 1.4 1999/05/25 16:09:02 momjian Exp $
+ * $Id: pqformat.c,v 1.5 1999/07/15 22:39:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -48,11 +48,9 @@
#include "libpq/pqformat.h"
#include "libpq/libpq.h"
#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
#endif
#include <string.h>
#ifdef HAVE_ENDIAN_H
-#include <endian.h>
#endif
#ifndef BYTE_ORDER
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index 159ebd9f4b02928d0418d78e5f292c0f52b5cb2a..ec516026bfb6fef09b84db28bc3a96067eddc3cb 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.19 1999/02/13 23:15:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.20 1999/07/15 22:39:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,8 +24,6 @@
#include <errno.h>
#include <postgres.h>
-#include <miscadmin.h>
-#include <storage/ipc.h>
#include <libpq/libpq.h>
diff --git a/src/backend/libpq/util.c b/src/backend/libpq/util.c
index 50c2846815dfaa60bc84437e113a443144f25f87..9c46209f4351fd4e28ec1200dc6fd9d36613a87a 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: util.c,v 1.9 1999/05/25 16:09:03 momjian Exp $
+ * $Id: util.c,v 1.10 1999/07/15 22:39:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,9 +21,7 @@
#include <string.h>
#include <postgres.h>
-#include <lib/dllist.h>
#include <libpq/libpq.h> /* where the declarations go */
-#include <utils/exc.h>
/* ----------------
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 0f0ad4df29adc321c6249bdb87a03067c8a7ca62..4794c3d752f56d6f8712b9206ac1e6bfa0a7a6f8 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.83 1999/07/15 15:19:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.84 1999/07/15 22:39:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,17 +16,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "utils/syscache.h"
-#include "utils/builtins.h" /* for namecpy */
#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 606285793784207c000788b779daff611f9ae025..9eebf5cbebee51b6a544db99baddcc3a7583e6f0 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.40 1999/07/15 15:19:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.41 1999/07/15 22:39:16 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,15 +15,10 @@
#include "postgres.h"
-#include "nodes/nodes.h"
-#include "nodes/primnodes.h"
#include "nodes/relation.h"
-#include "nodes/execnodes.h"
#include "nodes/plannodes.h"
-#include "utils/builtins.h" /* for namestrcmp() */
#include "utils/datum.h"
-#include "storage/itemptr.h"
static bool equali(List *a, List *b);
diff --git a/src/backend/nodes/freefuncs.c b/src/backend/nodes/freefuncs.c
index 4711d9b6fe4c8ce104e70d46b95283a53fc1dfcf..457072150b1db7630c401ddab8d95390c6b30910 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.20 1999/07/15 15:19:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/Attic/freefuncs.c,v 1.21 1999/07/15 22:39:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,17 +16,7 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-
-#include "utils/syscache.h"
-#include "utils/builtins.h" /* for namecpy */
-#include "catalog/pg_type.h"
-#include "storage/lmgr.h"
+
#include "optimizer/planmain.h"
/* ****************************************************************
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index e58149d111ed5eb81cb7a3d6a801339e66466fd2..623d34d7b2d64770fe092879b8c86ed0a9cfee99 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.23 1999/07/15 15:19:07 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/list.c,v 1.24 1999/07/15 22:39:17 momjian Exp $
*
* NOTES
* XXX a few of the following functions are duplicated to handle
@@ -23,9 +23,7 @@
*/
#include <stdarg.h>
#include "postgres.h"
-#include "nodes/pg_list.h"
#include "nodes/parsenodes.h"
-#include "utils/builtins.h" /* for namecpy */
/*
* makeList
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 3d0e59329aaad36699ef42fe0088ae087e357255..d64fdd8c4628f6049f50001d6130b97c07f21225 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.15 1999/05/17 17:03:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/makefuncs.c,v 1.16 1999/07/15 22:39:17 momjian Exp $
*
* NOTES
* Creator functions in POSTGRES 4.2 are generated automatically. Most of
@@ -19,9 +19,6 @@
* Andrew Yu Oct 20, 1994 file creation
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
#include "nodes/makefuncs.h"
/*
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index 04c0f0f77b5e2171498963e067c79005a778965d..4c7d25a52fcc470cb8e4f5d60c367b64e015bbef 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.9 1999/02/13 23:15:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/nodeFuncs.c,v 1.10 1999/07/15 22:39:17 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,6 @@
#include "postgres.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
#include "nodes/nodeFuncs.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 4e8f767bbf3871e668a9b7283ad4fa4b768e9572..2dd2a5a574bcbe1b309b8b91cbd79c00fb882f91 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.28 1999/05/25 16:09:10 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.29 1999/07/15 22:39:18 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -21,16 +21,9 @@
#include "postgres.h"
#include "access/printtup.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/parsenodes.h"
#include "nodes/print.h"
#include "parser/parsetree.h"
-#include "access/heapam.h"
#include "utils/lsyscache.h"
-#include "nodes/nodes.h"
-#include "nodes/plannodes.h"
-#include "parser/parse_relation.h"
#include "optimizer/clauses.h"
static char *plannode_type(Plan *p);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index de226c011812cb7be354df113d1427b9a87ae729..e479384e937370e16100772d07e92ef29ab51c57 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.66 1999/07/15 15:19:08 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.67 1999/07/15 22:39:18 momjian Exp $
*
* NOTES
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -28,20 +28,11 @@
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "fmgr.h"
-#include "utils/builtins.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "catalog/pg_index.h"
-#include "catalog/pg_type.h"
-#include "nodes/primnodes.h"
#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/execnodes.h"
#include "nodes/relation.h"
#include "nodes/readfuncs.h"
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 721671e702c9747bc983cedc040bc47be61ea64a..276a6cba44f3d67f0603eb17d64903b0ca2128ef 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_copy.c,v 1.6 1999/07/15 15:19:09 momjian Exp $
+ * $Id: geqo_copy.c,v 1.7 1999/07/15 22:39:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -34,16 +34,7 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo_copy.h"
/* geqo_copy
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index cf0c1027ed79da7c045d33d18ed9b1ce039cfa5b..85cdcab638c08890ee26caf95110ab5d7d6c663f 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -6,7 +6,7 @@
* CX operator according to Oliver et al
* (Proc 2nd Int'l Conf on GA's)
*
-* $Id: geqo_cx.c,v 1.7 1999/07/15 15:19:10 momjian Exp $
+* $Id: geqo_cx.c,v 1.8 1999/07/15 22:39:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -36,19 +36,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index c58556f739d84149639c7a3133ca95c36e137513..550977573183aae00a5285f96f445d58a5e5d726 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -3,7 +3,7 @@
* geqo_erx.c
* edge recombination crossover [ER]
*
-* $Id: geqo_erx.c,v 1.13 1999/07/15 15:19:11 momjian Exp $
+* $Id: geqo_erx.c,v 1.14 1999/07/15 22:39:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,19 +33,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index a3652e2d0b51b6e32b02d71f06eac2225118130e..b1250a3ef88d21b2207cfffc37f70f9a0302d3ee 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_eval.c,v 1.40 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_eval.c,v 1.41 1999/07/15 22:39:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,21 +30,12 @@
#include <values.h>
#endif
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
#include "utils/portal.h"
-#include "optimizer/internal.h"
#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
#include "optimizer/cost.h"
-#include "optimizer/tlist.h"
-#include "optimizer/joininfo.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo.h"
/*
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index 2b821b168da61972adc8d4e56bd687ff08896458..b909e59d52976d574db567cc277e67023de6ecea 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_main.c,v 1.17 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_main.c,v 1.18 1999/07/15 22:39:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,24 +23,12 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo.h"
#include "optimizer/geqo_pool.h"
#include "optimizer/geqo_selection.h"
-#include "optimizer/geqo_recombination.h"
-#include "optimizer/geqo_mutation.h"
#include "optimizer/geqo_misc.h"
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 5c4079b12dee6075cccaf63b6fe785dc8bc9eef0..3be437ffa94ba316fb12acb0da0b49ffdaffbf38 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_misc.c,v 1.20 1999/07/15 15:19:11 momjian Exp $
+ * $Id: geqo_misc.c,v 1.21 1999/07/15 22:39:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,20 +23,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo_pool.h"
-#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_misc.h"
static float avg_pool(Pool *pool);
diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c
index bb007a259d405e6ae024b1691227a8dda795a140..17dd57be42401bd5f1d71e9ffea710863202dbd6 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -4,7 +4,7 @@
*
* TSP mutation routines
*
-* $Id: geqo_mutation.c,v 1.6 1999/07/15 15:19:11 momjian Exp $
+* $Id: geqo_mutation.c,v 1.7 1999/07/15 22:39:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -33,18 +33,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo_random.h"
#include "optimizer/geqo_mutation.h"
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 955379c270d1854d4be774dc7c3b512a919f2068..1c054b1de0f075d67f54c81a62f8da22461ce72e 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -6,7 +6,7 @@
* OX1 operator according to Davis
* (Proc Int'l Joint Conf on AI)
*
-* $Id: geqo_ox1.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
+* $Id: geqo_ox1.c,v 1.7 1999/07/15 22:39:20 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,19 +35,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index ef3b03649df259eaccf8af6de8dcaaa9c8e5f976..c2cb2bf3552cc7babd3192539868d4ae315139aa 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -6,7 +6,7 @@
* OX2 operator according to Syswerda
* (The Genetic Algorithms Handbook, ed L Davis)
*
-* $Id: geqo_ox2.c,v 1.6 1999/07/15 15:19:12 momjian Exp $
+* $Id: geqo_ox2.c,v 1.7 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,19 +35,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index 330732b8144dff23710b5cff6c29b09b01b62c73..f63474c9b670ddccdc1c2d3749a43ce0aeb81998 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -6,7 +6,7 @@
* PMX operator according to Goldberg & Lingle
* (Proc Int'l Conf on GA's)
*
-* $Id: geqo_pmx.c,v 1.7 1999/07/15 15:19:13 momjian Exp $
+* $Id: geqo_pmx.c,v 1.8 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,19 +35,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 79e237dc881856e26b79a015e734b5d786c9acfe..e44b28246066ef1b5785665984bc95eff5b3f11a 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_pool.c,v 1.14 1999/07/15 15:19:14 momjian Exp $
+ * $Id: geqo_pool.c,v 1.15 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,18 +22,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo.h"
#include "optimizer/geqo_pool.h"
#include "optimizer/geqo_copy.h"
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 983c01cfcc878345006fc16e1cdd8a16f0382d81..2f04e7736a066cc26df3ab462a385ea70ebb789f 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -6,7 +6,7 @@
* PX operator according to Syswerda
* (The Genetic Algorithms Handbook, L Davis, ed)
*
-* $Id: geqo_px.c,v 1.7 1999/07/15 15:19:14 momjian Exp $
+* $Id: geqo_px.c,v 1.8 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,19 +35,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c
index f01b59a89929109c87c21007f15d9fb2c0e79f2d..d9a2a9d9f9d0494b21c0da4eaeb3c00253591d6a 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -3,7 +3,7 @@
* geqo_recombination.c
* misc recombination procedures
*
-* $Id: geqo_recombination.c,v 1.9 1999/07/15 15:19:15 momjian Exp $
+* $Id: geqo_recombination.c,v 1.10 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,19 +20,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
-#include "optimizer/geqo.h"
#include "optimizer/geqo_recombination.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index 8c5301f10b7e36350f85587121e27820d879a3af..092d7164b52459eb0652ee9b1bd1ed0c5e1cb8f5 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: geqo_selection.c,v 1.8 1999/07/15 15:19:15 momjian Exp $
+ * $Id: geqo_selection.c,v 1.9 1999/07/15 22:39:21 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,18 +37,9 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
-#include "optimizer/cost.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo_selection.h"
#include "optimizer/geqo_copy.h"
#include "optimizer/geqo_random.h"
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 15c94a112fe9e840a7c0e757306f33c33279aa43..12a403dcd40b131c3256992dcae4381540feb6c3 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.47 1999/07/15 15:19:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.48 1999/07/15 22:39:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,20 +16,14 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
#include "optimizer/internal.h"
#include "optimizer/paths.h"
#include "optimizer/pathnode.h"
-#include "optimizer/clauses.h"
#include "optimizer/cost.h"
-#include "commands/creatinh.h"
-#include "optimizer/geqo_gene.h"
#include "optimizer/geqo.h"
#ifdef GEQO
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index bbc9e3547e3306890a0b80e3f4483f3b2610145e..aa70ca3a3be07152ea9e209e7b64f645b14e5f71 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -7,17 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.20 1999/05/25 16:09:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/clausesel.c,v 1.21 1999/07/15 22:39:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "catalog/pg_operator.h"
-#include "fmgr.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "optimizer/clauses.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/cost.h"
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 067cfffcc9faf6500afcee0f2f0b354d3a625939..863e1927ecc341954ec0836c8e303f21bb60c4e8 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.41 1999/07/07 09:36:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/costsize.c,v 1.42 1999/07/15 22:39:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,10 +27,8 @@
#endif
#endif
-#include "nodes/relation.h"
#include "optimizer/cost.h"
#include "optimizer/internal.h"
-#include "optimizer/keys.h"
#include "optimizer/tlist.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/optimizer/path/hashutils.c b/src/backend/optimizer/path/hashutils.c
index 0d4b2326ba42b3394b5be334c5839a2955994ac5..d875931fdada9dd8bb39178fe7c9c564c431b3e8 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -7,15 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.16 1999/05/25 16:09:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/hashutils.c,v 1.17 1999/07/15 22:39:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/paths.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index b5666ffb7d24253fc5b2434dc4009a377ae276bd..aef2fcd3dffe444af451e70c1999a45633cde115 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.58 1999/07/15 15:19:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.59 1999/07/15 22:39:23 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,22 +16,16 @@
#include "postgres.h"
-#include "access/attnum.h"
#include "access/heapam.h"
#include "access/nbtree.h"
#include "catalog/catname.h"
#include "catalog/pg_amop.h"
-#include "catalog/pg_type.h"
#include "executor/executor.h"
-#include "fmgr.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
#include "optimizer/clauses.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/cost.h"
-#include "optimizer/internal.h"
#include "optimizer/keys.h"
#include "optimizer/ordering.h"
#include "optimizer/paths.h"
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 3dade2c6326050f0fa52116dcd5a616e25b65e6b..51faaf228f5e1746badeff2b551c3e7addfffb5b 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.38 1999/05/25 22:41:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinpath.c,v 1.39 1999/07/15 22:39:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,16 +16,10 @@
#include "postgres.h"
-#include "storage/buf_internals.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-#include "optimizer/internal.h"
#include "optimizer/paths.h"
#include "optimizer/pathnode.h"
-#include "optimizer/keys.h"
#include "optimizer/cost.h" /* for _enable_{hashjoin,
* _enable_mergejoin} */
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 3c6c2888ff4fccd0ab93768534e2f6299ed10b53..aa558fef1d0bc7eb2555f847bab6695832bbfb25 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -7,16 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.35 1999/05/26 12:55:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/joinrels.c,v 1.36 1999/07/15 22:39:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/cost.h"
#include "optimizer/paths.h"
#include "optimizer/tlist.h"
diff --git a/src/backend/optimizer/path/mergeutils.c b/src/backend/optimizer/path/mergeutils.c
index 8d8255cabb9e1ff8f8a472fb471104087834c1ea..64f7ddd5dbf973769374189dd6c513b654e8fb34 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -7,16 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.22 1999/05/25 16:09:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/mergeutils.c,v 1.23 1999/07/15 22:39:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/paths.h"
#include "optimizer/clauses.h"
#include "optimizer/ordering.h"
diff --git a/src/backend/optimizer/path/orindxpath.c b/src/backend/optimizer/path/orindxpath.c
index bbcb9e99da74895f11ca1b08369349c041bce0ab..80f60d33bca4267448ba48795aa824f286dae4fe 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -7,17 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.26 1999/07/15 15:19:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/orindxpath.c,v 1.27 1999/07/15 22:39:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/internal.h"
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index eee8a027a83b611da1b05761e5ac1cab087161d4..89755d8a5cc4c4aac66a54b478ed1087acab1d97 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -7,19 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.10 1999/05/25 16:09:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/pathkeys.c,v 1.11 1999/07/15 22:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/plannodes.h"
-#include "optimizer/internal.h"
#include "optimizer/paths.h"
-#include "optimizer/var.h"
#include "optimizer/keys.h"
#include "optimizer/tlist.h"
#include "optimizer/joininfo.h"
diff --git a/src/backend/optimizer/path/prune.c b/src/backend/optimizer/path/prune.c
index f004bb0c90c3ee40375caded9192a01a4073adf4..a405ffeb5e2b62650ba23972c7bd14216287ecd0 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -7,16 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.40 1999/07/15 15:19:18 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/Attic/prune.c,v 1.41 1999/07/15 22:39:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/cost.h"
#include "optimizer/paths.h"
#include "optimizer/pathnode.h"
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 17ab7e85c5b9d5c06b21b410b2dff300caeafd20..e96554885c462c6d03189a2c7a2951e8fd69d288 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.58 1999/07/15 15:19:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/createplan.c,v 1.59 1999/07/15 22:39:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,25 +17,18 @@
#include "postgres.h"
#include <utils/syscache.h>
-#include <catalog/pg_index.h>
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
#include "nodes/nodeFuncs.h"
#include "nodes/makefuncs.h"
#include "utils/lsyscache.h"
-#include "utils/builtins.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/cost.h"
#include "optimizer/clauses.h"
#include "optimizer/planmain.h"
#include "optimizer/tlist.h"
-#include "optimizer/planner.h"
#include "optimizer/internal.h"
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 947ec23da6a678b6fd0c2a2e4509e2f00bd95741..14fe6865cfb9825534e354ee10e9b8738987bba9 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.32 1999/07/15 15:19:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/initsplan.c,v 1.33 1999/07/15 22:39:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,19 +15,13 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
#include "nodes/makefuncs.h"
-#include "access/htup.h"
#include "catalog/pg_type.h"
#include "utils/lsyscache.h"
-#include "optimizer/internal.h"
#include "optimizer/planmain.h"
#include "optimizer/joininfo.h"
#include "optimizer/pathnode.h"
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index 924cb35062464d97da8636907b837fa546fa7d3a..35949ec953ec67392a5e011f307e3eb7a4809644 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.38 1999/07/15 15:19:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planmain.c,v 1.39 1999/07/15 22:39:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,27 +15,14 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/print.h"
-#include "nodes/relation.h"
-#include "nodes/makefuncs.h"
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
-#include "optimizer/internal.h"
#include "optimizer/prep.h"
#include "optimizer/paths.h"
#include "optimizer/clauses.h"
-#include "optimizer/keys.h"
#include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/cost.h"
-#include "tcop/dest.h"
-#include "nodes/memnodes.h"
-#include "utils/lsyscache.h"
static Plan *subplanner(Query *root, List *flat_tlist, List *qual);
static Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index ac145b5e1710778f7dc7527086f183aa26bca6fb..7655bbf5d339236f641e4ce39286c05fc07404dc 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.58 1999/07/15 15:19:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.59 1999/07/15 22:39:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,6 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
#include "nodes/makefuncs.h"
#include "catalog/pg_type.h"
#include "parser/parse_expr.h"
@@ -29,20 +25,11 @@
#include "optimizer/internal.h"
#include "optimizer/planner.h"
-#include "optimizer/plancat.h"
#include "optimizer/prep.h"
#include "optimizer/planmain.h"
#include "optimizer/subselect.h"
-#include "optimizer/paths.h"
-#include "optimizer/cost.h"
/* DATA STRUCTURE CREATION/MANIPULATION ROUTINES */
-#include "nodes/relation.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/joininfo.h"
-#include "optimizer/keys.h"
-#include "optimizer/ordering.h"
-#include "optimizer/pathnode.h"
#include "optimizer/clauses.h"
#include "optimizer/tlist.h"
#include "optimizer/var.h"
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 9d11dc4908d7351c155ca4ab005f1c78b4206341..daa26533aeb7f92f0f69ec5f2087bd11bbb9d3e6 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.51 1999/07/15 15:19:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.52 1999/07/15 22:39:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,18 +15,11 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "nodes/nodeFuncs.h"
#include "nodes/makefuncs.h"
-#include "optimizer/internal.h"
#include "optimizer/clauses.h"
-#include "optimizer/restrictinfo.h"
-#include "optimizer/keys.h"
#include "optimizer/planmain.h"
#include "optimizer/tlist.h"
#include "optimizer/var.h"
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index 2eab2d3d6d48a17291bb6e3f2e2ae0eb709de18f..9f1455eb9bad0f250d63968e98c90445d159584f 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -6,29 +6,18 @@
* Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.19 1999/07/15 01:52:09 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/subselect.c,v 1.20 1999/07/15 22:39:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
#include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/subselect.h"
#include "optimizer/planner.h"
-#include "optimizer/planmain.h"
-#include "optimizer/internal.h"
-#include "optimizer/paths.h"
#include "optimizer/clauses.h"
-#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
-#include "optimizer/var.h"
-#include "optimizer/cost.h"
int PlannerQueryLevel; /* level of current query */
List *PlannerInitPlan; /* init subplans for current query */
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index aed7372704407bfc637d9518529386a01c32fd5b..d7ee69f8552b6a3aa4c9fbfd274282d6fcdf8b25 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.15 1999/05/25 16:09:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepqual.c,v 1.16 1999/07/15 22:39:28 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,10 +15,8 @@
#include "postgres.h"
-#include "nodes/pg_list.h"
#include "nodes/makefuncs.h"
-#include "optimizer/internal.h"
#include "optimizer/clauses.h"
#include "optimizer/prep.h"
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index 7c132ec4478b360fa3450ea0c84a2031a36f1e04..f3a16dcb734d81d849e9c55ca599c309f4ab7d61 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.23 1999/07/15 15:19:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/preptlist.c,v 1.24 1999/07/15 22:39:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,24 +15,16 @@
#include "postgres.h"
#include "catalog/pg_type.h"
-#include "nodes/pg_list.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/parsenodes.h"
#include "nodes/makefuncs.h"
-#include "utils/builtins.h"
#include "utils/syscache.h"
#include "utils/lsyscache.h"
-#include "parser/parse_type.h"
#include "parser/parsetree.h" /* for getrelid() */
-#include "optimizer/internal.h"
#include "optimizer/prep.h"
#include "optimizer/clauses.h"
-#include "optimizer/tlist.h"
static List *expand_targetlist(List *tlist, Oid relid, int command_type,
Index result_relation);
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index fae22f326278f0dedcf37e8563587611c3df6410..b9dd4e39dbe627789f8a288e874174cfbb79950a 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.34 1999/07/15 15:19:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/prep/prepunion.c,v 1.35 1999/07/15 22:39:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,18 +16,12 @@
#include "postgres.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/relation.h"
#include "parser/parsetree.h"
#include "parser/parse_clause.h"
#include "utils/lsyscache.h"
-#include "optimizer/internal.h"
#include "optimizer/prep.h"
#include "optimizer/plancat.h"
#include "optimizer/planner.h"
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index ad320dcd0476b847517976f3e0e9229cbcb20b1b..d9aee84717e348d1a9d1acc52b8667c715ce2959 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.37 1999/06/21 01:18:02 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.38 1999/07/15 22:39:29 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -19,16 +19,11 @@
#include "postgres.h"
#include <catalog/pg_operator.h>
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
-#include "nodes/parsenodes.h"
#include "nodes/plannodes.h"
#include "nodes/makefuncs.h"
#include "nodes/nodeFuncs.h"
-#include "catalog/pg_aggregate.h"
-#include "utils/syscache.h"
#include "utils/lsyscache.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/indexnode.c b/src/backend/optimizer/util/indexnode.c
index 4fe91eb865601be0656e7b9f7fb75b94f420aee9..7ae1790278954ce13b609ba0a3c4a637e691445a 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.16 1999/05/25 22:41:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/indexnode.c,v 1.17 1999/07/15 22:39:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,11 +15,7 @@
#include "postgres.h"
-#include "nodes/plannodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/plancat.h"
#include "optimizer/pathnode.h" /* where the decls go */
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 82602c13aa49c8f2956d4299fe35b08614c4ac37..1df81131448622465c20e4a7712f6f006c3c100a 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -7,17 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.21 1999/05/25 22:41:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/joininfo.c,v 1.22 1999/07/15 22:39:30 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/joininfo.h"
-#include "optimizer/var.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/keys.c b/src/backend/optimizer/util/keys.c
index 34d73bad808a352965c0f0eac3e5abfe2fb26d73..c9a5a9b5ea9a86dbd51c8efd6c29e9a8fb83ecdf 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -7,18 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.22 1999/07/15 15:19:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/keys.c,v 1.23 1999/07/15 22:39:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/keys.h"
-#include "optimizer/tlist.h"
static Expr *matching2_tlvar(int var, List *tlist, bool (*test) ());
diff --git a/src/backend/optimizer/util/ordering.c b/src/backend/optimizer/util/ordering.c
index 46948609f1df130c513f76473271d5b93d2fd345..19d9b59453714a3c2db52f03c4edd6c49863caf0 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.16 1999/05/25 16:09:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/Attic/ordering.c,v 1.17 1999/07/15 22:39:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,7 +15,6 @@
#include "postgres.h"
-#include "optimizer/internal.h"
#include "optimizer/ordering.h"
static bool sortops_order_match(Oid *ordering1, Oid *ordering2,
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 3712db3d714e3059e5b3e7d812bf1f0023aa18f3..10283aa25047097235a8f619b5d628915daad701 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.43 1999/07/15 15:19:26 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/pathnode.c,v 1.44 1999/07/15 22:39:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,9 +15,7 @@
#include "postgres.h"
-#include "nodes/relation.h"
-#include "optimizer/internal.h"
#include "optimizer/pathnode.h"
#include "optimizer/restrictinfo.h"
#include "optimizer/plancat.h"
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index 46dfb07a6943405f87f184e12bcb84c2183b5e61..0d7c91556f3548f33e2a12ed42190bec013f5397 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.31 1999/07/07 16:09:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/plancat.c,v 1.32 1999/07/15 22:39:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,24 +18,18 @@
#include "access/heapam.h"
#include "access/genam.h"
-#include "access/htup.h"
-#include "access/itup.h"
#include "catalog/catname.h"
#include "catalog/pg_amop.h"
-#include "catalog/pg_index.h"
#include "catalog/pg_inherits.h"
-#include "catalog/pg_version.h"
#include "parser/parsetree.h" /* for getrelid() */
-#include "fmgr.h"
#include "optimizer/internal.h"
#include "optimizer/plancat.h"
#include "utils/syscache.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 5346a1c72a5933798c0bf8c8ea3c244cb28ac5f9..19dadd771751bb870d2203263886051484971b12 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -7,13 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.16 1999/05/25 16:10:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/relnode.c,v 1.17 1999/07/15 22:39:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/relation.h"
#include "optimizer/internal.h"
#include "optimizer/pathnode.h" /* where the decls go */
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 504652db8e198c3721c881c9ae6ae7c30b2b1ba1..e91057057ac54350c58a581c0aa6ea3fe112b992 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -7,13 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.4 1999/05/25 22:41:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/restrictinfo.c,v 1.5 1999/07/15 22:39:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/relation.h"
#include "nodes/nodeFuncs.h"
#include "optimizer/internal.h"
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index a133e7a5527becbf35a72328c5eb6e6687795ee6..fe4a68abeaa013081d4d14f760a11dd32cfdc6bb 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -7,19 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.34 1999/07/15 15:19:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.35 1999/07/15 22:39:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/pg_list.h"
#include "nodes/nodeFuncs.h"
-#include "utils/lsyscache.h"
-#include "optimizer/internal.h"
#include "optimizer/var.h"
#include "optimizer/tlist.h"
#include "optimizer/clauses.h"
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index d31f13d56d2e6207c625d946262218d6b3c0d12b..5e3ea9e492d9428e7450405896e99cc81955b20e 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.20 1999/06/19 03:41:45 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/util/var.c,v 1.21 1999/07/15 22:39:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,16 +15,10 @@
#include "postgres.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/nodeFuncs.h"
-#include "optimizer/internal.h"
#include "optimizer/clauses.h"
#include "optimizer/var.h"
-#include "parser/parsetree.h"
static bool pull_varnos_walker(Node *node, List **listptr);
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 59ae795f3ae1154949c627d6a8aacacefd0274f5..68b38f17120173a92ccb0fe2ccd63bf98cbd30f0 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: analyze.c,v 1.112 1999/07/15 15:19:29 momjian Exp $
+ * $Id: analyze.c,v 1.113 1999/07/15 22:39:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,15 +18,11 @@
#include "postgres.h"
#include "access/heapam.h"
#include "nodes/makefuncs.h"
-#include "nodes/memnodes.h"
-#include "nodes/pg_list.h"
#include "parser/analyze.h"
#include "parser/parse_agg.h"
#include "parser/parse_clause.h"
-#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
-#include "parser/parse_expr.h"
#include "catalog/pg_type.h"
#include "parse.h"
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 80662278f7047c6fdeac751f8c90228579ac6173..e5b5ece549b407f3af62e84e247e230e1051224c 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.23 1999/06/21 01:18:02 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_agg.c,v 1.24 1999/07/15 22:39:33 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,17 +16,10 @@
#include <string.h>
#include "postgres.h"
-#include "access/heapam.h"
#include "catalog/pg_aggregate.h"
-#include "catalog/pg_type.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "optimizer/clauses.h"
#include "parser/parse_agg.h"
#include "parser/parse_expr.h"
-#include "parser/parse_node.h"
-#include "parser/parse_target.h"
#include "parser/parse_coerce.h"
#include "utils/syscache.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index a2bf9f080a920d21a367fc7ac9a130e1bb8affb9..7f0e1509bf0ca6f39392ac1d7854fb1df502923a 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.38 1999/07/15 15:19:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.39 1999/07/15 22:39:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,16 +17,12 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "catalog/pg_type.h"
-#include "parser/analyze.h"
#include "parser/parse_clause.h"
#include "parser/parse_expr.h"
-#include "parser/parse_node.h"
#include "parser/parse_oper.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_coerce.h"
-#include "nodes/print.h"
#include "nodes/relation.h"
#include "parse.h"
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 1563a0eef731e97644d05cc059d2852650669375..610dfa232de25b9c57ba9bf5e43dc64480a80126 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -7,21 +7,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.18 1999/06/17 22:21:41 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.19 1999/07/15 22:39:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
#include "utils/builtins.h"
-#include "fmgr.h"
-#include "nodes/makefuncs.h"
#include "parser/parse_expr.h"
-#include "catalog/pg_type.h"
#include "parser/parse_func.h"
-#include "parser/parse_type.h"
#include "parser/parse_target.h"
#include "parser/parse_coerce.h"
#include "utils/syscache.h"
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 4aecd1f04815c4677e03481954220078889c55b6..bccad445b53571b7715757427efe8f8249ce5a9f 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.50 1999/07/11 02:04:19 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.51 1999/07/15 22:39:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,9 +16,7 @@
#include <string.h>
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
-#include "nodes/nodes.h"
#include "nodes/params.h"
#include "nodes/relation.h"
#include "parse.h"
@@ -26,7 +24,6 @@
#include "parser/gramparse.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
-#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_coerce.h"
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 6f676618474ad26c99f8afcc3b303a684d36dbd4..083e1c070b36a0a485290eced2b23fcbc511356b 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.47 1999/06/17 22:21:40 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.48 1999/07/15 22:39:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,17 +17,11 @@
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "access/sdir.h"
#include "catalog/catname.h"
-#include "catalog/heap.h"
#include "catalog/indexing.h"
#include "catalog/pg_inherits.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_aggregate.h"
-#include "fmgr.h"
#include "lib/dllist.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
@@ -35,13 +29,9 @@
#include "parser/parse_agg.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
-#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
-#include "parser/parse_type.h"
#include "parser/parse_coerce.h"
-#include "storage/bufmgr.h"
-#include "storage/lmgr.h"
#include "utils/acl.h"
#include "utils/builtins.h"
#include "utils/lsyscache.h"
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index f1db1359556784a9543108a88facd81a60e5b4c0..672ff2697444135ef9cc59e4a6a0a7d1f6b7bc1f 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.26 1999/07/15 15:19:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.27 1999/07/15 22:39:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,15 +16,11 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
#include "catalog/catname.h"
#include "catalog/pg_operator.h"
-#include "catalog/pg_type.h"
-#include "fmgr.h"
#include "parser/parse_oper.h"
#include "parser/parse_type.h"
#include "parser/parse_coerce.h"
-#include "storage/bufmgr.h"
#include "utils/syscache.h"
#include "parser/parse_func.h"
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 09f624fc7607b498e8f76365b67b5ce005d13079..7c8e8248583e946ce61247c8fbd29dd09efbbd07 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.42 1999/06/17 22:21:41 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.43 1999/07/15 22:39:35 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,13 +16,9 @@
#include <string.h>
#include "postgres.h"
-#include "catalog/pg_type.h"
#include "nodes/makefuncs.h"
-#include "nodes/primnodes.h"
-#include "nodes/print.h"
#include "parser/parse_expr.h"
#include "parser/parse_func.h"
-#include "parser/parse_node.h"
#include "parser/parse_relation.h"
#include "parser/parse_target.h"
#include "parser/parse_coerce.h"
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index 7ced7111cb81f7228317d159bb63d3c33cd18986..6e8529ee78ee02d2613f7376a16fc2767cadaf7c 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -7,21 +7,15 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.22 1999/05/29 03:17:19 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.23 1999/07/15 22:39:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "fmgr.h"
-#include "nodes/nodes.h"
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h"
-#include "parser/parse_node.h"
#include "catalog/pg_type.h"
-#include "parser/parse_target.h"
#include "parser/parse_type.h"
#include "utils/syscache.h"
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 48c9860159e0da9d451d8abe57e0f6646dae178b..bce28bd5af81fc0499a7ae988565d184746cbf0a 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.39 1999/05/25 16:10:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parser.c,v 1.40 1999/07/15 22:39:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -14,10 +14,8 @@
#include <stdio.h>
#include "postgres.h"
-#include "nodes/pg_list.h"
#include "parser/analyze.h"
#include "parser/gramparse.h"
-#include "parser/parse_node.h"
#include "parser/parser.h"
#if defined(FLEX_SCANNER)
diff --git a/src/backend/port/dynloader/bsdi.c b/src/backend/port/dynloader/bsdi.c
index 88e8c0e0f8371eb5995d6cd55860680317eb547d..caf5bea95f31dc42479eb2046c506f6dd98766b4 100644
--- a/src/backend/port/dynloader/bsdi.c
+++ b/src/backend/port/dynloader/bsdi.c
@@ -16,10 +16,7 @@
*/
#ifdef PRE_BSDI_2_1
#include <stdio.h>
-#include <dld.h>
#include "postgres.h"
-#include "dynloader.h"
-#include "fmgr.h"
extern char *pg_pathname;
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 2d81ce9025b3e93a4edd86f183eea65005a7a9b8..8639318223afeee98e0da088870e07cd1b580acf 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.12 1999/07/15 15:19:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.13 1999/07/15 22:39:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,10 +19,7 @@
#include "postgres.h"
#ifdef HAVE_DLD_H
-#include <dld.h>
#endif
-#include "dynloader.h"
-#include "fmgr.h"
#ifdef NOT_USED
extern char *pg_pathname;
diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c
index 1980578cd8ee331f34a33406fa47815c5f5979c3..a704c39bf490011f04a1c1df8843fa8704c5c78d 100644
--- a/src/backend/port/isinf.c
+++ b/src/backend/port/isinf.c
@@ -1,7 +1,6 @@
-/* $Id: isinf.c,v 1.6 1998/09/01 03:24:29 momjian Exp $ */
+/* $Id: isinf.c,v 1.7 1999/07/15 22:39:38 momjian Exp $ */
#include <math.h>
-#include "config.h"
#if HAVE_FPCLASS
#if HAVE_IEEEFP_H
@@ -27,7 +26,6 @@ isinf(double d)
#if defined(HAVE_FP_CLASS) || defined(HAVE_FP_CLASS_D)
#if HAVE_FP_CLASS_H
-#include <fp_class.h>
#endif
int
isinf(x)
diff --git a/src/backend/port/snprintf.c b/src/backend/port/snprintf.c
index 0f9ed9cbc2b3203c9559edc2ab3477aefc15f4c0..8f41ece45b5432d003712f3113228d72da3a5c95 100644
--- a/src/backend/port/snprintf.c
+++ b/src/backend/port/snprintf.c
@@ -32,13 +32,10 @@
* SUCH DAMAGE.
*/
#ifdef NOT_USED
-#include "sendmail.h"
-#include "pathnames.h"
#endif
#include "postgres.h"
-#include "regex/cdefs.h"
#include <stdio.h>
#include <stdarg.h>
@@ -82,7 +79,7 @@ typedef unsigned long ulong_long;
* causing nast effects.
**************************************************************/
-/*static char _id[] = "$Id: snprintf.c,v 1.22 1999/05/25 16:10:28 momjian Exp $";*/
+/*static char _id[] = "$Id: snprintf.c,v 1.23 1999/07/15 22:39:39 momjian Exp $";*/
static char *end;
static int SnprfOverflow;
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index 609810ba5cad60e731d4b521a2cf3dfadfbaaef0..ccf1d6223d4d693a2ad4ca9efd98d532b1c5da24 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -6,14 +6,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.18 1999/07/15 15:19:40 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/Attic/locks.c,v 1.19 1999/07/15 22:39:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h" /* for oid defs */
-#include "nodes/pg_list.h" /* lisp support package */
-#include "nodes/parsenodes.h"
-#include "nodes/primnodes.h" /* Var node def */
#include "utils/syscache.h" /* for SearchSysCache */
#include "rewrite/locks.h" /* for rewrite specific lock defns */
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 27eef692d5e83fd8d7341847848584e8b51a2497..333e18ed6104ed051044199d5a13084b8ef411e0 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.31 1999/07/15 15:19:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.32 1999/07/15 22:39:42 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,21 +16,13 @@
#include "postgres.h"
-#include "access/htup.h"
#include "access/heapam.h" /* access methods like amopenr */
#include "catalog/pg_rewrite.h"
-#include "nodes/parsenodes.h"
-#include "nodes/pg_list.h"
#include "parser/parse_relation.h"
-#include "rewrite/locks.h"
#include "rewrite/rewriteDefine.h"
-#include "rewrite/rewriteRemove.h"
#include "rewrite/rewriteSupport.h"
#include "tcop/tcopprot.h"
#include "utils/builtins.h"
-#include "utils/lsyscache.h"
-#include "utils/rel.h"
-#include "storage/bufpage.h"
Oid LastOidProcessed = InvalidOid;
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index eafed074ad22e06d93a0bf9c8f6426f45d03b5b0..55dc617fd93d15842632773764ccd3455bcd98e7 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -6,41 +6,30 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.50 1999/07/15 15:19:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteHandler.c,v 1.51 1999/07/15 22:39:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
#include "miscadmin.h"
-#include "utils/rel.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/relation.h"
#include "parser/parse_type.h"
#include "parser/parsetree.h" /* for parsetree manipulation */
#include "parser/parse_relation.h"
-#include "nodes/parsenodes.h"
-#include "parser/parse_node.h"
#include "parser/parse_target.h"
#include "parser/analyze.h"
#include "optimizer/clauses.h"
#include "optimizer/prep.h"
-#include "rewrite/rewriteSupport.h"
-#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
#include "rewrite/locks.h"
-#include "commands/creatinh.h"
#include "access/heapam.h"
#include "utils/lsyscache.h"
-#include "utils/syscache.h"
#include "utils/acl.h"
-#include "catalog/pg_shadow.h"
#include "catalog/pg_type.h"
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index feee3055c3a60c70b1eb564d368f2fb42880cfaa..b2fd0eb8f24d798b7d7d31d475118634a08469f1 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -6,25 +6,17 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.34 1999/07/15 15:19:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteManip.c,v 1.35 1999/07/15 22:39:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "nodes/pg_list.h"
-#include "nodes/nodes.h"
-#include "nodes/relation.h"
-#include "nodes/primnodes.h"
#include "parser/parsetree.h" /* for getrelid() */
#include "utils/lsyscache.h"
#include "utils/builtins.h"
-#include "rewrite/rewriteHandler.h"
#include "rewrite/rewriteManip.h"
-#include "rewrite/rewriteSupport.h"
-#include "rewrite/locks.h"
-#include "nodes/plannodes.h"
#include "optimizer/clauses.h"
static void ResolveNew(RewriteInfo *info, List *targetlist,
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index 10cce0262bda00beabafcf91f4708b210d33ca74..cf4c309f59698b80c301163376efec2ea0796a4a 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.24 1999/05/25 16:10:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.25 1999/07/15 22:39:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,8 @@
#include "postgres.h"
-#include "fmgr.h" /* for F_NAMEEQ */
#include "access/heapam.h" /* heap AM calls defined here */
-#include "access/skey.h"
#include "catalog/catname.h" /* for RewriteRelationName */
#include "catalog/pg_rewrite.h"
#include "utils/syscache.h"
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index 305d2e49ac06556c8510743bc3f51103a8372eda..cbffc679f1622a847308c7aef17df5e02d8fb1d5 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.33 1999/07/15 15:19:43 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteSupport.c,v 1.34 1999/07/15 22:39:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,16 +16,7 @@
#include "access/heapam.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 "storage/bufmgr.h"
-#include "utils/builtins.h" /* for textout */
#include "utils/catcache.h" /* for CacheContext */
-#include "utils/rel.h" /* for Relation, RelationData ... */
#include "utils/syscache.h" /* for SearchSysCache */
#include "rewrite/rewriteSupport.h"
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index 0b4e0ea58fb15a39378b2616aebbee36041787d4..5cab2e4e24d6d1aa1e29140d6676d748c337fbab 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.14 1999/02/13 23:17:55 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/buf_table.c,v 1.15 1999/07/15 22:39:46 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,10 +29,6 @@
#include "postgres.h"
#include "storage/bufmgr.h"
-#include "storage/buf_internals.h" /* where the declarations go */
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "utils/hsearch.h"
static HTAB *SharedBufHash;
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index fa3914b61c04b8d7329fa01e8383eeedd3e8a2e7..6acccfb2872bb55fe9968a8e2ad1a0895071e561 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.57 1999/07/15 15:19:44 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.58 1999/07/15 22:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -50,24 +50,12 @@
#include "postgres.h"
/* declarations split between these three files */
-#include "storage/buf.h"
-#include "storage/buf_internals.h"
-#include "storage/bufmgr.h"
-#include "storage/fd.h"
-#include "storage/ipc.h"
#include "storage/s_lock.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
#include "storage/smgr.h"
-#include "storage/lmgr.h"
#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/relcache.h"
#include "executor/execdebug.h" /* for NDirectFileRead */
-#include "catalog/catalog.h"
extern SPINLOCK BufMgrLock;
extern long int ReadBufferCount;
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 2b007b85e080bbd7f4ce6a9f587acf11b9163051..13f79377b52f4e4a7333b33e16ed012601fafc12 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.15 1999/05/25 16:10:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/freelist.c,v 1.16 1999/07/15 22:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,8 +28,6 @@
#include "postgres.h"
#include "storage/bufmgr.h"
-#include "storage/buf_internals.h" /* where declarations go */
-#include "storage/spin.h"
static BufferDesc *SharedFreeList;
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index c9fcf506bc56cabce88326e2429f898b0ae40c0e..6162052f8fd7220d57f6bd6c289efafd6f8149b1 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.22 1999/05/10 00:45:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/buffer/localbuf.c,v 1.23 1999/07/15 22:39:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,23 +29,10 @@
#include "postgres.h"
/* declarations split between these three files */
-#include "storage/buf.h"
-#include "storage/buf_internals.h"
-#include "storage/bufmgr.h"
-
-#include "storage/fd.h"
-#include "storage/ipc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
+
#include "storage/smgr.h"
-#include "storage/lmgr.h"
-#include "miscadmin.h"
-#include "utils/builtins.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "utils/relcache.h"
#include "executor/execdebug.h" /* for NDirectFileRead */
-#include "catalog/catalog.h"
extern long int LocalBufferFlushCount;
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index b32c7f91ea25aa3d2bec24059ec2fcbfb8dd48d4..89af501ff9806258bd41a5a2af9d6169069a9caf 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.26 1999/05/31 18:28:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.27 1999/07/15 22:39:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,12 +16,8 @@
#include "postgres.h"
-#include "storage/ipc.h"
#include "storage/sinval.h"
#include "storage/bufmgr.h"
-#include "storage/proc.h"
-#include "storage/smgr.h"
-#include "storage/lock.h"
#include "miscadmin.h" /* for DebugLvl */
/*
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 8213a84c14541b6959274a3ce3ee1ce4d657ee15..2b785251c5961b9f973c5f652f38da7fb3712795 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.43 1999/07/15 15:19:48 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/shmem.c,v 1.44 1999/07/15 22:39:48 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -61,15 +61,8 @@
#include <string.h>
#include "postgres.h"
-#include "storage/ipc.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
#include "storage/proc.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
-#include "access/xact.h"
#include "utils/tqual.h"
-#include "access/transam.h"
/* shared memory global variables */
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index 220607ac050a816f7af5e93ea5400ff939b9689c..21585cc2406191606b20107032afe9cfeb26b2f9 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.15 1999/05/28 17:03:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.16 1999/07/15 22:39:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,6 @@
#include "storage/backendid.h"
#include "storage/sinval.h"
#include "storage/sinvaladt.h"
-#include "storage/spin.h"
extern SISeg *shmInvalBuffer; /* the shared buffer segment, set by */
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 8a47ecaa42dbcb3df0c9d96b7b6a4e01af714754..fb6170faf436a5c1ab1c4d87bf9e4af561ffea80 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.21 1999/07/15 15:19:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinvaladt.c,v 1.22 1999/07/15 22:39:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,11 +17,8 @@
#include "postgres.h"
-#include "storage/ipc.h"
#include "storage/backendid.h"
-#include "storage/sinvaladt.h"
#include "storage/lmgr.h"
-#include "utils/memutils.h"
#include "utils/trace.h"
/* ----------------
diff --git a/src/backend/storage/ipc/spin.c b/src/backend/storage/ipc/spin.c
index 3fe692ff088958d9a9b700f80bec6584a5ff9d24..c49ebc919487bf98663f7836e8e126988cf5e744 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.18 1999/02/13 23:18:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/ipc/Attic/spin.c,v 1.19 1999/07/15 22:39:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,12 +26,8 @@
*/
#include <errno.h>
#include "postgres.h"
-#include "storage/ipc.h"
#include "storage/s_lock.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
#include "storage/proc.h"
-#include "utils/trace.h"
#ifndef HAS_TEST_AND_SET
#include <sys/sem.h>
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index 57d03568c7d4319bbf0483f87fce08e96b6e45d5..641dab03935ad6276e69be687705ea354a8f05dc 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.53 1999/05/25 16:11:15 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/large_object/inv_api.c,v 1.54 1999/07/15 22:39:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,30 +22,16 @@
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/tupdesc.h"
-#include "access/transam.h"
-#include "access/xact.h"
#include "access/nbtree.h"
-#include "access/tupdesc.h"
#include "catalog/catalog.h" /* for newoid() */
#include "catalog/heap.h"
#include "catalog/index.h" /* for index_create() */
-#include "catalog/pg_am.h" /* for BTREE_AM_OID */
#include "catalog/pg_type.h" /* for INT4OID */
#include "catalog/pg_opclass.h" /* for INT4_OPS_OID */
-#include "fmgr.h"
#include "libpq/libpq-fs.h"
#include "miscadmin.h"
-#include "nodes/pg_list.h"
-#include "storage/itemptr.h"
-#include "storage/bufpage.h"
-#include "storage/bufmgr.h"
#include "storage/large_object.h"
-#include "storage/lmgr.h"
#include "storage/smgr.h"
-#include "utils/builtins.h" /* for namestrcpy() */
-#include "utils/rel.h"
#include "utils/relcache.h"
/*
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index cf7a1c868250047885f523369fd70dc388346852..9ad92c8a753ecceb0ee138b3fc71f20adf0f7100 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.29 1999/07/15 20:32:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lmgr.c,v 1.30 1999/07/15 22:39:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,27 +22,11 @@
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
-#include "access/xact.h"
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/itemptr.h"
-#include "storage/bufpage.h"
-#include "storage/multilev.h"
-#include "storage/lmgr.h"
-#include "utils/rel.h"
-#include "catalog/catname.h"
#include "catalog/catalog.h"
-#include "catalog/pg_class.h"
-#include "nodes/memnodes.h"
-#include "storage/bufmgr.h"
#include "access/transam.h" /* for AmiTransactionId */
extern Oid MyDatabaseId;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 74845dbcf873cf10c373aea4e8023047d8df8ec8..bdf6bb9860eed9318c284011da82330108c0bfea 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.57 1999/07/15 20:32:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.58 1999/07/15 22:39:51 momjian Exp $
*
* NOTES
* Outside modules can create a lock table and acquire/release
@@ -37,15 +37,8 @@
#include "postgres.h"
#include "miscadmin.h"
-#include "storage/shmem.h"
-#include "storage/sinvaladt.h"
-#include "storage/spin.h"
#include "storage/proc.h"
-#include "storage/lock.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
#include "access/xact.h"
-#include "access/transam.h"
#include "utils/trace.h"
#include "utils/ps_status.h"
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index d88ded9a7a8de31e7e792e8f2a8ddfc0a96df5b9..5822ca4e06c796ec52190fceaed7769301a930c7 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.58 1999/07/15 22:39:52 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -63,17 +63,10 @@
#include "miscadmin.h"
#include "libpq/pqsignal.h"
-#include "access/xact.h"
-#include "utils/hsearch.h"
-#include "storage/ipc.h"
/* In Ultrix, sem.h must be included after ipc.h */
#include <sys/sem.h>
-#include "storage/buf.h"
-#include "storage/lock.h"
#include "storage/lmgr.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
#include "storage/proc.h"
#include "utils/trace.h"
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index d33bd8c43749a152a8a280135c2fdc8f9731955c..cb3d2f8dce658e1fd8cf8417c5a0d24d3f79d44d 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.24 1999/07/15 15:19:53 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/bufpage.c,v 1.25 1999/07/15 22:39:52 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,10 +17,6 @@
#include "postgres.h"
-#include "storage/item.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "utils/memutils.h"
#include "storage/bufpage.h"
static void PageIndexTupleDeleteAdjustLinePointers(PageHeader phdr,
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index 1ac32fd5454e6e65bdb82dcaec4b1af760f74358..e8bee1026fa0978add9b59bd3f00a6652b192ec2 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -7,15 +7,12 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.6 1999/05/25 16:11:27 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/page/itemptr.c,v 1.7 1999/07/15 22:39:53 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "storage/block.h"
-#include "storage/off.h"
-#include "storage/itemptr.h"
#include "storage/bufpage.h"
/*
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index d94c0ef3f4d9bc47cc456f9e4a611f6f4624f2dc..33cf5da88ad5a226a3fcb45b3ee4ca2516535fae 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.47 1999/07/15 15:19:54 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.48 1999/07/15 22:39:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,10 +21,7 @@
#include "miscadmin.h" /* for DataDir */
#include "catalog/catalog.h"
-#include "storage/block.h"
-#include "storage/fd.h"
#include "storage/smgr.h" /* where the declarations go */
-#include "utils/rel.h"
#undef DIAGNOSTIC
diff --git a/src/backend/storage/smgr/mm.c b/src/backend/storage/smgr/mm.c
index 5bce97f93a22051cb9c6a84b12a27bff05416e40..6b8cc7f14cab01d7aeb7ed6946f135add2fb81ea 100644
--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.16 1999/05/25 16:11:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/Attic/mm.c,v 1.17 1999/07/15 22:39:54 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,15 +19,7 @@
#ifdef STABLE_MEMORY_STORAGE
#include <math.h>
-#include "storage/ipc.h"
-#include "storage/smgr.h" /* where the declarations go */
-#include "storage/block.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
-
-#include "utils/hsearch.h"
-#include "utils/rel.h"
-#include "utils/memutils.h"
+
/*
* MMCacheTag -- Unique triplet for blocks stored by the main memory
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 5ed9e4965be78920c6cec59eda43898f1b0f5022..2eeb0a0eae17ef0a6d64b1c6761f7b02913fdc01 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -10,17 +10,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.26 1999/07/15 15:19:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgr.c,v 1.27 1999/07/15 22:39:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "storage/ipc.h"
-#include "storage/block.h"
#include "storage/smgr.h"
-#include "utils/rel.h"
static void smgrshutdown(int dummy);
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index 496346462c5fcd56f04a95efcf3abbe9ef0cf7b8..a695903a547fccfe29c97c46b1e4fc77b6c48806 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -7,14 +7,13 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.13 1999/07/15 15:19:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/smgr/smgrtype.c,v 1.14 1999/07/15 22:39:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include <string.h>
#include "postgres.h"
-#include "utils/builtins.h" /* where the declarations go */
#include "storage/smgr.h"
typedef struct smgrid
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 967237bec22b957c642b321fea9c8490d191ca2a..7b2e759df94418efc21758282476c322cb143095 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.32 1999/07/15 15:19:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.33 1999/07/15 22:39:55 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -37,19 +37,13 @@
#include "postgres.h"
-#include "access/htup.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
#include "access/printtup.h"
-#include "utils/portal.h"
-#include "executor/executor.h"
-#include "tcop/dest.h"
-#include "catalog/pg_type.h"
-#include "commands/async.h"
static char CommandInfo[32] = {0};
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 05b4ef90543ea1a59b1c71873a3112d049447858..df1641d8b7df602270b057fb68bc7b390edfcb4b 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.25 1999/07/15 15:19:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/fastpath.c,v 1.26 1999/07/15 22:39:56 momjian Exp $
*
* NOTES
* This cruft is the server side of PQfn.
@@ -61,9 +61,7 @@
#include "postgres.h"
-#include "tcop/tcopdebug.h"
-#include "fmgr.h"
#include "utils/builtins.h" /* for oideq */
#include "tcop/fastpath.h"
#include "libpq/libpq.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index a17f0ebd43de975d34d9d49ea76750fe062d78dd..871aa7beddc568f052d451ad882b291976ef3356 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.120 1999/07/15 15:19:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.121 1999/07/15 22:39:56 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -39,58 +39,40 @@
#include <arpa/inet.h>
#include <netdb.h>
#ifdef __CYGWIN32__
-#include <getopt.h>
#endif
#include "postgres.h"
#include "miscadmin.h"
-#include "fmgr.h"
-#include "access/xact.h"
-#include "catalog/catname.h"
#include "commands/async.h"
-#include "executor/execdebug.h"
-#include "executor/executor.h"
#include "libpq/libpq.h"
#include "libpq/pqformat.h"
-#include "libpq/libpq-be.h"
#include "libpq/pqsignal.h"
-#include "nodes/pg_list.h"
#include "nodes/print.h"
#include "optimizer/cost.h"
#include "optimizer/planner.h"
-#include "optimizer/prep.h"
#include "parser/parser.h"
#include "rewrite/rewriteHandler.h" /* for QueryRewrite() */
-#include "storage/bufmgr.h"
-#include "tcop/dest.h"
#include "tcop/fastpath.h"
#include "tcop/pquery.h"
-#include "tcop/tcopdebug.h"
#include "tcop/tcopprot.h" /* where declarations for this file go */
#include "tcop/utility.h"
-#include "utils/rel.h"
#include "utils/ps_status.h"
#include "utils/temprel.h"
-#include "nodes/parsenodes.h"
#include "../backend/parser/parse.h"
#ifdef NOT_USED
-#include "nodes/relation.h"
#endif
#ifdef NOT_USED
-#include "nodes/plannodes.h"
#endif
#ifdef NOT_USED
-#include "nodes/memnodes.h"
#endif
#include "utils/trace.h"
#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
#endif
/*
@@ -1520,7 +1502,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.120 $ $Date: 1999/07/15 15:19:59 $\n");
+ puts("$Revision: 1.121 $ $Date: 1999/07/15 22:39:56 $\n");
}
/* ----------------
@@ -1685,7 +1667,6 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
}
#ifndef HAVE_GETRUSAGE
-#include "rusagestub.h"
#else /* HAVE_GETRUSAGE */
#include <sys/resource.h>
#endif /* HAVE_GETRUSAGE */
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index e73de6d9bd4c0623d72f203885d82aa7c9173aad..57d897d3dea427ffb1ae5f290d13e3846e280480 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.24 1999/07/15 15:20:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.25 1999/07/15 22:39:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,22 +15,11 @@
#include "postgres.h"
-#include "tcop/tcopdebug.h"
-#include "nodes/nodes.h"
-#include "miscadmin.h"
-#include "utils/portal.h"
-#include "nodes/pg_list.h"
-#include "nodes/primnodes.h"
-#include "nodes/plannodes.h"
-#include "nodes/execnodes.h"
-#include "nodes/memnodes.h"
-#include "tcop/dest.h"
#include "executor/execdefs.h"
-#include "executor/execdesc.h"
#include "executor/executor.h"
#include "tcop/pquery.h"
#include "utils/ps_status.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 970e47db3b580465346bd07b2311f2e045e81bed..e690148de9ee7fa126e2b7a9cc855a2891f19e7b 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -9,12 +9,11 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.62 1999/07/15 15:20:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.63 1999/07/15 22:39:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include "access/xact.h"
#include "access/heapam.h"
#include "catalog/catalog.h"
#include "catalog/pg_type.h"
@@ -29,24 +28,17 @@
#include "commands/defrem.h"
#include "commands/rename.h"
#include "commands/view.h"
-#include "commands/version.h"
#include "commands/vacuum.h"
#include "commands/explain.h"
#include "commands/trigger.h"
#include "commands/proclang.h"
#include "commands/variable.h"
-#include "nodes/parsenodes.h"
#include "../backend/parser/parse.h"
-#include "utils/builtins.h"
#include "utils/acl.h"
#include "rewrite/rewriteRemove.h"
#include "rewrite/rewriteDefine.h"
-#include "tcop/tcopdebug.h"
-#include "tcop/dest.h"
#include "tcop/utility.h"
-#include "fmgr.h" /* For load_file() */
-#include "storage/fd.h"
#include "utils/ps_status.h"
#ifndef NO_SECURITY
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 0c87ce5a644aadc4be1cb2e913e9b955ac4f3e78..0a60e98a9f70c0c8a947eb5fadf14bf68d4b76c0 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.35 1999/07/15 15:20:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datetime.c,v 1.36 1999/07/15 22:39:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,9 +21,6 @@
#endif
#include "miscadmin.h"
#include "utils/builtins.h"
-#include "utils/nabstime.h"
-#include "utils/datetime.h"
-#include "access/xact.h"
static int date2tm(DateADT dateVal, int *tzp, struct tm * tm, double *fsec, char **tzn);
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index 1c774616d5c61443495042a481f0aba74ea1e3af..84d33049c5fedb6a8584f36145484a87b2117259 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.14 1999/07/15 15:20:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/datum.c,v 1.15 1999/07/15 22:39:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -30,7 +30,6 @@
#include <string.h>
#include "postgres.h"
#include "utils/datum.h"
-#include "catalog/pg_type.h"
/*-------------------------------------------------------------------------
* datumGetSize
diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
index 4a246d705f97262a7e085537753f4f21614e3289..ea81ebb23a7bc263bec6fde32b21d4587056d635 100644
--- a/src/backend/utils/adt/geo_selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.10 1999/07/15 15:20:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_selfuncs.c,v 1.11 1999/07/15 22:39:59 momjian Exp $
*
* XXX These are totally bogus.
*
@@ -16,8 +16,6 @@
*/
#include "postgres.h"
-#include "access/attnum.h"
-#include "utils/geo_decls.h" /* where function declarations go */
#include "utils/builtins.h"
float64
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index f26dc35a8ac5f6fce1b3943bc5f350ab980bb0a6..39776901af2507afda2d2a5cec9e14f23c4ba1f5 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.23 1999/07/15 15:20:17 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/int.c,v 1.24 1999/07/15 22:39:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -35,7 +35,6 @@
#endif
#include "postgres.h"
-#include "fmgr.h"
#include "utils/builtins.h" /* where the declarations go */
#ifndef SHRT_MAX
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index 03a7a4e47904c18f039ea167875b6ac76c13b328..ed2a86a954f28d607892f68b25ef4b3b55db98f1 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -1,7 +1,7 @@
/*
* PostgreSQL type definitions for MAC addresses.
*
- * $Id: mac.c,v 1.10 1999/07/15 15:20:18 momjian Exp $
+ * $Id: mac.c,v 1.11 1999/07/15 22:39:59 momjian Exp $
*/
#include <stdio.h>
@@ -9,7 +9,6 @@
#include <postgres.h>
#include <utils/builtins.h>
-#include <utils/inet.h>
manufacturer manufacturers[] = {
{0x00, 0x00, 0x0C, "Cisco"},
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index d7651355cf39d876588aa6a3d500456346eb1a94..dd26023b356e633c80c7619cb004a8add0e07145 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.16 1999/02/13 23:19:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/misc.c,v 1.17 1999/07/15 22:39:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,8 +15,6 @@
#include <sys/file.h>
#include <time.h>
#include "postgres.h"
-#include "utils/datum.h"
-#include "catalog/pg_type.h"
#include "utils/builtins.h"
/*-------------------------------------------------------------------------
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 1b56dfa4cb07f7b50e803ad9bee1372224256352..70ecd3d5c28acf0c39f8acde08431d6ff3ca8bec 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -3,7 +3,7 @@
* is for IP V4 CIDR notation, but prepared for V6: just
* add the necessary bits where the comments indicate.
*
- * $Id: network.c,v 1.12 1999/07/15 15:20:18 momjian Exp $
+ * $Id: network.c,v 1.13 1999/07/15 22:40:00 momjian Exp $
* Jon Postel RIP 16 Oct 1998
*/
@@ -19,7 +19,6 @@
#include <postgres.h>
#include <utils/builtins.h>
-#include <utils/inet.h>
static int v4bitncmp(unsigned int a1, unsigned int a2, int bits);
diff --git a/src/backend/utils/adt/not_in.c b/src/backend/utils/adt/not_in.c
index 7082b0d007ea8d83131eadc55bb9c7d73469d7f9..2d26096634b68dcedc92ad6805d580bda830e217 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.16 1999/05/25 16:12:12 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/not_in.c,v 1.17 1999/07/15 22:40:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,7 +26,6 @@
#include <string.h>
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
#include "utils/builtins.h" /* where function decls go */
static int my_varattno(Relation rd, char *a);
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 5faaa5ddab4fbe82df6bf202d3555e05733c33b3..fd09f386e8af771db5dbcf1034c78a70b6257dcb 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.34 1999/07/10 17:03:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.35 1999/07/15 22:40:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,7 +23,6 @@
#include "postgres.h"
#include "utils/builtins.h" /* where the declarations go */
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 3a2a03236426946d801d7fec1a056bffc9b4ea28..c0337b93fece1066e6346060a04fcde1eaf35a62 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.38 1999/07/15 15:20:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regproc.c,v 1.39 1999/07/15 22:40:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,6 @@
#include "miscadmin.h"
#include "access/heapam.h"
#include "access/genam.h"
-#include "access/itup.h"
-#include "access/relscan.h"
-#include "storage/bufmgr.h"
-#include "fmgr.h"
#include "utils/syscache.h"
#include "catalog/catname.h"
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 928705ef22edd662e8c92ae7bbdda6db0a01af9e..53763414f44a83c3e8cd55da30f59f291e94f96c 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
* out of it's tuple
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.19 1999/07/15 15:20:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.20 1999/07/15 22:40:00 momjian Exp $
*
* This software is copyrighted by Jan Wieck - Hamburg.
*
@@ -43,18 +43,10 @@
#include <string.h>
#include "executor/spi.h"
-#include "commands/trigger.h"
-#include "utils/builtins.h"
-#include "nodes/nodes.h"
#include "optimizer/clauses.h"
-#include "utils/syscache.h"
#include "utils/lsyscache.h"
-#include "catalog/pg_class.h"
-#include "catalog/pg_type.h"
#include "catalog/pg_shadow.h"
#include "catalog/pg_index.h"
-#include "catalog/pg_opclass.h"
-#include "fmgr.h"
#define BUFSIZE 8192
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 359267653b91f3f78765691a3df361f4a97abb5c..ade43a2be2cfef3df34cf81511a9f7b9d7cd4519 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.31 1999/07/15 15:20:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.32 1999/07/15 22:40:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -22,7 +22,6 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "fmgr.h"
#include "utils/builtins.h" /* for textout() prototype and where the
* declarations go */
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 94b6a1157bb3838ea13a6a77d49addaf9f7b819b..20ec4921bff1a4aa008a90283cc3fb7e5b0ed6f9 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.21 1999/02/13 23:19:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.22 1999/07/15 22:40:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,17 +19,11 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/relscan.h"
-#include "access/xact.h"
#include "catalog/pg_proc.h" /* for Form_pg_proc */
#include "catalog/catname.h" /* for ProcedureRelationName */
#include "catalog/indexing.h" /* for Num_pg_proc_indices */
-#include "fmgr.h"
-#include "storage/lmgr.h"
-#include "tcop/dest.h"
#include "utils/sets.h" /* for GENERICSETNAME */
#include "utils/syscache.h" /* for PROOID */
-#include "utils/tqual.h"
extern CommandDest whereToSendOutput; /* defined in tcop/postgres.c */
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 5a9bae512e8e64d9b686a04716dd2d61532613a8..621dcc53d03f267327077c8c9cec2d7cad351b73 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.8 1999/07/15 15:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/tid.c,v 1.9 1999/07/15 22:40:01 momjian Exp $
*
* NOTES
* input routine largely stolen from boxin().
@@ -17,7 +17,6 @@
#include <stdio.h> /* for sprintf() */
#include <string.h>
#include "postgres.h"
-#include "storage/bufpage.h"
#include "utils/builtins.h" /* where function declarations go */
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index 868412f46f8af74fd88ac7b5c64d1f7297c858c9..0d746a3c64e44086b2ac9683a4589c122a6dcfd8 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.49 1999/07/15 15:20:20 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.50 1999/07/15 22:40:01 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,17 +15,13 @@
#include <string.h>
#include "postgres.h"
#include "access/htup.h"
-#include "utils/array.h"
#include "utils/builtins.h"
#include "catalog/pg_type.h"
-#include "storage/bufpage.h"
-#include "utils/memutils.h"
#ifdef CYR_RECODE
char *convertstr(char *, int, int);
#endif
-#include "mb/pg_wchar.h"
/*
* CHAR() and VARCHAR() types are part of the ANSI SQL standard. CHAR()
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index c4044158ea02fc308e4eb819a662ccf9a376b1f7..663eeb5f774591fa38e21b0d8a460abc56fbeaf5 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.44 1999/07/15 15:20:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.45 1999/07/15 22:40:02 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,17 +15,11 @@
#include "postgres.h"
#include "access/heapam.h"
#include "access/genam.h"
-#include "utils/tqual.h"
#include "utils/builtins.h"
-#include "utils/portal.h"
#include "utils/catcache.h"
-#include "utils/rel.h"
-#include "storage/bufpage.h"
#include "access/valid.h"
#include "miscadmin.h"
-#include "fmgr.h" /* for F_BOOLEQ, etc. DANGER */
#include "catalog/pg_type.h" /* for OID of int28 type */
-#include "lib/dllist.h"
static void CatCacheRemoveCTup(CatCache *cache, Dlelem *e);
static Index CatalogCacheComputeHashIndex(struct catcache * cacheInP);
diff --git a/src/backend/utils/cache/fcache.c b/src/backend/utils/cache/fcache.c
index c298de0a9e94d50a9288b1df990c008df8017cfe..0e1eb945cb410ac3e07e5bfa158fd005f472114d 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -7,30 +7,21 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.22 1999/05/10 00:46:06 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/fcache.c,v 1.23 1999/07/15 22:40:03 momjian Exp $
*
*-------------------------------------------------------------------------
*/
#include "postgres.h"
-#include <nodes/parsenodes.h>
-#include <fmgr.h>
-#include "access/htup.h"
-#include "utils/catcache.h"
#include "utils/syscache.h"
#include "catalog/pg_type.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_language.h"
-#include "catalog/pg_class.h"
#include "parser/parsetree.h" /* for getrelname() */
#include "utils/builtins.h"
-#include "utils/fcache.h"
#include "utils/fcache2.h"
-#include "nodes/primnodes.h"
-#include "nodes/execnodes.h"
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 7cf66e2280893bf17876c2e27ff5c5fd39a9b86c..a356bb8cdd0e3572ff52eb89457c64780b6f57e3 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.23 1999/05/25 16:12:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/inval.c,v 1.24 1999/07/15 22:40:03 momjian Exp $
*
* Note - this code is real crufty...
*
@@ -17,20 +17,13 @@
#include <miscadmin.h>
-#include "access/heapam.h" /* XXX to support hacks below */
-#include "access/htup.h"
#include "catalog/catalog.h"
#include "catalog/heap.h"
-#include "storage/bufpage.h"
-#include "storage/buf.h" /* XXX for InvalidBuffer */
-#include "storage/ipc.h"
#include "storage/sinval.h"
#include "utils/catcache.h"
#include "utils/inval.h"
-#include "utils/rel.h"
#include "utils/relcache.h"
#include "catalog/catname.h" /* XXX to support hacks below */
-#include "utils/syscache.h" /* XXX to support the hacks below */
static InvalidationEntry InvalidationEntryAllocate(uint16 size);
static void LocalInvalidInvalidate(LocalInvalid invalid, void (*function) ());
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index cb99900ea6a6abbf1338311273f0a911fd505f38..61d96bc2f9d99ba8c9e47913a526642a783e1a48 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.28 1999/07/15 15:20:22 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/lsyscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
*
* NOTES
* Eventually, the index information should go through here, too.
@@ -16,15 +16,9 @@
#include <string.h>
#include "postgres.h"
-#include "nodes/pg_list.h"
#include "utils/syscache.h"
#include "utils/lsyscache.h"
-#include "access/tupmacs.h"
-#include "utils/rel.h"
-#include "access/attnum.h"
-#include "access/heapam.h"
-#include "catalog/pg_amop.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_type.h"
diff --git a/src/backend/utils/cache/rel.c b/src/backend/utils/cache/rel.c
index f37a97b34f6abf9829fcec04007d43bf4336a5e7..340562f05d43d4dfb0f754dcf02b23c106a8657e 100644
--- a/src/backend/utils/cache/rel.c
+++ b/src/backend/utils/cache/rel.c
@@ -7,18 +7,14 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.5 1999/05/25 16:12:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/rel.c,v 1.6 1999/07/15 22:40:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
/* #define RELREFDEBUG 1 */
#include "postgres.h"
-#include "miscadmin.h"
#include "access/istrat.h"
-#include "access/tupdesc.h"
-#include "utils/rel.h"
-#include "storage/fd.h"
/*
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 7184f76985e825a218230417c43d22fe629b44df..b2bfdf14f3a76452ebda2261d640e1ac3cc293c7 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.63 1999/07/15 15:20:23 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.64 1999/07/15 22:40:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,43 +40,24 @@
#include "access/genam.h"
#include "access/heapam.h"
-#include "access/htup.h"
#include "access/istrat.h"
-#include "access/itup.h"
-#include "access/skey.h"
-#include "access/tupdesc.h"
-#include "access/tupmacs.h"
-#include "access/xact.h"
#include "catalog/catalog.h"
#include "catalog/catname.h"
#include "catalog/index.h"
#include "catalog/indexing.h"
-#include "catalog/pg_aggregate.h"
#include "catalog/pg_attrdef.h"
-#include "catalog/pg_attribute.h"
-#include "catalog/pg_index.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
#include "catalog/pg_log.h"
#include "catalog/pg_relcheck.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_type.h"
#include "catalog/pg_variable.h"
-#include "fmgr.h"
#include "lib/hasht.h"
#include "miscadmin.h"
-#include "storage/buf.h"
-#include "storage/bufmgr.h"
-#include "storage/fd.h" /* for SEEK_ */
-#include "storage/lmgr.h"
#include "storage/smgr.h"
#include "utils/builtins.h"
#include "utils/catcache.h"
-#include "utils/hsearch.h"
-#include "utils/memutils.h"
-#include "utils/rel.h"
#include "utils/relcache.h"
-#include "utils/syscache.h"
static void RelationFlushRelation(Relation *relationPtr,
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index d302a33d85e2dbe2001b6a27e18a6a3a29fb7344..fa57b86daf646820fda32aa68a7aba0f91bbcab9 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.28 1999/07/07 16:09:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/syscache.c,v 1.29 1999/07/15 22:40:04 momjian Exp $
*
* NOTES
* These routines allow the parser/planner/executor to perform
@@ -20,7 +20,6 @@
#include "postgres.h"
#include "access/heapam.h"
-#include "access/htup.h"
#include "catalog/catname.h"
#include "utils/catcache.h"
#include <string.h>
@@ -30,9 +29,7 @@
* hardwired attribute information comes from system catalog files.
* ----------------
*/
-#include "catalog/pg_am.h"
#include "catalog/pg_amop.h"
-#include "catalog/pg_attribute.h"
#include "catalog/pg_group.h"
#include "catalog/pg_index.h"
#include "catalog/pg_inherits.h"
@@ -40,12 +37,10 @@
#include "catalog/pg_opclass.h"
#include "catalog/pg_operator.h"
#include "catalog/pg_proc.h"
-#include "catalog/pg_class.h"
#include "catalog/pg_type.h"
#include "catalog/pg_rewrite.h"
#include "catalog/pg_aggregate.h"
#include "catalog/pg_shadow.h"
-#include "storage/large_object.h"
#include "catalog/pg_listener.h"
extern bool AMI_OVERRIDE; /* XXX style */
diff --git a/src/backend/utils/cache/temprel.c b/src/backend/utils/cache/temprel.c
index 0d817ec012ef2a9ac284bda6f31fca0ae90b6c17..9dfe2289d9fbba2da81fedab358ab6ecfe7b9ee0 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.7 1999/07/15 15:20:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/Attic/temprel.c,v 1.8 1999/07/15 22:40:04 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -26,15 +26,10 @@
#include <string.h>
#include "postgres.h"
-#include "miscadmin.h"
-#include "nodes/pg_list.h"
#include "utils/temprel.h"
-#include "access/xact.h"
-#include "access/htup.h"
#include "access/heapam.h"
#include "catalog/heap.h"
#include "catalog/index.h"
-#include "catalog/pg_class.h"
GlobalMemory CacheCxt;
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 794b59bd7b2aa01a9444b24e139a2d900e308268..0bb6785d62dad19a6a941e3d0763f72894663d54 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.13 1999/02/13 23:19:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.14 1999/07/15 22:40:05 momjian Exp $
*
* NOTE
* This should eventually work with elog(), dlog(), etc.
@@ -18,7 +18,6 @@
#include <unistd.h>
#include "postgres.h" /* where the declaration goes */
-#include "utils/module.h"
#include "utils/exc.h"
#include "utils/trace.h"
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index b5cf429e7f1d1acff02b76f31d62c65520645b1a..566a11aca83b19da3f006452111b112c46467d77 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.27 1999/07/15 15:20:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.28 1999/07/15 22:40:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,17 +18,12 @@
#include "postgres.h"
-#include "config.h" /* for MAXPATHLEN */
-#include "fmgr.h" /* generated by Gen_fmgrtab.sh */
-#include "utils/dynamic_loader.h"
#include "utils/builtins.h"
#include "access/heapam.h"
-#include "nodes/pg_list.h"
#include "dynloader.h"
#ifdef __ultrix
-#include <dl.h>
#endif
#include "catalog/catname.h"
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index 8658da21a4ee35a2fe88e7665733bbac496cb92b..fa3e2a6fd234872d1fe0c8aee8e8e3b97ed0d91b 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.29 1999/07/15 15:20:30 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/fmgr/fmgr.c,v 1.30 1999/07/15 22:40:07 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -18,18 +18,14 @@
#include "postgres.h"
/* these 2 files are generated by Gen_fmgrtab.sh; contain the declarations */
-#include "fmgr.h"
#include "utils/fmgrtab.h"
-#include "nodes/pg_list.h"
#include "catalog/pg_proc.h"
#include "catalog/pg_language.h"
#include "utils/syscache.h"
-#include "nodes/params.h"
#include "utils/builtins.h"
-#include "nodes/parsenodes.h"
#include "commands/trigger.h"
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 1ef5a00fe45449a7513d8ba3f6fbb09cd415a72b..97dee13053e2b7ecea71b7d59259b95c7e3e31d3 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.31 1999/07/15 15:20:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.32 1999/07/15 22:40:08 momjian Exp $
*
* NOTES
* Globals used all over the place should be declared here and not
@@ -27,9 +27,6 @@
#include "miscadmin.h" /* where the declarations go */
#include <storage/backendid.h>
-#include "access/heapam.h"
-#include "storage/sinval.h"
-#include "storage/sinvaladt.h"
#include "storage/lmgr.h"
#include "libpq/pqcomm.h"
#include "catalog/catname.h"
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 53e98f3211f7ca3014013bba74bab8c7b9a45ce7..55a6905707ec8cc886f305ba79d438ee310f4269 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.30 1999/07/15 15:20:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.31 1999/07/15 22:40:09 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,19 +23,13 @@
#include "postgres.h"
-#include "utils/portal.h" /* for EnablePortalManager, etc. */
-#include "utils/exc.h" /* for EnableExceptionHandling, etc. */
-#include "utils/builtins.h"
#include "miscadmin.h" /* where the declarations go */
#include "catalog/catname.h"
#include "catalog/pg_shadow.h"
-#include "catalog/pg_proc.h"
#include "utils/syscache.h"
-#include "storage/fd.h" /* for O_ */
-#include "storage/ipc.h" /* for proc_exit */
/*
* EnableAbortEnvVarName
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 6a304ec3d1f1553a5065e2677642ab326e299413..92532c9bad1e087f0e797ce6980e443364353fe4 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.41 1999/07/15 15:20:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.42 1999/07/15 22:40:09 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -37,34 +37,24 @@
#include "postgres.h"
#include "version.h"
-#include <storage/ipc.h>
#include <storage/backendid.h>
-#include <storage/buf_internals.h>
#include <storage/smgr.h>
#include <storage/proc.h>
#include <utils/relcache.h>
#include "access/heapam.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h" /* XXX dependency problem */
#include "utils/syscache.h"
#include "storage/bufpage.h" /* for page layout, for
* InitMyDatabaseInfo() */
#include "storage/sinval.h"
-#include "storage/sinvaladt.h"
-#include "storage/lmgr.h"
#include "miscadmin.h" /* for global decls */
#include "utils/portal.h" /* for EnablePortalManager, etc. */
-#include "utils/exc.h" /* for EnableExceptionHandling, etc. */
-#include "fmgr.h" /* for EnableDynamicFunctionManager, etc. */
#include "utils/inval.h"
#include "catalog/catname.h"
#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
#endif
#include "libpq/libpq.h"
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 607dfcf46a31870f48c7fbd1807cab7180bd5f56..397cc766fc4d7a0e3d3d5d1c3f4eb32f33aa6cc6 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.25 1999/07/15 15:20:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.26 1999/07/15 22:40:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,20 +19,12 @@
#include "postgres.h"
-#include "access/heapam.h"
-#include "access/transam.h"
#include "access/xact.h"
-#include "catalog/catname.h"
#include "catalog/pg_database.h"
-#include "fmgr.h"
#include "miscadmin.h"
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-#include "utils/builtins.h"
#include "utils/syscache.h"
#ifdef MULTIBYTE
-#include "mb/pg_wchar.h"
#endif
#ifdef NOT_USED
diff --git a/src/backend/utils/misc/trace.c b/src/backend/utils/misc/trace.c
index 9676ca570a0c13a77b27be7d0138ed8617fa58a7..229e373382c13585d0c5cc154b4946774c74d05e 100644
--- a/src/backend/utils/misc/trace.c
+++ b/src/backend/utils/misc/trace.c
@@ -26,7 +26,6 @@
#include "postgres.h"
#include "miscadmin.h"
#include "utils/trace.h"
-#include "libpq/pqsignal.h"
#ifdef USE_SYSLOG
/*
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 1060f7b6def4429b6a95027765165d22e0d04197..5f8e4b4def63d12478db4a0364837d68db43758a 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.16 1999/05/25 16:12:51 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/aset.c,v 1.17 1999/07/15 22:40:12 momjian Exp $
*
* NOTE:
* This is a new (Feb. 05, 1999) implementation of the allocation set
@@ -23,10 +23,8 @@
*/
#include <stdio.h>
#include "postgres.h"
-#include "utils/excid.h" /* for ExhaustedMemory */
#include "utils/memutils.h" /* where funnction declarations go */
#ifndef HAVE_MEMMOVE
-#include <regex/utils.h>
#else
#include <string.h>
#endif
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 8143bc2c3e7a1b59a63e35d5e134d5e1721429c1..c3d272029b686543397633d1d791e2e3582fa22d 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.15 1999/07/15 15:20:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/mcxt.c,v 1.16 1999/07/15 22:40:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -15,12 +15,10 @@
#include "postgres.h"
-#include "utils/memutils.h"
#include "utils/module.h"
#include "utils/excid.h"
#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 55512b1c950bf31cae12f01371903a87e0234d9a..a5768237152aac5902f6c1f61b7a9d6d17260508 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.24 1999/07/15 15:20:39 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.25 1999/07/15 22:40:13 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -80,13 +80,7 @@
#include "lib/hasht.h"
#include "utils/module.h"
-#include "utils/excid.h" /* for Unimplemented */
-#include "utils/hsearch.h"
-#include "nodes/memnodes.h"
-#include "nodes/nodes.h"
-#include "nodes/pg_list.h"
-#include "nodes/execnodes.h" /* for EState */
#include "utils/portal.h"
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index ae10049b96115598120a90f781a28ec09b0f3b30..2b349f36866784c70efc103cacaa15e4c4cabebc 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.16 1999/07/10 18:21:59 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.17 1999/07/15 22:40:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,13 +17,8 @@
#include "postgres.h"
-#include "storage/buf.h"
-#include "access/skey.h"
#include "access/heapam.h"
-#include "access/htup.h"
-#include "utils/rel.h"
-#include "utils/psort.h"
#include "utils/lselect.h"
/*
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index d26785a9405e663c98259abb1069e7f5f6860dba..b0c6db7717774f6decf8f4925502a373d057dd03 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -4,7 +4,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
- * $Id: psort.c,v 1.53 1999/05/25 22:42:22 momjian Exp $
+ * $Id: psort.c,v 1.54 1999/07/15 22:40:14 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -40,19 +40,9 @@
#include "miscadmin.h"
#include "access/heapam.h"
-#include "access/htup.h"
-#include "access/relscan.h"
-#include "access/skey.h"
#include "executor/execdebug.h"
#include "executor/executor.h"
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-#include "storage/buf.h"
-#include "storage/fd.h"
-#include "utils/lselect.h"
-#include "utils/portal.h" /* for {Start,End}PortalAllocMode */
#include "utils/psort.h"
-#include "utils/rel.h"
static bool createfirstrun(Sort *node);
static bool createrun(Sort *node, BufFile *file);
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index b89706638a922b5b025bb29a1047eed5ea36deb3..3c2a9c71e8c4046e0b1bdc1630f4a1a35ff4aa82 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.30 1999/07/15 15:20:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/time/tqual.c,v 1.31 1999/07/15 22:40:15 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -16,10 +16,6 @@
#include "postgres.h"
-#include "access/htup.h"
-#include "access/xact.h"
-#include "storage/bufmgr.h"
-#include "access/transam.h"
#include "utils/tqual.h"
extern bool PostgresIsInitialized;
diff --git a/src/tools/pginclude/pgfixinclude b/src/tools/pginclude/pgfixinclude
index f48c96a536b0ea24f6ea96fd0adc55a40415427f..b3ebb2df4263de46422dee2aecbd8654d57f8400 100755
--- a/src/tools/pginclude/pgfixinclude
+++ b/src/tools/pginclude/pgfixinclude
@@ -3,15 +3,15 @@ trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15
find . \( -name CVS -a -prune \) -o -type f -print |
while read FILE
do
- cat /tmp/$$a | grep "^#include" |
+ cat "$FILE" | grep "^#include" |
sed 's/^#include[ ]*[<"]\([^>"]*\).*$/\1/g' |
while read INCLUDE
do
if [ -s /usr/include/"$INCLUDE" ]
then cat "$FILE" |
- sed 's/^#include[ ]*[<"]'"$INCLUDE"'[>"]$/#include <'"$INCLUDE"'>/g' >/tmp/$$
+ sed 's;^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]$;#include <'"$INCLUDE"'>;g' >/tmp/$$
else cat "$FILE" |
- sed 's/^#include[ ]*[<"]'"$INCLUDE"'[>"]$/#include "'"$INCLUDE"'"/g' >/tmp/$$
+ sed 's;^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]$;#include "'"$INCLUDE"'";g' >/tmp/$$
fi
cat /tmp/$$ > "$FILE"
done
diff --git a/src/tools/pginclude/pgnoinclude b/src/tools/pginclude/pgnoinclude
index 5fbf553a11ea3be8421660c81970241f2ae67f6e..35f191fa6a27b586e5b896852dad88ee0d62bd65 100755
--- a/src/tools/pginclude/pgnoinclude
+++ b/src/tools/pginclude/pgnoinclude
@@ -36,8 +36,14 @@ do
if [ "$?" -eq 0 ]
then echo "$FILE $INCLUDE"
if [ "$IS_INCLUDE" = "N" ]
- then grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' $FILE >/tmp/$$b
+ then grep -v '^#include[ ][ ]*[<"]'"$INCLUDE"'[>"]' "$FILE" >/tmp/$$b
mv /tmp/$$b "$FILE"
+ # reload after #include removal
+ if [ "$IS_INCLUDE" = "Y" ]
+ then cat "$FILE" | grep -v "^#if" | grep -v "^#else" |
+ grep -v "^#endif" | sed 's/->[a-zA-Z0-9_\.]*//g' >/tmp/$$a
+ else cat "$FILE" >/tmp/$$a
+ fi
fi
if [ "$1" = "-v" ]
then cat /tmp/$$