diff --git a/src/backend/access/gist/Makefile b/src/backend/access/gist/Makefile
index b87c0e86384751d8d4887e1ee971ec161f60aa65..c0f811a23715767ad14ce85915c154619009233d 100644
--- a/src/backend/access/gist/Makefile
+++ b/src/backend/access/gist/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for access/gist
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.2 1996/11/03 09:06:47 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.3 1996/11/05 08:18:42 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../../port/$(PORTNAME) \
+INCLUDE_OPT = -I../.. \
+              -I../../port/$(PORTNAME) \
               -I../../../include
 
 CFLAGS+=$(INCLUDE_OPT)
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index ad817f950d80baf1f34b16699d695b0d96537120..fa29a961773e8dfc837291efbb0edaa7e9b5e01b 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -11,23 +11,24 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
-
-#include "fmgr.h"
-#include "access/genam.h"
-#include "access/gist.h"
-#include "access/gistscan.h"
-#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/palloc.h"
-#include "utils/syscache.h"
+#include <postgres.h>
+
+#include <fmgr.h>
+#include <access/genam.h>
+#include <access/gist.h>
+#include <access/gistscan.h>
+#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>
 
 #ifndef HAVE_MEMMOVE
-# include "regex/utils.h"
+# include <regex/utils.h>
+#else
+# include <string.h>
 #endif
 
 /* non-export function prototypes */
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 01c93da00c8b07432e02331b515436d9ea3cd5f1..1a9a01a6a8e1ed58a58155025feac9925c3dd14f 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -11,22 +11,18 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <time.h>
+#include <postgres.h>
 
-#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 "utils/palloc.h"
-#include "storage/bufmgr.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"
+# 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 bab14bac69ba4b52f78fbced648b83da579c0a9b..0f3ce3b59d92a5534b8ce45d75b4ddb28eb0584c 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -10,32 +10,21 @@
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-#include <time.h>
+#include <postgres.h>
 
-#include "postgres.h"
-
-#include "access/relscan.h"
-#include "access/gist.h"
-#include "access/genam.h"
-#include "storage/lmgr.h" 
+#include <access/gist.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"
+# include <regex/utils.h>
 #else
 # include <string.h>
 #endif
 
-#include "utils/palloc.h"
-
-#include "storage/block.h"
-#include "storage/off.h"  
-#include "access/rtree.h"
-
-#include "storage/bufmgr.h"
-
-#include "access/giststrat.h"
-
 /* routines defined and used here */
 static void gistregscan(IndexScanDesc s);
 static void gistdropscan(IndexScanDesc s);
diff --git a/src/backend/access/gist/giststrat.c b/src/backend/access/gist/giststrat.c
index d4d9523eaa5169826b465b4a4b7cc16705579d48..fd9ab849cbe57506627c2b80c215f46e42c62259 100644
--- a/src/backend/access/gist/giststrat.c
+++ b/src/backend/access/gist/giststrat.c
@@ -12,10 +12,10 @@
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
  
-#include "access/gist.h"
-#include "access/istrat.h"
+#include <access/gist.h>
+#include <access/istrat.h>
 
 /*
  *  Note:  negate, commute, and negatecommute all assume that operators are