More of the same...clean Makefile, add include files

5 files changed, 42 insertions, 14 deletions

diff --git a/src/backend/access/rtree/Makefile b/src/backend/access/rtree/Makefile
index 6b88382a2e0..f36a7fcd326 100644
--- a/src/backend/access/rtree/Makefile
+++ b/src/backend/access/rtree/Makefile
@@ -4,16 +4,14 @@
 #    Makefile for access/rtree
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.1 1996/10/27 09:46:40 bryanh Exp $
+#    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.2 1996/10/31 08:52:50 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
 SRCDIR = ../../..
 include ../../../Makefile.global
 
-INCLUDE_OPT = -I../.. \
-              -I../../port/$(PORTNAME) \
-              -I../../include \
+INCLUDE_OPT = -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 a4469f102e4..aec1416f43e 100644
--- a/src/backend/access/rtree/rtget.c
+++ b/src/backend/access/rtree/rtget.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.3 1996/10/23 07:39:20 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtget.c,v 1.4 1996/10/31 08:52:51 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,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"
@@ -41,11 +42,17 @@
 #include "utils/palloc.h"
 #include "storage/buf.h"
 #include "access/relscan.h"
+#include "storage/block.h"
+#include "access/itup.h"
 #include "access/iqual.h"
  
 #include "storage/itemid.h"
 #include "storage/item.h"
+#include "storage/page.h"
 #include "storage/bufpage.h"
+#include <stdio.h>
+#include <sys/types.h>
+#include "storage/ipc.h"
 #include "storage/bufmgr.h"
  
 #include "access/itup.h"
diff --git a/src/backend/access/rtree/rtree.c b/src/backend/access/rtree/rtree.c
index bb94b58a0a8..36314686b2a 100644
--- a/src/backend/access/rtree/rtree.c
+++ b/src/backend/access/rtree/rtree.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.5 1996/10/23 07:39:24 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.6 1996/10/31 08:52:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,13 +19,12 @@
  
 #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 "catalog/index.h"
-#include "nodes/nodes.h"
 #include "rewrite/prs2lock.h"
 #include "access/skey.h"
 #include "access/strat.h" 
@@ -44,10 +43,12 @@
 #include "storage/buf.h"
 #include "access/relscan.h"  
 #include "access/rtscan.h"
- 
-#include "storage/itemid.h"
-#include "storage/item.h" 
-#include "storage/bufpage.h"
+
+#include "storage/ipc.h"
+#include "storage/spin.h"
+#include "utils/hsearch.h"
+#include "storage/shmem.h"  
+#include "storage/lock.h"
 #include "storage/lmgr.h"
 
 #include "access/rtree.h"
@@ -56,7 +57,10 @@
 #include "nodes/params.h"
 #include "access/sdir.h"
 #include "executor/hashjoin.h"
+#include "utils/fcache.h"
 #include "nodes/primnodes.h"
+#include "lib/fstack.h"
+#include "utils/memutils.h"
 #include "nodes/memnodes.h"
 #include "executor/tuptable.h"
 #include "nodes/execnodes.h"
@@ -75,6 +79,12 @@
 
 #include "access/heapam.h"
 
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/buf.h"
+#include "storage/page.h"
+#include "storage/bufpage.h"
+
 typedef struct SPLITVEC {
     OffsetNumber	*spl_left;
     int			spl_nleft;
diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index e2106ffbac4..7f278b8c8f1 100644
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.5 1996/10/23 07:39:26 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.6 1996/10/31 08:52:53 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -19,6 +19,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"
@@ -38,7 +39,18 @@
 #include "access/htup.h"
 #include "utils/tqual.h"
 #include "storage/buf.h"
+#include <sys/types.h>
+#include "storage/ipc.h"
+#include "storage/spin.h"
+#include "utils/hsearch.h" 
+#include "storage/shmem.h"
+#include "storage/lock.h"
 #include "storage/lmgr.h"
+#include "storage/itemid.h"
+#include "storage/item.h"
+#include "storage/page.h"
+#include "storage/bufpage.h"
+#include <stdio.h>
 #include "storage/bufmgr.h"
 #include "access/relscan.h"
 
diff --git a/src/backend/access/rtree/rtstrat.c b/src/backend/access/rtree/rtstrat.c
index 916ad756d62..e9b3275246f 100644
--- a/src/backend/access/rtree/rtstrat.c
+++ b/src/backend/access/rtree/rtstrat.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.2 1996/10/20 09:27:12 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtstrat.c,v 1.3 1996/10/31 08:52:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -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"