diff --git a/lfs.c b/lfs.c
index 35aff4c..38e00bf 100644
--- a/lfs.c
+++ b/lfs.c
@@ -4912,138 +4912,6 @@ cleanup:
 
 #endif
 
-#if !LFS_THREADSAFE
-
-int lfs_format (lfs_t * lfs, const struct lfs_config * config) {
-    return lfs_format_raw(lfs, config);
-}
-
-int lfs_mount (lfs_t * lfs, const struct lfs_config * config) {
-    return lfs_mount_raw(lfs, config);
-}
-
-int lfs_unmount (lfs_t * lfs) {
-    return lfs_unmount_raw(lfs);
-}
-
-int lfs_remove (lfs_t * lfs, const char * path) {
-    return lfs_remove_raw(lfs, path);
-}
-
-int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) {
-    return lfs_rename_raw(lfs, oldpath, newpath);
-}
-
-int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) {
-    return lfs_stat_raw(lfs, path, info);
-}
-
-lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) {
-    return lfs_getattr_raw(lfs, path, type, buffer, size);
-}
-
-int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) {
-    return lfs_setattr_raw(lfs, path, type, buffer, size);
-}
-
-int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) {
-    return lfs_removeattr_raw(lfs, path, type);
-}
-
-int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) {
-    return lfs_file_open_raw(lfs, file, path, flags);
-}
-
-int lfs_file_opencfg (lfs_t                        * lfs,
-                         lfs_file_t                   * file,
-                         const char                   * path,
-                         int                            flags,
-                         const struct lfs_file_config * config) {
-    return lfs_file_opencfg_raw(lfs, file, path, flags, config);
-}
-
-int lfs_file_close (lfs_t * lfs, lfs_file_t * file) {
-    return lfs_file_close_raw(lfs, file);
-}
-
-int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) {
-    return lfs_file_sync_raw(lfs, file);
-}
-
-lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) {
-    return lfs_file_read_raw(lfs, file, buffer, size);
-}
-
-lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) {
-    return lfs_file_write_raw(lfs, file, buffer, size);
-}
-
-lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) {
-    return lfs_file_seek_raw(lfs, file, off, whence);
-}
-
-int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) {
-    return lfs_file_truncate_raw(lfs, file, size);
-}
-
-lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) {
-    return lfs_file_tell_raw(lfs, file);
-}
-
-int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) {
-    return lfs_file_rewind_raw(lfs, file);
-}
-
-lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) {
-    return lfs_file_size_raw(lfs, file);
-}
-
-int lfs_mkdir (lfs_t * lfs, const char * path) {
-    return lfs_mkdir_raw(lfs, path);
-}
-
-int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) {
-    return lfs_dir_open_raw(lfs, dir, path);
-}
-
-int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) {
-    return lfs_dir_close_raw(lfs, dir);
-}
-
-int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) {
-    return lfs_dir_read_raw(lfs, dir, info);
-}
-
-int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) {
-    return lfs_dir_seek_raw(lfs, dir, off);
-}
-
-lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) {
-    return lfs_dir_tell_raw(lfs, dir);
-}
-
-int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) {
-    return lfs_dir_rewind_raw(lfs, dir);
-}
-
-lfs_ssize_t lfs_fs_size (lfs_t * lfs) {
-    return lfs_fs_size_raw(lfs);
-}
-
-int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) {
-    return lfs_fs_traverse_raw(lfs, cb, data);
-}
-
-#ifdef LFS_MIGRATE
-
-int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) {
-    return lfs_migrate_raw(lfs, cfg);
-}
-
-#endif
-
-#endif
-
 #if LFS_THREADSAFE
 
 int lfs_format (lfs_t * lfs, const struct lfs_config * config) {
@@ -5468,5 +5336,134 @@ int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) {
     return err;
 }
 
