diff --git a/basis/unix/stat/macosx/macosx.factor b/basis/unix/stat/macosx/macosx.factor
index 03301d25b9..49b6709847 100644
--- a/basis/unix/stat/macosx/macosx.factor
+++ b/basis/unix/stat/macosx/macosx.factor
@@ -115,12 +115,6 @@ C-STRUCT: vfsquery
 : NFSV2_MAX_FH_SIZE 32 ; inline
 : NFS_MAX_FH_SIZE NFSV4_MAX_FH_SIZE ; inline
 
-! C-STRUCT: fhandle
-    ! { "int" "fh_len" }
-    ! { { "uchar" NFS_MAX_FH_SIZE } "fh_data" } ;
-
-! TYPEDEF: fhandle fhandle_t
-
 : MFSNAMELEN 15 ; inline
 : MNAMELEN 90 ; inline
 : MFSTYPENAMELEN 16 ; inline
diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 8796834bc7..1f6a48b50e 100644
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -153,7 +153,8 @@ PRIVATE>
     "." last-split1 nip ;
 
 ! File info
-TUPLE: file-info type size permissions created modified accessed ;
+TUPLE: file-info type size permissions created modified
+accessed ;
 
 HOOK: file-info io-backend ( path -- info )
 
@@ -181,6 +182,12 @@ SYMBOL: +unknown+
 
 : directory? ( file-info -- ? ) type>> +directory+ = ;
 
+! File-system
+
+TUPLE: file-system-info mount-on free-space ;
+
+HOOK: file-system-info os ( path -- file-system-info )
+
 <PRIVATE
 
 HOOK: cd io-backend ( path -- )