Remove unused #includes in *.c files.

238 files changed, 18 insertions, 1239 deletions

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index b20ad6dc5c..f061ea4822 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -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 37c3ed3e5c..89cc2f1bba 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -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 fa7d745232..78386f9b7b 100644
--- a/src/backend/access/common/indexvalid.c
+++ b/src/backend/access/common/indexvalid.c
@@ -13,12 +13,8 @@
  */
 
 #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 bdab404eb0..4505e44023 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -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 f82d03b957..54f2ce7b06 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -14,7 +14,6 @@
 
 #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 9b18106633..88ed6d7976 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -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 bf2499fa05..2e905427d8 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 665bc83035..07dbd26947 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 d26387d828..2fe9222b2d 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 37f69f111d..5fed69343c 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -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 1624b0d61f..7f03a5cbc7 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -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 b84fb4632a..9ac56469e8 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -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 7a9fd70a0d..11ba3067b0 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -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 23c499a3b8..338d1c1555 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -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 e9b91ad2f1..4d95292b13 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -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 505cdd25d9..9677d65334 100644
--- a/src/backend/access/hash/hashstrat.c
+++ b/src/backend/access/hash/hashstrat.c
@@ -14,8 +14,6 @@
 
 #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 057514f800..de67c7311c 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -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 e09a0765f9..7ce99385f5 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -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 7cb5ce9316..9e280139e4 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -14,12 +14,8 @@
 
 #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 c831621322..645c49eb2c 100644
--- a/src/backend/access/heap/stats.c
+++ b/src/backend/access/heap/stats.c
@@ -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 7e5bda5007..52e96f5fa0 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -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 09d5c96d62..2409f7e4a2 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -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 70eee09649..f3997cf717 100644
--- a/src/backend/access/index/istrat.c
+++ b/src/backend/access/index/istrat.c
@@ -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 0eedff04de..4bebd72e16 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -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 8d00ddc7b7..8d08b4c952 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -14,17 +14,10 @@
 
 #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 5944004cea..5902ec782f 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -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 aa0b94ea8f..9dafafa52e 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -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 a33232df34..d9c3e96098 100644
--- a/src/backend/access/nbtree/nbtscan.c
+++ b/src/backend/access/nbtree/nbtscan.c
@@ -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 ee0ab47e72..5ab69bedb1 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -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 15e251b0d9..dcf573d6a7 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -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 add5c1cf75..4b426ecfa6 100644
--- a/src/backend/access/nbtree/nbtstrat.c
+++ b/src/backend/access/nbtree/nbtstrat.c
@@ -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 e0b180868f..76662a5893 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -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 4cdae456bf..1436eb378d 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -14,15 +14,10 @@
 
 #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 73efabe4b2..6bfeffce55 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -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 e4e138260c..4020f35361 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -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 70d293906e..7d4dfe7c98 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -14,15 +14,10 @@
 
 #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 bde896e871..2a5d1544cb 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -14,7 +14,6 @@
 
 #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 262627c411..7d9387c11b 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -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 d7b4993c00..86a6e9890e 100644
--- a/src/backend/access/transam/transsup.c
+++ b/src/backend/access/transam/transsup.c
@@ -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 692c8283b9..45c3c23b60 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -14,9 +14,6 @@
 
 #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 2ded6c624e..84e4896a03 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -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 aa1448cd92..76b20d7376 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -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 3683ec3d4c..efa1345184 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -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 02bdc94841..55a60bd999 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -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 c45614e5ca..2f3287c6c8 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -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 9447daf8c4..f1b3b1a32b 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -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 45ba6b925c..3d4502c81f 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -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 2d28b6423b..6d0a0fd663 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -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 70f4219fe8..d3d68714e5 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -14,16 +14,12 @@
 #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 eb86d0eda5..5a00356fe7 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -14,21 +14,15 @@
 #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 848c024bde..698804fde6 100644
--- a/src/backend/commands/_deadcode/version.c
+++ b/src/backend/commands/_deadcode/version.c
@@ -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 7d4f3985ff..cb0e3ac707 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -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 77eb945071..1039a5e562 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -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 47a34a3f44..88ddfc836c 100644
--- a/src/backend/commands/command.c
+++ b/src/backend/commands/command.c
@@ -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 7131d0fbe7..b691cdf8ac 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -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 ef363d05c4..c905552ee3 100644
--- a/src/backend/commands/creatinh.c
+++ b/src/backend/commands/creatinh.c
@@ -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 9f1b9d6640..29d7bae8d8 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -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 bf2cee106b..cdafc18044 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -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 a18cc40f36..a395137c47 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -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 75de29f838..84c540054b 100644
--- a/src/backend/commands/remove.c
+++ b/src/backend/commands/remove.c
@@ -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 98855b12d8..7db86005f1 100644
--- a/src/backend/commands/rename.c
+++ b/src/backend/commands/rename.c
@@ -14,31 +14,18 @@
 #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 a6f18e01d3..f8fbf5f570 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 a710888d7f..6107c4bd6f 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 988ebe357a..0f27fa9d78 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -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 897b7c6610..b5e91d4c64 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -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 89030077ba..61008087dc 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -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 84c8168b10..5f65e5f89f 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -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 51cc6c8fea..1bcd6ed529 100644
