diff --git a/extra/unix/unix.factor b/extra/unix/unix.factor
index 9d5a6122a2..bfe7ad009c 100755
--- a/extra/unix/unix.factor
+++ b/extra/unix/unix.factor
@@ -6,10 +6,11 @@ math namespaces system combinators vocabs.loader ;
 
 ! ! ! Unix types
 TYPEDEF: int blksize_t
-TYPEDEF: int dev_t
+! TYPEDEF: int dev_t
 TYPEDEF: long ssize_t
-TYPEDEF: longlong blkcnt_t
+TYPEDEF: long blkcnt_t
 TYPEDEF: longlong quad_t
+TYPEDEF: ulonglong dev_t
 TYPEDEF: uint gid_t
 TYPEDEF: uint in_addr_t
 TYPEDEF: uint ino_t
@@ -19,8 +20,9 @@ TYPEDEF: uint time_t
 TYPEDEF: uint uid_t
 TYPEDEF: ulong size_t
 TYPEDEF: ulong u_long
-TYPEDEF: ushort mode_t
-TYPEDEF: ushort nlink_t
+! TYPEDEF: ushort mode_t
+TYPEDEF: uint mode_t
+TYPEDEF: uint nlink_t
 TYPEDEF: void* caddr_t
 
 TYPEDEF: ulong off_t
@@ -226,3 +228,4 @@ FUNCTION: ssize_t write ( int fd, void* buf, size_t nbytes ) ;
     { [ solaris? ] [ "unix.solaris" require ] }
     { [ t ] [ ] }
 } cond
+