diff --git a/extra/unix/types/openbsd/32/32.factor b/extra/unix/types/openbsd/32/32.factor
new file mode 100755
index 0000000000..221f9896b0
--- /dev/null
+++ b/extra/unix/types/openbsd/32/32.factor
@@ -0,0 +1,29 @@
+USING: alien.syntax ;
+IN: unix.types
+
+! OpenBSD 4.2
+
+TYPEDEF: ushort          __uint16_t
+TYPEDEF: uint           __uint32_t
+TYPEDEF: int            __int32_t
+TYPEDEF: longlong       __int64_t
+
+TYPEDEF: int            int32_t
+TYPEDEF: int            u_int32_t
+TYPEDEF: longlong       int64_t
+TYPEDEF: ulonglong      u_int64_t
+
+TYPEDEF: __uint32_t     __dev_t
+TYPEDEF: __uint32_t     dev_t
+TYPEDEF: __uint32_t     ino_t
+TYPEDEF: __uint16_t     mode_t
+TYPEDEF: __uint16_t     nlink_t
+TYPEDEF: __uint32_t     uid_t
+TYPEDEF: __uint32_t     gid_t
+TYPEDEF: __int64_t      off_t
+TYPEDEF: __int64_t      blkcnt_t
+TYPEDEF: __uint32_t     blksize_t
+TYPEDEF: __uint32_t     fflags_t
+TYPEDEF: int            ssize_t
+TYPEDEF: int            pid_t
+TYPEDEF: int            time_t
diff --git a/extra/unix/types/openbsd/64/64.factor b/extra/unix/types/openbsd/64/64.factor
new file mode 100755
index 0000000000..b24cc94a90
--- /dev/null
+++ b/extra/unix/types/openbsd/64/64.factor
@@ -0,0 +1,29 @@
+USING: alien.syntax ;
+IN: unix.types
+
+! OpenBSD 4.2
+
+TYPEDEF: ushort          __uint16_t
+TYPEDEF: uint           __uint32_t
+TYPEDEF: int            __int32_t
+TYPEDEF: longlong       __int64_t
+
+TYPEDEF: int            int32_t
+TYPEDEF: int            u_int32_t
+TYPEDEF: longlong       int64_t
+TYPEDEF: ulonglong      u_int64_t
+
+TYPEDEF: __uint32_t     __dev_t
+TYPEDEF: __uint32_t     dev_t
+TYPEDEF: __uint32_t     ino_t
+TYPEDEF: __uint32_t     mode_t
+TYPEDEF: __uint32_t     nlink_t
+TYPEDEF: __uint32_t     uid_t
+TYPEDEF: __uint32_t     gid_t
+TYPEDEF: __uint64_t      off_t
+TYPEDEF: __uint64_t      blkcnt_t
+TYPEDEF: __uint32_t     blksize_t
+TYPEDEF: __uint32_t     fflags_t
+TYPEDEF: int            ssize_t
+TYPEDEF: int            pid_t
+TYPEDEF: int            time_t
diff --git a/extra/unix/types/openbsd/openbsd.factor b/extra/unix/types/openbsd/openbsd.factor
old mode 100755
new mode 100644
index 221f9896b0..9d2508e91c
--- a/extra/unix/types/openbsd/openbsd.factor
+++ b/extra/unix/types/openbsd/openbsd.factor
@@ -1,29 +1,7 @@
-USING: alien.syntax ;
-IN: unix.types
+USING: layouts combinators vocabs.loader ;
+IN: unix.stat
 
-! OpenBSD 4.2
-
-TYPEDEF: ushort          __uint16_t
-TYPEDEF: uint           __uint32_t
-TYPEDEF: int            __int32_t
-TYPEDEF: longlong       __int64_t
-
-TYPEDEF: int            int32_t
-TYPEDEF: int            u_int32_t
-TYPEDEF: longlong       int64_t
-TYPEDEF: ulonglong      u_int64_t
-
-TYPEDEF: __uint32_t     __dev_t
-TYPEDEF: __uint32_t     dev_t
-TYPEDEF: __uint32_t     ino_t
-TYPEDEF: __uint16_t     mode_t
-TYPEDEF: __uint16_t     nlink_t
-TYPEDEF: __uint32_t     uid_t
-TYPEDEF: __uint32_t     gid_t
-TYPEDEF: __int64_t      off_t
-TYPEDEF: __int64_t      blkcnt_t
-TYPEDEF: __uint32_t     blksize_t
-TYPEDEF: __uint32_t     fflags_t
-TYPEDEF: int            ssize_t
-TYPEDEF: int            pid_t
-TYPEDEF: int            time_t
+cell-bits {
+    { 32 [ "unix.types.openbsd.32" require ] }
+    { 64 [ "unix.types.openbsd.64" require ] }
+} case