diff --git a/src/include/access/strat.h b/src/include/access/strat.h
index e1ab475b195ea2e9738b815dba8120e0d0c80a65..7406074d3efeecb3919161cd455e19d298d0f908 100644
--- a/src/include/access/strat.h
+++ b/src/include/access/strat.h
@@ -7,14 +7,14 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: strat.h,v 1.2 1996/10/19 04:05:44 scrappy Exp $
+ * $Id: strat.h,v 1.3 1996/11/01 09:30:41 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef STRAT_H
 #define STRAT_H
 
-#include "access/skey.h" 
+#include "access/skey.h"
 
 typedef uint16	StrategyNumber;
 
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 8cc0b4c4260a842de209938a011c10924ea7a6b9..4acc8af5ce5fdd4e2775aa048f2a1be26c171378 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: transam.h,v 1.2 1996/10/23 07:41:31 scrappy Exp $
+ * $Id: transam.h,v 1.3 1996/11/01 09:30:42 scrappy Exp $
  *
  *   NOTES
  *	Transaction System Version 101 now support proper oid
@@ -17,9 +17,8 @@
 #ifndef TRANSAM_H
 #define TRANSAM_H
 
-#include "utils/nabstime.h"
-#include "utils/rel.h"
 #include "storage/bufmgr.h"
+#include "utils/nabstime.h"
 
 /* ----------------
  *	transaction system version id
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index d46357b7b674eb69f9f0dc6b425133ac98078dba..8d48b9ab7df9319fa50bffa88d9f8f13790a72c6 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -7,7 +7,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_class.h,v 1.2 1996/10/31 09:47:21 scrappy Exp $
+ * $Id: pg_class.h,v 1.3 1996/11/01 09:30:46 scrappy Exp $
  *
  * NOTES
  *    ``pg_relation'' is being replaced by ``pg_class''.  currently
@@ -29,7 +29,6 @@
  *	can be read by both genbki.sh and the C compiler.
  * ----------------
  */
-#include "utils/nabstime.h"
 
 /* ----------------
  *	pg_class definition.  cpp turns this into
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 398667bfa67151616ba324385de7f3290c3abdaf..b336ca8396791903fbefac7cc83031b585a5f9af 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -5,14 +5,15 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: prs2lock.h,v 1.2 1996/10/19 04:25:53 scrappy Exp $
+ * $Id: prs2lock.h,v 1.3 1996/11/01 09:30:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef PRS2LOCK_H
 #define PRS2LOCK_H
 
-#include "nodes/nodes.h"
+#include "access/attnum.h"
+#include "nodes/pg_list.h"
 
 /*
  * RewriteRule -
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index a92fe0a65dfac80f41d29bbd0fb0a4b0b9d321db..3d72f1f503700070cd050682b2366228db1f3bb4 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.4 1996/10/26 04:15:05 scrappy Exp $
+ * $Id: bufmgr.h,v 1.5 1996/11/01 09:31:05 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,6 +18,7 @@
 #include "storage/ipc.h"
 #include "storage/buf.h"
 #include "utils/rel.h"
+#include "storage/block.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 de27959aa064149272e7821b6b1e253187e3f92a..962b0290caa406f10cccadbffb9832a11ff0a228 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.5 1996/10/23 07:42:07 scrappy Exp $
+ * $Id: bufpage.h,v 1.6 1996/11/01 09:31:09 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	BUFPAGE_H
 #define BUFPAGE_H
 
-#include "storage/itemid.h"
 #include "storage/item.h"
-#include "storage/buf.h"
+#include "storage/off.h" 
 #include "storage/page.h"
-#include "storage/off.h"
+#include "storage/buf.h"
+#include "storage/itemid.h"
 
 /*
  * a postgres disk page is an abstraction layered on top of a postgres
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index 37381c746a521d3769e0c4bde4e0c1e42a2fc13d..b19a135119a67ead808801eb191b577d3a8ffe50 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: fd.h,v 1.2 1996/10/31 09:49:45 scrappy Exp $
+ * $Id: fd.h,v 1.3 1996/11/01 09:31:10 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,8 +53,6 @@
 #endif /* SEEK_SET */
 #endif /* WIN32 */
 
-#include "storage/block.h"
-
 typedef char   *FileName;
 
 typedef int	File;
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index 3d26e1483ff40fa1a5b3327410a8d0c78735385e..bbe18a0fd59bebb514ee1e687bec9bbf2ed6a27c 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: ipc.h,v 1.7 1996/11/01 03:36:16 momjian Exp $
+ * $Id: ipc.h,v 1.8 1996/11/01 09:31:12 scrappy Exp $
  *
  * NOTES
  *    This file is very architecture-specific.  This stuff should actually
@@ -21,6 +21,8 @@
 #define _IPC_
 #endif
 
+#include <sys/types.h>
+
 /*
  * Many architectures have support for user-level spinlocks (i.e., an
  * atomic test-and-set instruction).  However, we have only written
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 59ca8d4342a77c69674a3f0693ff1985c56aa583..dbcd7e0f403bae72c3afe5022e8d4890fb78dabb 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -6,19 +6,19 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: rel.h,v 1.4 1996/10/24 07:55:54 scrappy Exp $
+ * $Id: rel.h,v 1.5 1996/11/01 09:31:17 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
 #ifndef	REL_H
 #define REL_H
 
+#include "access/strat.h"
+#include "rewrite/prs2lock.h"
 #include "access/tupdesc.h"
-#include "storage/fd.h"
-#include "catalog/pg_am.h"
 #include "catalog/pg_class.h"
-#include "rewrite/prs2lock.h"
-#include "access/strat.h"
+#include "catalog/pg_am.h"
+#include "storage/fd.h"
 
 typedef struct RelationData {
     File		rd_fd; 		/* open file descriptor */