--- a/src/backend/executor/execFlatten.c
+++ b/src/backend/executor/execFlatten.c
@@ -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 12bc7ce3e2..1f243587c6 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -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 829fe1d1b3..8354599ce4 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -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 4ff5d4bbe8..05979c36a5 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -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 fca383b7f3..071805032d 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -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 0dfc88aca7..a336a2a1cf 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -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 e5f0b08259..3eae47d96e 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -15,23 +15,12 @@
 #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 44a14391b4..a8535b5a98 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 6afd0758ce..1438a4fa47 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -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 8f8fa503fc..04cac61d2b 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -20,10 +20,8 @@
 #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 543a3f1c54..8abe808afa 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -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 afd434aeb6..f12f71573c 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -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 8e3046a122..48064e6bcb 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -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 5ba52b1fc0..b875dd9926 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -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 03a5f2dad1..4553e16f55 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -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 cfaae5c1c5..40ff81817c 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -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 59fbfd23f3..fd6eb491ef 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -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 ef65a7afb5..6c88bbe85e 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 55b27b6d9a..7bda3a3fc5 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -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 89c824cf71..bb701c5571 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -7,11 +7,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#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 d872e70c50..d8000fc699 100644
--- a/src/backend/lib/bit.c
+++ b/src/backend/lib/bit.c
@@ -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 f4ad935ddc..6de004677e 100644
--- a/src/backend/lib/hasht.c
+++ b/src/backend/lib/hasht.c
@@ -15,7 +15,6 @@
 #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 342439d201..7e2b1d28c6 100644
--- a/src/backend/lib/lispsort.c
+++ b/src/backend/lib/lispsort.c
@@ -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 d1fb1045b2..5590cb7b2f 100644
--- a/src/backend/libpq/be-dumpdata.c
+++ b/src/backend/libpq/be-dumpdata.c
@@ -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 d10bb18c4c..29c4a5e677 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -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 e70a838593..5d3bfa817a 100644
--- a/src/backend/libpq/be-pqexec.c
+++ b/src/backend/libpq/be-pqexec.c
@@ -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 df0c0ac016..78ec48d0ee 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -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 7330d6e79e..24df4d0090 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -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 554bb2d762..73342fc389 100644
--- a/src/backend/libpq/password.c
+++ b/src/backend/libpq/password.c
@@ -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 08ceaf5d36..dc1f3cd463 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -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 ee8e7ad049..c16a483650 100644
--- a/src/backend/libpq/portalbuf.c
+++ b/src/backend/libpq/portalbuf.c
@@ -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 945da3cb60..1777662730 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -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 7e12954982..7afe669c69 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -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 d9ce537e5c..df3f35c8d1 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -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 1c5dc06c30..9225f2c8e5 100644
--- a/src/backend/libpq/util.c
+++ b/src/backend/libpq/util.c
@@ -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 a26a4be574..38917478ff 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -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 49e00e819a..166fd52d88 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -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 2661b34c40..06e49b964e 100644
--- a/src/backend/nodes/freefuncs.c
+++ b/src/backend/nodes/freefuncs.c
@@ -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 8d5cc0caaa..d5882bc162 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -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 85680400a7..26d8646a83 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -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 dd35c15aea..df81d71fa0 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -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 0e8c7e5073..704b9dcee9 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -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 b37e56f3f3..ab5edca684 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -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 43a633b9a7..de2cb95b21 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -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 0b4a0fa5b0..27b137187a 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -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 001dd8de28..01cb6a6241 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -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 ccee03b646..0d57ccaf6b 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -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 9b10a91952..c041e51e20 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -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 6429e827e8..4066a0dfcf 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -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 82083d934f..9b80f758b4 100644
--- a/src/backend/optimizer/geqo/geqo_mutation.c
+++ b/src/backend/optimizer/geqo/geqo_mutation.c
@@ -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 e8e55a4529..c253998e07 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -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 a54ad4871d..a14b6403c2 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -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 d1564cfaee..85562c9521 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -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 080cdb4674..63bd28c0a6 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -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 fbd2ff7803..df0d690a28 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -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 3ef2fbf050..c0b0b919c6 100644
--- a/src/backend/optimizer/geqo/geqo_recombination.c
+++ b/src/backend/optimizer/geqo/geqo_recombination.c
@@ -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 885926cedf..2f3aab2604 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -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 d846216e2c..0c1ed0777c 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -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 ecd1926107..00280efa58 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -14,10 +14,6 @@
 #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 8f01323fa1..e7c10ab850 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -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 5c4648ad91..8b507529b2 100644
