diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h
index f12dc424701befba706d3aa87ca7022c81043584..c631d9c38cef3c1ca096a718f3c500f9c5de620a 100644
--- a/src/include/storage/backendid.h
+++ b/src/include/storage/backendid.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: backendid.h,v 1.1 1996/08/28 01:57:54 scrappy Exp $
+ * $Id: backendid.h,v 1.2 1996/11/05 06:10:52 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,7 +14,6 @@
 #define BACKENDID_H
 
 /* ----------------
- *	pulled out of sinval.h to temporarily reduce #include nesting.
  *	-cim 8/17/90
  * ----------------
  */
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index dce25885f3d7597ed632437c24410851215ad09b..f0920b04d2be34402faa56387bc4d9277359f705 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: buf_internals.h,v 1.4 1996/11/04 04:00:24 momjian Exp $
+ * $Id: buf_internals.h,v 1.5 1996/11/05 06:10:53 scrappy Exp $
  *
  * NOTE
  *	If BUFFERPAGE0 is defined, then 0 will be used as a
@@ -17,13 +17,8 @@
 #ifndef	BUFMGR_INTERNALS_H
 #define BUFMGR_INTERNALS_H
 
-#include "storage/buf.h"
-#include "storage/ipc.h"
-#include "storage/shmem.h"
-#include "miscadmin.h"
-#include "storage/lmgr.h"
-#include "utils/rel.h"
-#include "utils/relcache.h"
+#include <storage/lmgr.h>
+#include <storage/buf.h>
 
 /* Buf Mgr constants */
 /* in bufmgr.c */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index e1b397a2a3d0f25ebd813cffdd8429f07a65b1f7..55a2666193709074f783d06c04bed8ae17931a81 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.6 1996/11/03 12:13:10 scrappy Exp $
+ * $Id: bufmgr.h,v 1.7 1996/11/05 06:10:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -14,10 +14,11 @@
 #define BUFMGR_H
 
 #include <stdio.h>
-#include "storage/block.h"
-#include "storage/buf.h"
-#include "storage/ipc.h"
-#include "utils/rel.h"
+
+#include <storage/ipc.h>
+#include <storage/block.h>
+#include <storage/buf.h>
+#include <utils/rel.h>
 
 /*
  * the maximum size of a disk block for any possible installation.
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 962b0290caa406f10cccadbffb9832a11ff0a228..f8d9f7f97c148791153ea8ead5f32eb4965e663e 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -6,18 +6,18 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bufpage.h,v 1.6 1996/11/01 09:31:09 scrappy Exp $
+ * $Id: bufpage.h,v 1.7 1996/11/05 06:10:57 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	BUFPAGE_H
 #define BUFPAGE_H
 
-#include "storage/item.h"
-#include "storage/off.h" 
-#include "storage/page.h"
-#include "storage/buf.h"
-#include "storage/itemid.h"
+#include <storage/off.h>
+#include <storage/itemid.h>
+#include <storage/item.h>
+#include <storage/buf.h>
+#include <storage/page.h>
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/itempos.h b/src/include/storage/itempos.h
index 317ce0e08c2b54512efa583641dd0a65ea750e48..fc847df4ec9f36ba066578ce8ebea5234b02ffce 100644
--- a/src/include/storage/itempos.h
+++ b/src/include/storage/itempos.h
@@ -6,15 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: itempos.h,v 1.2 1996/10/31 09:49:50 scrappy Exp $
+ * $Id: itempos.h,v 1.3 1996/11/05 06:10:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	ITEMPOS_H
 #define ITEMPOS_H
 
-#include "storage/buf.h"
-#include "storage/itemid.h"
+#include <storage/itemid.h>
+#include <storage/buf.h>
 
 typedef struct ItemSubpositionData {
 	Buffer		op_db;
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index d4642d9470af8019763f6deba8c0a0e84f691210..24492571f443ca3515bb9a88ce899f3effc7ba8c 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -7,15 +7,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: large_object.h,v 1.2 1996/10/31 09:49:54 scrappy Exp $
+ * $Id: large_object.h,v 1.3 1996/11/05 06:10:58 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LARGE_OBJECT_H
 #define	LARGE_OBJECT_H
 
-#include "utils/rel.h"
-#include "access/relscan.h"
+#include <sys/types.h>
+
+#include <access/relscan.h>
 
 /*
  * This structure will eventually have lots more stuff associated with it.
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 655ed7c93c51e5830b873796921ff1948111a371..4f3398c665d7149ee82c5702e43173e2ba83263e 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -6,17 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lmgr.h,v 1.2 1996/10/31 09:49:56 scrappy Exp $
+ * $Id: lmgr.h,v 1.3 1996/11/05 06:10:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	LMGR_H
 #define LMGR_H
 
-
-#include "storage/itemptr.h"
-#include "storage/lock.h"
-#include "utils/rel.h"
+#include <storage/lock.h>
+#include <utils/rel.h>
 
 /* 
  * This was moved from pladt.h for the new lock manager.  Want to obsolete
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index e4af5d07c57fd8bc193f078725d00409e945e80c..e8c46ce739b502f914a06cfb89603855f74e788f 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -6,18 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: lock.h,v 1.2 1996/10/31 09:49:57 scrappy Exp $
+ * $Id: lock.h,v 1.3 1996/11/05 06:11:00 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef LOCK_H_
 #define LOCK_H_
 
-#include "storage/itemptr.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "storage/backendid.h"
-#include "utils/hsearch.h"
+#include <storage/shmem.h>
+#include <storage/itemptr.h>
 
 extern SPINLOCK LockMgrLock;
 typedef int MASK;
diff --git a/src/include/storage/multilev.h b/src/include/storage/multilev.h
index 1d09c854f8b79ca4b76699bab73b1af682684b2a..fd2f39f1d794c36cbdc790e5ed8f04bf5ec0a3d8 100644
--- a/src/include/storage/multilev.h
+++ b/src/include/storage/multilev.h
@@ -7,15 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: multilev.h,v 1.1 1996/08/28 01:58:17 scrappy Exp $
+ * $Id: multilev.h,v 1.2 1996/11/05 06:11:01 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef MULTILEV_H
 #define MULTILEV_H
 
-#include "storage/lock.h"
-#include "storage/lmgr.h"
+#include <storage/lmgr.h>
 
 #define READ_LOCK  	2
 #define WRITE_LOCK 	1
diff --git a/src/include/storage/pagenum.h b/src/include/storage/pagenum.h
index bf316304d309ca46e4d4893e92d480f5e6a21c7d..1e4ff7b21208049d1978e2e62013f5c9bbae5e41 100644
--- a/src/include/storage/pagenum.h
+++ b/src/include/storage/pagenum.h
@@ -6,14 +6,13 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pagenum.h,v 1.2 1996/10/31 09:50:00 scrappy Exp $
+ * $Id: pagenum.h,v 1.3 1996/11/05 06:11:02 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	PAGENUM_H
 #define PAGENUM_H
 
-#include "storage/page.h"
 
 typedef uint16	PageNumber;
 
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 2a73757a9518c9bacf6a03bb9a132451e12ccd65..db713d6524ed82c2fcc1a2b2e35014e171b8eccb 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -6,23 +6,20 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: proc.h,v 1.2 1996/10/31 05:57:45 momjian Exp $
+ * $Id: proc.h,v 1.3 1996/11/05 06:11:03 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef _PROC_H_
 #define _PROC_H_
 
-#include "storage/ipc.h"
-#include "storage/lock.h"
+#include <storage/lock.h>
+
 #ifndef WIN32
-#include <sys/ipc.h>
-#include <sys/sem.h>
 #else
 /* This is because WIN32 already defines PROC */
 #define PROC	PGL_PROC
 #endif /* WIN32 */
