diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile
index f36a7fcd3265491fd868e3a11fcf86870faf1d46..f5896bd266dcd0d7d56339ed44068b73822dc633 100644
--- a/src/backend/access/rtree/Makefile
+++ b/src/backend/access/rtree/Makefile
@@ -4,14 +4,15 @@
 #    Makefile for access/rtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.2 1996/10/31 08:52:50 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.3 1996/11/05 10:54:15 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/rtree/rtget.c b/src/backend/access/rtree/rtget.c
index e70f8ee368ec9533b1a1999f42c97291f1696f21..a21f29f67ce49f3009e3e2ca8b8bd6c22a00db4d 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,29 +7,25 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.5 1996/11/03 22:58:03 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.6 1996/11/05 10:54:16 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-#include <time.h>
-
-#include "postgres.h"
- 
-#include "storage/bufmgr.h"
-
-#include "access/sdir.h"
- 
-#include "access/htup.h"
-#include "utils/palloc.h"
-#include "access/relscan.h"
-#include "access/itup.h"
-#include "access/iqual.h"
+#include <postgres.h>
  
-#include "access/rtree.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
 
-#include "storage/bufpage.h"
 
 static OffsetNumber findnext(IndexScanDesc s, Page p, OffsetNumber n,
 			     ScanDirection dir);
diff --git a/src/backend/access/rtree/rtproc.c b/src/backend/access/rtree/rtproc.c
index 4d9f489818aabf78134470e2d6a0ebfa8d747315..fdcb95ca1e9ad64bdae9ccfea85a0e5db2eb6dc8 100644
--- a/src/backend/access/rtree/rtproc.c
+++ b/src/backend/access/rtree/rtproc.c
@@ -7,17 +7,19 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.3 1996/10/23 07:39:23 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtproc.c,v 1.4 1996/11/05 10:54:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
+#include <postgres.h>
 
-#include "postgres.h"
-
-#include "utils/geo-decls.h"
-#include "utils/palloc.h"
+#include <utils/geo-decls.h>
+#ifndef HAVE_MEMMOVE
+# include <regex/utils.h>
+#else
+# include <string.h>
+#endif
 
 BOX
 *rt_box_union(BOX *a, BOX *b)
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index 21ee69243dd0d226047b438c27f05e9bd3003535..6dfe3b7f37fc936f1bb88ca1113896cdffc9afb0 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,34 +7,30 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.8 1996/11/03 22:58:06 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.9 1996/11/05 10:54:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <stdio.h>
-
-#include "postgres.h"
-#include "access/genam.h"
-
-#include "utils/palloc.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 "storage/bufpage.h"
+#include <postgres.h>
+
+#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
 
 typedef struct SPLITVEC {
     OffsetNumber	*spl_left;
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index d0b02db08861557f04adcba81abc894e5799d958..b8adff5affef86b05c92dafdc4bd108122e44ed7 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,26 +7,25 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.7 1996/11/03 22:58:09 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.8 1996/11/05 10:54:19 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include <string.h>
-
-#include "postgres.h"
- 
-#include "storage/bufmgr.h"
-#include "access/genam.h"
+#include <postgres.h>
  
-#include "utils/palloc.h"
-#include "access/htup.h"
-#include "storage/lmgr.h"
-#include "storage/bufpage.h"
-#include <stdio.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
 
-#include "access/rtree.h"
-#include "access/rtstrat.h"
  
 /* routines defined and used here */
 static void rtregscan(IndexScanDesc s);
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 868152a09a5eaf95be861fcf68c9c5169bd5cd90..5e8750dbbcec92ce4385556f5cb37b53cbafc7be 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,20 +7,16 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.4 1996/11/03 22:58:10 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.5 1996/11/05 10:54:20 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 
-#include "postgres.h"
+#include <postgres.h>
  
-#include "utils/rel.h"
-
-#include "storage/off.h"
-#include "storage/block.h"
-#include "access/rtree.h"
-
-#include "access/istrat.h"
+#include <utils/rel.h>
+#include <access/rtree.h>
+#include <access/istrat.h>
 
 /*
  *  Note:  negate, commute, and negatecommute all assume that operators are