diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index d8e10db50cb392b3b87daf63354ccbec49ea87d0..6b6b2dc8d3987cb7716b6ea23cac27df34a35403 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -56,6 +56,8 @@
 #include "nodes/memnodes.h"  
 #include "nodes/execnodes.h"
 
+#include <stdio.h>
+#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "catalog/pg_index.h"
@@ -66,11 +68,31 @@
 #include "nodes/parsenodes.h"
 #include "tcop/dest.h"  
 #include "executor/execdesc.h"
-#include <stdio.h>
 #include "executor/executor.h"
 
 #include "access/heapam.h"
 
+#include "storage/spin.h"
+#include "utils/hsearch.h"
+#include "storage/shmem.h"
+#include "storage/lock.h"
+#include "storage/lmgr.h"
+
+#include "utils/palloc.h"
+
+#include "catalog/index.h"
+
+#include "access/genam.h"
+
+#include <string.h>
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#endif
+
+#include "access/gistscan.h"
+
+#include "fmgr.h"
+
 /* non-export function prototypes */
 static InsertIndexResult gistdoinsert(Relation r, IndexTuple itup,
 				    GISTSTATE *GISTstate);
@@ -404,11 +426,10 @@ gistdoinsert(Relation r,
 	     IndexTuple itup, /* itup contains compressed entry */
 	     GISTSTATE *giststate)
 {
-    char *datum, *newdatum;
-    GISTENTRY entry, tmpdentry;
+    GISTENTRY tmpdentry;
     InsertIndexResult res;
     OffsetNumber l;
-    GISTSTACK *stack, *tmpstk;
+    GISTSTACK *stack;
     Buffer buffer;
     BlockNumber blk;
     Page page;
@@ -519,7 +540,7 @@ gistAdjustKeys(Relation r,
     Buffer b;
     bool result;
     bytea *evec;
-    GISTENTRY centry, *ev0p, *ev1p, *dentryp;
+    GISTENTRY centry, *ev0p, *ev1p;
     int size, datumsize; 
     IndexTuple tid;
     
@@ -648,7 +669,6 @@ gistSplit(Relation r,
     bool *decompvec;
     IndexTuple item_1;
     GISTENTRY tmpdentry, tmpentry;
-    char *datum;
     
     isnull = (char *) palloc(r->rd_rel->relnatts);
     for (blank = 0; blank < r->rd_rel->relnatts; blank++)
@@ -850,9 +870,6 @@ gistintinsert(Relation r,
 	      IndexTuple rtup, /* entry for new page */
 	      GISTSTATE *giststate)
 {
-    IndexTuple old;
-    Buffer b;
-    Page p;
     ItemPointerData ltid;
 
     if (stk == (GISTSTACK *) NULL) {
@@ -877,10 +894,6 @@ gistentryinserttwo(Relation r, GISTSTACK *stk, IndexTuple ltup,
     Buffer b;
     Page p;
     InsertIndexResult res;
-    OffsetNumber off;
-    bytea *evec;
-    char *datum;
-    int size;
     GISTENTRY tmpentry;
     IndexTuple newtup;
 
@@ -919,9 +932,6 @@ gistentryinsert(Relation r, GISTSTACK *stk, IndexTuple tup,
     Buffer b;
     Page p;
     InsertIndexResult res;
-    bytea *evec;
-    char *datum;
-    int size;
     OffsetNumber off;
     GISTENTRY tmpentry;
     IndexTuple newtup;
@@ -1009,9 +1019,9 @@ gistchoose(Relation r, Page p, IndexTuple it, /* it has compressed entry */
 {
     OffsetNumber maxoff;
     OffsetNumber i;
-    char *ud, *id;
+    char *id;
     char *datum;
-    float usize, dsize;
+    float usize;
     OffsetNumber which;
     float which_grow;
     GISTENTRY entry, identry;
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 819d2ec4f06e5e05a23408595c9fb1a357c11233..1392ea3a1ca94075cf1e267f4986a0744866e79d 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -47,6 +47,20 @@
  
 #include "access/gist.h"
 
+#include "executor/execdebug.h"
+
+#include "utils/palloc.h"
+
+#ifndef HAVE_MEMMOVE
+# include "regex/utils.h"
+#else
+# include <string.h>
+#endif
+
+#include <stdio.h>
+#include "storage/ipc.h"
+#include "storage/bufmgr.h"
+
 static OffsetNumber gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, 
 				 ScanDirection dir);
 static RetrieveIndexResult gistscancache(IndexScanDesc s, ScanDirection dir);
@@ -306,7 +320,6 @@ gistfindnext(IndexScanDesc s, Page p, OffsetNumber n, ScanDirection dir)
     char *it;
     GISTPageOpaque po;
     GISTScanOpaque so;
-    GISTENTRY de;
     GISTSTATE *giststate;
 
     maxoff = PageGetMaxOffsetNumber(p);