-#include "storage/shmem.h"
 
 
 typedef struct {
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index 2b13c372d4d5da5e88596eb384d85ff1038567ae..72200cff4816e77e081c642a19f5c4e8f0be12bd 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -6,15 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: shmem.h,v 1.1 1996/08/28 01:58:26 scrappy Exp $
+ * $Id: shmem.h,v 1.2 1996/11/05 06:11:04 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SHMEM_H
 #define SHMEM_H
 
-#include "storage/spin.h"		/* for SPINLOCK */
-#include "utils/hsearch.h"		/* for HTAB */
+#include <utils/hsearch.h>
+#include <storage/spin.h>
+
 
 /* The shared memory region can start at a different address
  * in every process.  Shared memory "pointers" are actually
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 3ae788248780a62cf1786856d4969606a1628482..efc1ce2e1ac07b225c94098b894e39813bfdcdb1 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -6,17 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinval.h,v 1.2 1996/10/31 09:50:06 scrappy Exp $
+ * $Id: sinval.h,v 1.3 1996/11/05 06:11:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SINVAL_H
 #define SINVAL_H
 
-#include "storage/spin.h"
-#include "storage/ipc.h"
-#include "storage/itemptr.h"
-#include "storage/backendid.h"
+#include <storage/itemptr.h>
+#include <storage/spin.h>
 
 extern SPINLOCK SInvalLock;
 
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index c8137d01a6c637e5d784b4f711799608ad5a4bd1..9735cb476b126a6671deb948a13d53cfe0d0b3f1 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -6,16 +6,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: sinvaladt.h,v 1.2 1996/10/31 09:50:07 scrappy Exp $
+ * $Id: sinvaladt.h,v 1.3 1996/11/05 06:11:06 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SINVALADT_H
 #define SINVALADT_H
 
-#include "storage/ipc.h"
-#include "storage/itemptr.h"
-#include "storage/sinval.h"
+#include <storage/itemptr.h>
+#include <storage/ipc.h>
  
 /*
  * The structure of the shared cache invaidation segment
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index 8f7cc98a97d45e0f557bcda69c7370ea60157e55..c6dbd08550b5286993bf4e50b5aa27e02cac2b7c 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -6,15 +6,16 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: smgr.h,v 1.1 1996/08/28 01:58:32 scrappy Exp $
+ * $Id: smgr.h,v 1.2 1996/11/05 06:11:07 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef SMGR_H
 #define SMGR_H
 
-#include "utils/rel.h"
-#include "storage/spin.h"	/* for SPINLOCK */
+#include <storage/spin.h>
+#include <storage/block.h>
+#include <utils/rel.h>
 
 #define SM_FAIL		0
 #define	SM_SUCCESS	1
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index b7c98463ae295ee07e474832b3535b821a080b52..9e45bd788193c459675e402c35932919c10091e0 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -6,14 +6,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: spin.h,v 1.1 1996/08/28 01:58:33 scrappy Exp $
+ * $Id: spin.h,v 1.2 1996/11/05 06:11:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	SPIN_H
 #define SPIN_H
 
-#include "ipc.h"
+#include <storage/ipc.h>
 
 /* 
  * two implementations of spin locks