--- a/src/backend/optimizer/path/hashutils.c
+++ b/src/backend/optimizer/path/hashutils.c
@@ -12,10 +12,7 @@
  *-------------------------------------------------------------------------
  */
 #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 5bf1600b4f..b8703d2e49 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -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 959322df8e..4e7bffb986 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -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 d071e55975..1f3e5d145c 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -13,10 +13,7 @@
  */
 #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 13098fa8d4..46ca7d8483 100644
--- a/src/backend/optimizer/path/mergeutils.c
+++ b/src/backend/optimizer/path/mergeutils.c
@@ -13,10 +13,7 @@
  */
 #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 1bcbc82c30..554da6c52d 100644
--- a/src/backend/optimizer/path/orindxpath.c
+++ b/src/backend/optimizer/path/orindxpath.c
@@ -13,11 +13,7 @@
  */
 #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 372bf66aaa..c5a560061a 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -13,13 +13,8 @@
  */
 #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 d5be641458..c4136aa75b 100644
--- a/src/backend/optimizer/path/prune.c
+++ b/src/backend/optimizer/path/prune.c
@@ -13,10 +13,7 @@
  */
 #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 e64db90848..d58e15a324 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -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 40bfaa7cf1..2f362005e3 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -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 bdc8cabdf2..c2beb677e6 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -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 0c568550ec..9d9e5345e5 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -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 f229d4642b..08db12a091 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -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 f9ae74973f..8d8cd96790 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -13,22 +13,11 @@
 #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 491b070622..c2978ed485 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -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 5ed257e659..1512abdf2f 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -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 283a43c25d..12c31e9557 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -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 26cc89b97a..6720ac0ab3 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -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 91fa77e743..cbfa1d2f31 100644
--- a/src/backend/optimizer/util/indexnode.c
+++ b/src/backend/optimizer/util/indexnode.c
@@ -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 fb9796721d..a61f92661f 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -13,11 +13,8 @@
  */
 #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 9fd350bd3f..07d0d7668e 100644
--- a/src/backend/optimizer/util/keys.c
+++ b/src/backend/optimizer/util/keys.c
@@ -12,13 +12,8 @@
  *-------------------------------------------------------------------------
  */
 #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 ebb864d681..8e5146c3ae 100644
--- a/src/backend/optimizer/util/ordering.c
+++ b/src/backend/optimizer/util/ordering.c
@@ -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 a53b7e4f57..5523f79a99 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -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 aa34b5ba98..b31191e854 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -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 7462fef6eb..010fdd9b4f 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -13,7 +13,6 @@
  */
 #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 4b98bc2917..0bfb7b095d 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -13,7 +13,6 @@
  */
 #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 0837a6d199..f78d069067 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -13,13 +13,8 @@
  */
 #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 f1740b90b5..733452a352 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -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 969bd04f94..d57cc1cd74 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -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 1b2ce117e7..e42f75891e 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -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 5e643b06fb..13e16e768a 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -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 11cca417e9..d4ee2ae728 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -14,14 +14,10 @@
 #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 257a0d7320..b550782968 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -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 5050cb2f1f..b3256c369c 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -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 70cc0104e7..bb0ee9dece 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -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 a697213b0e..85673eb407 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -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 6bc737baa8..5b5a22c413 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -13,15 +13,9 @@
  */
 #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 8984037aef..13ef16a7ce 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -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 88e8c0e0f8..caf5bea95f 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 8dc70c330b..b20ca4e874 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -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 0676cdd129..b08d660e9c 100644
--- a/src/backend/port/isinf.c
+++ b/src/backend/port/isinf.c
@@ -1,7 +1,6 @@
 /* $Id$ */
 
 #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 814f3f6e81..26d0e3216e 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>
