diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 9d2b373a589919cc374ca6ee2dcada3223c63e81..0552ff288ea4223e6f5800a5973594d1a027dbb2 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.69 2001/09/29 04:02:23 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.70 2001/10/01 18:16:26 tgl Exp $
  *
  * NOTES
  *
@@ -27,11 +27,10 @@
  */
 #include "postgres.h"
 
-#include <sys/types.h>
-#include <sys/file.h>
 #include <errno.h>
 #include <signal.h>
 #include <unistd.h>
+#include <sys/file.h>
 
 #include "storage/ipc.h"
 /* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
@@ -45,10 +44,6 @@
 #include <kernel/OS.h>
 #endif
 
-#if defined(solaris_sparc)
-#include <sys/ipc.h>
-#endif
-
 #if defined(__darwin__)
 #include "port/darwin/sem.h"
 #endif
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index a8f1b7bfbc6ae77bc7fdb55c6360abf6c16cefc3..5b88e22bd9b3d9fa8aeb369af4d27aaa6e242a81 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.111 2001/09/30 00:45:47 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.112 2001/10/01 18:16:32 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,27 +47,21 @@
 #include "postgres.h"
 
 #include <errno.h>
-#include <sys/time.h>
-#include <unistd.h>
 #include <signal.h>
-#include <sys/types.h>
+#include <unistd.h>
+#include <sys/time.h>
 
-#if defined(solaris_sparc) || defined(__CYGWIN__)
-#include <sys/ipc.h>
+#include "storage/ipc.h"
+/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
+#ifdef HAVE_SYS_SEM_H
 #include <sys/sem.h>
 #endif
 
-#include "miscadmin.h"
-
 #if defined(__darwin__)
 #include "port/darwin/sem.h"
 #endif
 
-/* In Ultrix and QNX, sem.h must be included after ipc.h */
-#ifdef HAVE_SYS_SEM_H
-#include <sys/sem.h>
-#endif
-
+#include "miscadmin.h"
 #include "access/xact.h"
 #include "storage/proc.h"
 #include "storage/sinval.h"
diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c
index 454a28aca5e1f782e8b6d13b3249b57df1f5625a..6ace9cc11aab22eac36dfcc9d5c7a90696d22da8 100644
--- a/src/backend/storage/lmgr/spin.c
+++ b/src/backend/storage/lmgr/spin.c
@@ -15,18 +15,24 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.3 2001/10/01 17:52:34 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/spin.c,v 1.4 2001/10/01 18:16:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <errno.h>
+
+#include "storage/ipc.h"
+/* In Ultrix, sem.h and shm.h must be included AFTER ipc.h */
 #ifdef HAVE_SYS_SEM_H
-#include <sys/types.h>
 #include <sys/sem.h>
 #endif
 
+#if defined(__darwin__)
+#include "port/darwin/sem.h"
+#endif
+
 #include "storage/lwlock.h"
 #include "storage/proc.h"
 #include "storage/spin.h"