4 files changed, 20 insertions, 44 deletions
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 90817742ecc..4e103de8694 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -10,30 +10,21 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/rel.h"
-#include "utils/excid.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
+#include "access/itup.h"
 #include "access/gist.h"
-#include "access/gistscan.h"
 #include "access/funcindex.h"
-#include "access/tupdesc.h"
-
-#include "nodes/execnodes.h"
-#include "nodes/plannodes.h"
-
-#include "executor/executor.h"
+#include "access/htup.h"
 #include "executor/tuptable.h"
+#include "access/relscan.h"
+#include "nodes/execnodes.h"
+#include "storage/bufmgr.h"
+#include "catalog/pg_index.h"
+#include "utils/syscache.h"
 
-#include "catalog/index.h"
 
 /* non-export function prototypes */
 static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index d60b0a1194e..290638eea13 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -10,22 +10,16 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/rel.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
-#include "access/iqual.h"
-#include "access/gist.h"
+#include "access/htup.h"
+#include "access/relscan.h"
+#include "storage/bufpage.h"
 #include "access/sdir.h"
-
-#include "executor/execdebug.h"
+#include "access/itup.h"
+#include "access/gist.h"
 
 static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, 
 				 ScanDirection dir);
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index fd9f8e1a5fc..2889369bd4e 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -9,19 +9,13 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
+#include "postgres.h"
 
-#include "utils/elog.h"
-#include "utils/palloc.h"
 #include "utils/rel.h"
-
-#include "access/heapam.h"
-#include "access/genam.h"
+#include "access/htup.h"
+#include "access/relscan.h"
 #include "access/gist.h"
-#include "access/giststrat.h"
 
 /* routines defined and used here */
 static void gistregscan(IndexScanDesc s);
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index 1dea1946d9b..440fdc2ef19 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -11,14 +11,11 @@
  *
  *-------------------------------------------------------------------------
  */
-#include "c.h"
 
+#include "postgres.h"
 #include "utils/rel.h"
-
-#include "storage/bufmgr.h"
-#include "storage/bufpage.h"
-
-#include "access/istrat.h"
+#include "storage/off.h"
+#include "storage/block.h"
 #include "access/gist.h"
 
 /*