diff --git a/src/backend/rewrite/locks.c b/src/backend/rewrite/locks.c
index f1065b9548..3d06966153 100644
--- a/src/backend/rewrite/locks.c
+++ b/src/backend/rewrite/locks.c
@@ -11,9 +11,6 @@
  *-------------------------------------------------------------------------
  */
 #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 49f029ecdc..55ac6abf4a 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -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 956f3da4e5..e08dd62e10 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -13,34 +13,23 @@
 #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 df5cbc86bc..02e21b528b 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -12,19 +12,11 @@
  */
 #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 3ce44c8f66..e9f208e80b 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -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 9c56a2bf31..4702d72d50 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -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 0e32b09756..b8c0b220f1 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -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 627bdc3cfd..e2e903d100 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -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 7956281fbf..9032deb903 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -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 797297f4fe..1765e1469a 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -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 ae8b2c4070..59c3fa0772 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -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 f0e49fdc70..7585bc348a 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -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 ec8a53831b..9bb37220e1 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -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 ad3297b748..4fecd8af9d 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -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 6e012560f4..27bf19316e 100644
--- a/src/backend/storage/ipc/spin.c
+++ b/src/backend/storage/ipc/spin.c
@@ -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 5bb5fa224e..f681071185 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -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 7e2b18489a..2201254016 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -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 bfa8ac3724..3aef11bd80 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -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 108ff0ee14..2d5da63e47 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -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 b777c7c474..901c2a9ea9 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -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 2a2adfc803..800636218c 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -13,9 +13,6 @@
  */
 #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 3dfea97e0e..29858c4750 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -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 e40d6d5544..0735707793 100644
--- a/src/backend/storage/smgr/mm.c
+++ b/src/backend/storage/smgr/mm.c
@@ -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 e2b3de58ad..a9fb019c0a 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -17,10 +17,7 @@
 #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 e2dd99fb53..d37789cb04 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -14,7 +14,6 @@
 #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 bc48405e13..98191cd614 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -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 822fcd15a3..ba35290c9b 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -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 6732477669..645828e382 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -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 b10baf92c7..94f32be246 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -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 82a00ee405..6f10701db6 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -14,7 +14,6 @@
  *-------------------------------------------------------------------------
  */
 #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 55dd18d16e..a99b0ae4fa 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -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 e2f66a8804..d0e76b7d21 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -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 2eb2608b8f..88ddeea028 100644
--- a/src/backend/utils/adt/geo_selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -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 8b5a16175a..66fd016c59 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -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 671e0e295a..b668dd3eed 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -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 16ba7a6407..c71f8ddcb8 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -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 9eba14fe12..315c1c142d 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -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 0256cf21a0..c756e13cd3 100644
--- a/src/backend/utils/adt/not_in.c
+++ b/src/backend/utils/adt/not_in.c
@@ -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 cb297fe457..c210c0000c 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -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 27ac5b31a9..c0f294e45c 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -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 c349bdd984..d837d99cae 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -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 b62d2f8555..bb0499b825 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -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 7f56ff1898..61238ca019 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -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 e70c8b53ed..c488ad62f5 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -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 5e7d9d5390..d7c6a75cf5 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -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 ec21d0b169..e7433bd78e 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -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 a9ae783b75..2b8546024a 100644
--- a/src/backend/utils/cache/fcache.c
+++ b/src/backend/utils/cache/fcache.c
@@ -13,24 +13,15 @@
  */
 #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 b78981f316..0fcdebaf3c 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -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 e18ff5084b..28560b80b0 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -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 e7f63a7d78..8f8f34005c 100644
--- a/src/backend/utils/cache/rel.c
+++ b/src/backend/utils/cache/rel.c
@@ -14,11 +14,7 @@
 /* #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 1520c22216..fd0cd22e01 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -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 94daa14b08..95788b3e3c 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -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 c180d5493a..fe68e8646b 100644
--- a/src/backend/utils/cache/temprel.c
+++ b/src/backend/utils/cache/temprel.c
@@ -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 d8baf67ac6..73df50cba6 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -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 79bc9f8f6e..35773c6753 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -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 b22ebbf57f..69d89b7cf8 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -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 973dc21347..39bd697a6e 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -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 7a9c015718..2d6730e054 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -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 a86d4f268a..dde9622f20 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -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 be39338107..f10d546d4a 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -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 9676ca570a..229e373382 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 7703731b5a..061f98dda7 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -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 e5b1c04da4..2203e37f02 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -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 cf179221e1..6890f1b8bd 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -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 965a48e3cd..e60a5d4aa3 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -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 783dd22ef4..c932345249 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -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 928d748d35..0476d72eca 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -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 f48c96a536..b3ebb2df42 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 5fbf553a11..35f191fa6a 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/$$