--- a/Unix.st	Sat Oct 04 18:28:43 1997 +0200
+++ b/Unix.st	Sat Oct 04 18:29:50 1997 +0200
@@ -49,7 +49,9 @@
 # endif
 # undef UNIX_LIKE       /* oops - we were too optimistic - no OS */
 # ifdef i386
-#  define _X86_
+#  ifndef _X86_
+#   define _X86_
+#  endif
 # endif
 #endif /* any MS-non-OS */
 
@@ -301,21 +303,17 @@
 #  ifdef MSDOS_LIKE
 
 #   ifndef _SYS_TYPES_H_INCLUDED_
-#    include <types.h>
+#    include <sys/types.h>
 #    define _SYS_TYPES_H_INCLUDED_
 #   endif
 
 #   ifndef _TIME_H_INCLUDED_
-     /* 
-      * notice the leading 'h' below - to avoid getting our own Time.h 
-      * needs mstools (without include) to be in the -I list.
-      */
-#    include <h\time.h>
+#    include <time.h>
 #    define _TIME_H_INCLUDED_
 #   endif
 
 #   ifndef _SYS_TIMEB_H_INCLUDED_
-#    include <timeb.h>
+#    include <sys/timeb.h>
 #    define _SYS_TIMEB_H_INCLUDED_
 #   endif
 
@@ -425,6 +423,7 @@
 #  ifdef __DEF_Block
 #   define Block __DEF_Block
 #  endif
+#  define INT int
 
 #  define stat _stat
 #  define WIN32_ERR(x)  ((x) | 0x01000000)      /* tag GetLastError codes */
@@ -10487,6 +10486,6 @@
 !OperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Unix.st,v 1.263 1997-10-02 13:30:38 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Attic/Unix.st,v 1.264 1997-10-04 16:29:50 cg Exp $'
 ! !
 OperatingSystem initialize!