5 files changed, 20 insertions, 17 deletions
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 55b735a6a9..a0d08a2d78 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufmgr.h,v 1.26 1999/05/25 16:14:39 momjian Exp $
+ * $Id: bufmgr.h,v 1.27 1999/07/15 15:21:31 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,17 +54,6 @@ typedef bits16 BufferLock;
  */
 #define BufferDescriptorGetBuffer(bdesc) ((bdesc)->buf_id + 1)
 
-/*
- * BufferIsPinned
- *		True iff the buffer is pinned (and therefore valid)
- *
- * Note:
- *		Smenatics are identical to BufferIsValid
- *		XXX - need to remove either one eventually.
- */
-#define BufferIsPinned BufferIsValid
-
-
 extern int	ShowPinTrace;
 
 /*
@@ -101,6 +90,17 @@ extern int	ShowPinTrace;
 	) \
 )
 
+/*
+ * BufferIsPinned
+ *		True iff the buffer is pinned (and therefore valid)
+ *
+ * Note:
+ *		Smenatics are identical to BufferIsValid
+ *		XXX - need to remove either one eventually.
+ */
+#define BufferIsPinned BufferIsValid
+
+
 #define IncrBufferRefCount(buffer) \
 ( \
 	BufferIsLocal(buffer) ? \
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 74729eaddc..6921f97a08 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.23 1999/07/03 00:32:59 momjian Exp $
+ * $Id: bufpage.h,v 1.24 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include <storage/item.h>
 #include <storage/buf.h>
 #include <storage/page.h>
+#include <storage/bufmgr.h>
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 6027785fab..c7e649f19c 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.20 1999/05/25 22:43:26 momjian Exp $
+ * $Id: lmgr.h,v 1.21 1999/07/15 15:21:32 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -15,7 +15,6 @@
 
 #include <storage/lock.h>
 #include <utils/rel.h>
-#include <catalog/catname.h>
 
 #define AccessShareLock			1		/* SELECT */
 #define RowShareLock			2		/* SELECT FOR UPDATE */
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 63a3e1b54c..e05ceae862 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -6,13 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: off.h,v 1.7 1999/05/25 16:14:43 momjian Exp $
+ * $Id: off.h,v 1.8 1999/07/15 15:21:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef OFF_H
 #define OFF_H
 
+#include "storage/itemid.h"
 /*
  * OffsetNumber:
  *
diff --git a/src/include/storage/pos.h b/src/include/storage/pos.h
index 91d85c68c5..700e6afe5f 100644
--- a/src/include/storage/pos.h
+++ b/src/include/storage/pos.h
@@ -6,13 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pos.h,v 1.7 1999/05/25 16:14:44 momjian Exp $
+ * $Id: pos.h,v 1.8 1999/07/15 15:21:35 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef POS_H
 #define POS_H
 
+#include "storage/off.h"
+
 /*
  * a 'position' used to be <pagenumber, offset> in postgres.  this has
  * been changed to just <offset> as the notion of having multiple pages