--- a/UnixOperatingSystem.st	Sun Nov 23 17:51:36 2014 +0100
+++ b/UnixOperatingSystem.st	Sun Nov 23 19:07:17 2014 +0100
@@ -66,6 +66,9 @@
 
 !UnixOperatingSystem primitiveDefinitions!
 %{
+
+#include "stxOSDefs.h"
+
 #if defined(_AIX)
 # ifndef WANT_REALPATH
 #  define WANT_REALPATH
@@ -159,6 +162,11 @@
 
 #else /* not transputer */
 
+# ifdef __arm__
+#  include <sys/types.h>
+#  define _SYS_TYPES_H_INCLUDED_
+# endif
+
 # ifndef _SIGNAL_H_INCLUDED_
 #  include <signal.h>
 #  define _SIGNAL_H_INCLUDED_
@@ -304,6 +312,8 @@
 #  include <sys/timeb.h>
 # endif
 
+// #include <signal.h>
+
 /*
  * posix systems should define these ...
  * but on some (older) systems, they are not.
@@ -595,9 +605,7 @@
 #   define      __wait          wait
 #   define      __waitpid       waitpid
 #  endif /* ! LINUX */
-// #  ifndef __osx__
     extern char **environ;
-// #  endif
 # endif
 
 # define      __sigprocmask   sigprocmask
@@ -13548,11 +13556,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.394 2014-11-19 11:24:57 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.395 2014-11-23 18:07:17 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.394 2014-11-19 11:24:57 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.395 2014-11-23 18:07:17 cg Exp $'
 ! !