--- a/UnixOperatingSystem.st	Mon Nov 24 15:37:58 2014 +0100
+++ b/UnixOperatingSystem.st	Mon Nov 24 15:52:56 2014 +0100
@@ -141,8 +141,10 @@
 
 
 #ifdef WANT_SHM
-# include <sys/types.h>
-# define _SYS_TYPES_H_INCLUDED_
+# ifndef _SYS_TYPES_H_INCLUDED_
+#  include <sys/types.h>
+#  define _SYS_TYPES_H_INCLUDED_
+# endif
 
 # include <sys/ipc.h>
 # define _SYS_IPC_H_INCLUDED_
@@ -163,8 +165,10 @@
 #else /* not transputer */
 
 # ifdef __arm__
-#  include <sys/types.h>
-#  define _SYS_TYPES_H_INCLUDED_
+#  ifndef _SYS_TYPES_H_INCLUDED_
+#   include <sys/types.h>
+#   define _SYS_TYPES_H_INCLUDED_
+#  endif
 # endif
 
 # ifndef _SIGNAL_H_INCLUDED_
@@ -13556,11 +13560,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.395 2014-11-23 18:07:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.396 2014-11-24 14:52:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.395 2014-11-23 18:07:17 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.396 2014-11-24 14:52:56 cg Exp $'
 ! !