5 files changed, 13 insertions, 18 deletions
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 9f74d848c47..b02beba9ec2 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.9 1996/11/10 03:02:21 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.10 1997/01/08 08:32:01 bryanh Exp $
  *
  * NOTES
  *
@@ -30,16 +30,12 @@
 #include <string.h>
 #include <errno.h>
 
-/* XXX - the following  dependency should be moved into the defaults.mk file */
-#ifndef	_IPC_
-#define _IPC_
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-#endif
 
 #include "postgres.h"
 #include "storage/ipc.h"
+/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
+#include <sys/sem.h>
+#include <sys/shm.h>
 #include "utils/memutils.h"
 
 #if defined(sparc_solaris)
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 2527daed7f8..f949041f44d 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -7,13 +7,12 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.4 1996/11/08 05:58:33 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipci.c,v 1.5 1997/01/08 08:32:03 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 #include <sys/types.h>
-#include <sys/ipc.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index bd4079efd67..e5aef6dd99b 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -7,14 +7,13 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.5 1996/11/10 03:02:30 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/ipc/sinval.c,v 1.6 1997/01/08 08:32:04 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
 /* #define INVALIDDEBUG	1 */
 
 #include <sys/types.h>
-#include <sys/ipc.h>
 
 #include "postgres.h"
 
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 3888fdcd9e5..37466ba39e2 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.12 1996/12/26 22:07:28 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.13 1997/01/08 08:32:17 bryanh Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,7 +46,7 @@
  *      This is so that we can support more backends. (system-wide semaphore
  *      sets run out pretty fast.)                -ay 4/95
  *
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.12 1996/12/26 22:07:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.13 1997/01/08 08:32:17 bryanh Exp $
  */
 #include <sys/time.h>
 #ifndef WIN32
@@ -55,8 +55,6 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
 
 #if defined(sparc_solaris)
 #include <sys/ipc.h>
@@ -70,6 +68,9 @@
 #include "access/xact.h"
 #include "utils/hsearch.h"
 
+#include "storage/ipc.h"
+/* In Ultrix, sem.h must be included after ipc.h */
+#include <sys/sem.h>
 #include "storage/buf.h"	
 #include "storage/lock.h"
 #include "storage/lmgr.h"
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index de2768d8da6..178d45ff835 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.6 1996/11/12 06:46:42 bryanh Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.7 1997/01/08 08:33:07 bryanh Exp $
  *
  * NOTES
  *      InitPostgres() is the function called from PostgresMain
@@ -32,13 +32,13 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/ipc.h>
 #include <math.h>
 #include <unistd.h>
 
 #include "postgres.h"
 #include "version.h"
 
+#include <storage/ipc.h>
 #include <storage/backendid.h>
 #include <storage/buf_internals.h>
 #include <storage/smgr.h>