diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 3f1f7b8674c37db7284907f274133ce426ef5181..4761dfc83f6a2164a690e6d175f23cdca7742cb4 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -11,17 +11,21 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <stdio.h>
+#include <time.h>
+#include <sys/types.h>
+#include <string.h>
 
+#include "postgres.h"
  
 #include "catalog/pg_attribute.h"
 #include "access/attnum.h"
+#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "access/tupdesc.h"  
 #include "storage/fd.h"  
 #include "catalog/pg_am.h"
 #include "catalog/pg_class.h"
-#include "nodes/nodes.h" 
 #include "rewrite/prs2lock.h"
 #include "access/skey.h"
 #include "access/strat.h"
@@ -35,12 +39,12 @@
 #include "storage/itemid.h"
 #include "storage/item.h"
 #include "storage/buf.h"
+#include "storage/page.h"
 #include "storage/bufpage.h"
 #include "access/gist.h"
 
 #include "access/funcindex.h"
 
-#include <time.h>
 #include "utils/nabstime.h"
 #include "access/htup.h"
 
@@ -51,13 +55,15 @@
 
 #include "nodes/params.h"
 #include "access/sdir.h"
+#include "storage/ipc.h"
 #include "executor/hashjoin.h"
+#include "utils/fcache.h"
 #include "nodes/primnodes.h"
+#include "utils/memutils.h"
+#include "lib/fstack.h"
 #include "nodes/memnodes.h"  
 #include "nodes/execnodes.h"
 
-#include <stdio.h>
-#include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
 #include "catalog/pg_index.h"
@@ -84,7 +90,6 @@
 
 #include "access/genam.h"
 
-#include <string.h>
 #ifndef HAVE_MEMMOVE
 # include "regex/utils.h"
 #endif
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 1392ea3a1ca94075cf1e267f4986a0744866e79d..7abc2ca5c4cc22badf3021ab6424dd90ed401930 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -11,10 +11,14 @@
  *-------------------------------------------------------------------------
  */
 
+#include <stdio.h>
+#include <time.h>
+
 #include "postgres.h"
 
 #include "catalog/pg_attribute.h"
 #include "access/attnum.h"
+#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "access/tupdesc.h"
 #include "storage/fd.h"
@@ -29,7 +33,6 @@
 #include "storage/block.h"
 #include "storage/off.h"
 #include "storage/itemptr.h"
-#include <time.h>
 #include "utils/nabstime.h"
 #include "access/htup.h"
  
@@ -39,6 +42,7 @@
  
 #include "storage/itemid.h"
 #include "storage/item.h" 
+#include "storage/page.h"
 #include "storage/bufpage.h"
 
 #include "access/sdir.h"
@@ -57,7 +61,6 @@
 # include <string.h>
 #endif
 
-#include <stdio.h>
 #include "storage/ipc.h"
 #include "storage/bufmgr.h"
 
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 2ebba9bb5f84c2e130b7191d2a08358219ce0c65..262504e1651ce97622e1f80033797962f99b4ea8 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -10,10 +10,14 @@
  *-------------------------------------------------------------------------
  */
 
+#include <stdio.h>
+#include <time.h>
+
 #include "postgres.h"
 
 #include "catalog/pg_attribute.h"
 #include "access/attnum.h" 
+#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "access/tupdesc.h"
 #include "storage/fd.h"  
@@ -28,7 +32,6 @@
 #include "storage/block.h"
 #include "storage/off.h"
 #include "storage/itemptr.h"
-#include <time.h>
 #include "utils/nabstime.h"
 #include "access/htup.h"
  
@@ -38,6 +41,7 @@
  
 #include "storage/itemid.h"
 #include "storage/item.h"
+#include "storage/page.h"
 #include "storage/bufpage.h"
 #include "access/gist.h"
 
@@ -46,6 +50,7 @@
 #include "access/sdir.h"
 #include "access/genam.h"
 
+#include <sys/types.h>
 #include "storage/ipc.h"
 #include "storage/spin.h"
 #include "utils/hsearch.h"
@@ -65,7 +70,6 @@
 #include "storage/off.h"  
 #include "access/rtree.h"
 
-#include <stdio.h>
 #include "storage/bufmgr.h"
 
 #include "access/giststrat.h"
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index c6212edf109c0650d76828d4cca75eba603d6e50..d2c97ccbdeeb95345db318f9352b7ea5133520ee 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -16,6 +16,7 @@
  
 #include "catalog/pg_attribute.h"
 #include "access/attnum.h"
+#include "nodes/nodes.h"
 #include "nodes/pg_list.h"
 #include "access/tupdesc.h"
 #include "storage/fd.h"
@@ -34,6 +35,7 @@
 #include "storage/itemid.h"
 #include "storage/item.h"  
 #include "storage/buf.h" 
+#include "storage/page.h"
 #include "storage/bufpage.h"
 #include "access/gist.h"