+#endif
+#else
+
+int lfs_format (lfs_t * lfs, const struct lfs_config * config) {
+    return lfs_format_raw(lfs, config);
+}
+
+int lfs_mount (lfs_t * lfs, const struct lfs_config * config) {
+    return lfs_mount_raw(lfs, config);
+}
+
+int lfs_unmount (lfs_t * lfs) {
+    return lfs_unmount_raw(lfs);
+}
+
+int lfs_remove (lfs_t * lfs, const char * path) {
+    return lfs_remove_raw(lfs, path);
+}
+
+int lfs_rename (lfs_t * lfs, const char * oldpath, const char * newpath) {
+    return lfs_rename_raw(lfs, oldpath, newpath);
+}
+
+int lfs_stat (lfs_t * lfs, const char * path, struct lfs_info * info) {
+    return lfs_stat_raw(lfs, path, info);
+}
+
+lfs_ssize_t lfs_getattr (lfs_t * lfs, const char * path, uint8_t type, void * buffer, lfs_size_t size) {
+    return lfs_getattr_raw(lfs, path, type, buffer, size);
+}
+
+int lfs_setattr (lfs_t * lfs, const char * path, uint8_t type, const void * buffer, lfs_size_t size) {
+    return lfs_setattr_raw(lfs, path, type, buffer, size);
+}
+
+int lfs_removeattr (lfs_t * lfs, const char * path, uint8_t type) {
+    return lfs_removeattr_raw(lfs, path, type);
+}
+
+int lfs_file_open (lfs_t * lfs, lfs_file_t * file, const char * path, int flags) {
+    return lfs_file_open_raw(lfs, file, path, flags);
+}
+
+int lfs_file_opencfg (lfs_t                        * lfs,
+                         lfs_file_t                   * file,
+                         const char                   * path,
+                         int                            flags,
+                         const struct lfs_file_config * config) {
+    return lfs_file_opencfg_raw(lfs, file, path, flags, config);
+}
+
+int lfs_file_close (lfs_t * lfs, lfs_file_t * file) {
+    return lfs_file_close_raw(lfs, file);
+}
+
+int lfs_file_sync (lfs_t * lfs, lfs_file_t * file) {
+    return lfs_file_sync_raw(lfs, file);
+}
+
+lfs_ssize_t lfs_file_read (lfs_t * lfs, lfs_file_t * file, void * buffer, lfs_size_t size) {
+    return lfs_file_read_raw(lfs, file, buffer, size);
+}
+
+lfs_ssize_t lfs_file_write (lfs_t * lfs, lfs_file_t * file, const void * buffer, lfs_size_t size) {
+    return lfs_file_write_raw(lfs, file, buffer, size);
+}
+
+lfs_soff_t lfs_file_seek (lfs_t * lfs, lfs_file_t * file, lfs_soff_t off, int whence) {
+    return lfs_file_seek_raw(lfs, file, off, whence);
+}
+
+int lfs_file_truncate (lfs_t * lfs, lfs_file_t * file, lfs_off_t size) {
+    return lfs_file_truncate_raw(lfs, file, size);
+}
+
+lfs_soff_t lfs_file_tell (lfs_t * lfs, lfs_file_t * file) {
+    return lfs_file_tell_raw(lfs, file);
+}
+
+int lfs_file_rewind (lfs_t * lfs, lfs_file_t * file) {
+    return lfs_file_rewind_raw(lfs, file);
+}
+
+lfs_soff_t lfs_file_size (lfs_t * lfs, lfs_file_t * file) {
+    return lfs_file_size_raw(lfs, file);
+}
+
+int lfs_mkdir (lfs_t * lfs, const char * path) {
+    return lfs_mkdir_raw(lfs, path);
+}
+
+int lfs_dir_open (lfs_t * lfs, lfs_dir_t * dir, const char * path) {
+    return lfs_dir_open_raw(lfs, dir, path);
+}
+
+int lfs_dir_close (lfs_t * lfs, lfs_dir_t * dir) {
+    return lfs_dir_close_raw(lfs, dir);
+}
+
+int lfs_dir_read (lfs_t * lfs, lfs_dir_t * dir, struct lfs_info * info) {
+    return lfs_dir_read_raw(lfs, dir, info);
+}
+
+int lfs_dir_seek (lfs_t * lfs, lfs_dir_t * dir, lfs_off_t off) {
+    return lfs_dir_seek_raw(lfs, dir, off);
+}
+
+lfs_soff_t lfs_dir_tell (lfs_t * lfs, lfs_dir_t * dir) {
+    return lfs_dir_tell_raw(lfs, dir);
+}
+
+int lfs_dir_rewind (lfs_t * lfs, lfs_dir_t * dir) {
+    return lfs_dir_rewind_raw(lfs, dir);
+}
+
+lfs_ssize_t lfs_fs_size (lfs_t * lfs) {
+    return lfs_fs_size_raw(lfs);
+}
+
+int lfs_fs_traverse (lfs_t * lfs, int (* cb)(void *, lfs_block_t), void * data) {
+    return lfs_fs_traverse_raw(lfs, cb, data);
+}
+
+#ifdef LFS_MIGRATE
+
+int lfs_migrate (lfs_t * lfs, const struct lfs_config * cfg) {
+    return lfs_migrate_raw(lfs, cfg);
+}
+
 #endif
 #endif
\ No newline at end of file