diff --git a/extra/unix/stat/openbsd/32/32.factor b/extra/unix/stat/openbsd/32/32.factor
deleted file mode 100644
index 61a37ba567..0000000000
--- a/extra/unix/stat/openbsd/32/32.factor
+++ /dev/null
@@ -1,29 +0,0 @@
-USING: kernel alien.syntax math ;
-IN: unix.stat
-
-! OpenBSD 4.2
-
-C-STRUCT: stat
-    { "dev_t" "st_dev" }
-    { "ino_t" "st_ino" }
-    { "mode_t" "st_mode" }
-    { "nlink_t" "st_nlink" }
-    { "uid_t" "st_uid" }
-    { "gid_t" "st_gid" }
-    { "dev_t" "st_rdev" }
-    { "int32_t" "st_lspare0" }
-    { "timespec*" "st_atim" }
-    { "timespec*" "st_mtim" }
-    { "timespec*" "st_ctim" }
-    { "off_t" "st_size" }
-    { "int64_t" "st_blocks" }
-    { "u_int32_t" "st_blksize" }
-    { "u_int32_t" "st_flags" }
-    { "u_int32_t" "st_gen" }
-    { "int32_t" "st_lspare1" }
-    { "timespec*" "st_birthtim" }
-    { "int64_t" "st_qspare1" }
-    { "int64_t" "st_qspare2" } ;
-
-FUNCTION: int stat  ( char* pathname, stat* buf ) ;
-FUNCTION: int lstat ( char* pathname, stat* buf ) ;
diff --git a/extra/unix/stat/openbsd/64/64.factor b/extra/unix/stat/openbsd/64/64.factor
deleted file mode 100644
index 61a37ba567..0000000000
--- a/extra/unix/stat/openbsd/64/64.factor
+++ /dev/null
@@ -1,29 +0,0 @@
-USING: kernel alien.syntax math ;
-IN: unix.stat
-
-! OpenBSD 4.2
-
-C-STRUCT: stat
-    { "dev_t" "st_dev" }
-    { "ino_t" "st_ino" }
-    { "mode_t" "st_mode" }
-    { "nlink_t" "st_nlink" }
-    { "uid_t" "st_uid" }
-    { "gid_t" "st_gid" }
-    { "dev_t" "st_rdev" }
-    { "int32_t" "st_lspare0" }
-    { "timespec*" "st_atim" }
-    { "timespec*" "st_mtim" }
-    { "timespec*" "st_ctim" }
-    { "off_t" "st_size" }
-    { "int64_t" "st_blocks" }
-    { "u_int32_t" "st_blksize" }
-    { "u_int32_t" "st_flags" }
-    { "u_int32_t" "st_gen" }
-    { "int32_t" "st_lspare1" }
-    { "timespec*" "st_birthtim" }
-    { "int64_t" "st_qspare1" }
-    { "int64_t" "st_qspare2" } ;
-
-FUNCTION: int stat  ( char* pathname, stat* buf ) ;
-FUNCTION: int lstat ( char* pathname, stat* buf ) ;
diff --git a/extra/unix/stat/openbsd/openbsd.factor b/extra/unix/stat/openbsd/openbsd.factor
index 0a2312302b..38ebf66abc 100644
--- a/extra/unix/stat/openbsd/openbsd.factor
+++ b/extra/unix/stat/openbsd/openbsd.factor
@@ -1,7 +1,29 @@
-USING: layouts combinators vocabs.loader ;
+USING: kernel alien.syntax math ;
 IN: unix.stat
 
-cell-bits {
-    { 32 [ "unix.stat.openbsd.32" require ] }
-    { 64 [ "unix.stat.openbsd.64" require ] }
-} case
+! OpenBSD 4.2
+
+C-STRUCT: stat
+    { "dev_t" "st_dev" }
+    { "ino_t" "st_ino" }
+    { "mode_t" "st_mode" }
+    { "nlink_t" "st_nlink" }
+    { "uid_t" "st_uid" }
+    { "gid_t" "st_gid" }
+    { "dev_t" "st_rdev" }
+    { "int32_t" "st_lspare0" }
+    { "timespec" "st_atim" }
+    { "timespec" "st_mtim" }
+    { "timespec" "st_ctim" }
+    { "off_t" "st_size" }
+    { "int64_t" "st_blocks" }
+    { "u_int32_t" "st_blksize" }
+    { "u_int32_t" "st_flags" }
+    { "u_int32_t" "st_gen" }
+    { "int32_t" "st_lspare1" }
+    { "timespec" "st_birthtim" }
+    { "int64_t" "st_qspare1" }
+    { "int64_t" "st_qspare2" } ;
+
+FUNCTION: int stat  ( char* pathname, stat* buf ) ;
+FUNCTION: int lstat ( char* pathname, stat* buf ) ;
diff --git a/extra/unix/types/openbsd/32/32.factor b/extra/unix/types/openbsd/32/32.factor
deleted file mode 100755
index 221f9896b0..0000000000
--- a/extra/unix/types/openbsd/32/32.factor
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100755
index b24cc94a90..0000000000
--- a/extra/unix/types/openbsd/64/64.factor
+++ /dev/null
@@ -1,29 +0,0 @@
-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 100644
new mode 100755
index 9d2508e91c..7445dada2b
--- a/extra/unix/types/openbsd/openbsd.factor
+++ b/extra/unix/types/openbsd/openbsd.factor
@@ -1,7 +1,31 @@
-USING: layouts combinators vocabs.loader ;
-IN: unix.stat
+USING: alien.syntax ;
+IN: unix.types
 
-cell-bits {
-    { 32 [ "unix.types.openbsd.32" require ] }
-    { 64 [ "unix.types.openbsd.64" require ] }
-} case
+! OpenBSD 4.2
+
+TYPEDEF: short          __int16_t
+TYPEDEF: ushort         __uint16_t
+TYPEDEF: int            __int32_t
+TYPEDEF: uint           __uint32_t
+TYPEDEF: longlong       __int64_t
+TYPEDEF: longlong       __uint64_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: __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