diff -urN wine-6.8-orig/configure.ac wine-6.8/configure.ac
--- wine-6.8-orig/configure.ac	2021-05-08 05:40:28 +0900
+++ wine-6.8/configure.ac	2021-05-19 17:20:21 +0900
@@ -28,6 +28,11 @@
 
 dnl **** Command-line arguments ****
 
+AC_ARG_ENABLE(unixfs,AS_HELP_STRING([--disable-unixfs],[do not include unixfs support]))
+if test "x$enable_unixfs" != "xno"
+then
+    AC_DEFINE(ENABLE_UNIXFS, 1, [Define to enable unixfs]) 
+fi
 AC_ARG_ENABLE(win16, AS_HELP_STRING([--disable-win16],[do not include Win16 support]))
 AC_ARG_ENABLE(win64, AS_HELP_STRING([--enable-win64],[build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
 AC_ARG_ENABLE(tests, AS_HELP_STRING([--disable-tests],[do not build the regression tests]))
diff -urN wine-6.8-orig/dlls/krnl386.exe16/int21.c wine-6.8/dlls/krnl386.exe16/int21.c
--- wine-6.8-orig/dlls/krnl386.exe16/int21.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/krnl386.exe16/int21.c	2021-05-19 17:20:21 +0900
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "ntstatus.h"
 #include "windef.h"
 #include "winbase.h"
 #include "winreg.h"
diff -urN wine-6.8-orig/dlls/ntdll/unix/file.c wine-6.8/dlls/ntdll/unix/file.c
--- wine-6.8-orig/dlls/ntdll/unix/file.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/ntdll/unix/file.c	2021-05-19 17:22:16 +0900
@@ -3231,7 +3231,9 @@
 static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char **unix_name_ret,
                                               UINT disposition )
 {
+#if defined(ENABLE_UNIXFS)
     static const WCHAR unixW[] = {'u','n','i','x'};
+#endif
     static const WCHAR invalid_charsW[] = { INVALID_NT_CHARS, 0 };
 
     NTSTATUS status = STATUS_SUCCESS;
@@ -3265,12 +3267,14 @@
     }
     if (pos > MAX_DIR_ENTRY_LEN) return STATUS_OBJECT_NAME_INVALID;
 
+#if defined(ENABLE_UNIXFS)
     if (pos >= 4 && !memcmp( prefix, unixW, sizeof(unixW) ))
     {
         /* allow slash for unix namespace */
         if (pos > 4 && prefix[4] == '/') pos = 4;
         is_unix = pos == 4;
     }
+#endif
     prefix_len = pos;
     prefix[prefix_len] = 0;
 
@@ -3521,7 +3525,9 @@
  */
 NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt )
 {
+#if defined(ENABLE_UNIXFS)
     static const WCHAR unix_prefixW[] = {'\\','?','?','\\','u','n','i','x',0};
+#endif
     WCHAR dos_prefixW[] = {'\\','?','?','\\','A',':','\\',0};
     const WCHAR *prefix = unix_prefixW;
     unsigned int lenW, lenA = strlen(name);
@@ -3539,6 +3545,7 @@
         dos_prefixW[4] += drive;
         prefix = dos_prefixW;
     }
+#if defined(ENABLE_UNIXFS)
     else if (status != STATUS_OBJECT_PATH_NOT_FOUND) return status;
 
     lenW = wcslen( prefix );
@@ -3549,6 +3556,9 @@
     collapse_path( buffer );
     *nt = buffer;
     return STATUS_SUCCESS;
+#else
+    return status;
+#endif
 }
 
 
diff -urN wine-6.8-orig/dlls/shell32/folders.c wine-6.8/dlls/shell32/folders.c
--- wine-6.8-orig/dlls/shell32/folders.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/folders.c	2021-05-19 17:20:21 +0900
@@ -236,9 +236,11 @@
                 *piIndex = -IDI_SHELL_MY_DOCUMENTS;
             else if(IsEqualGUID(riid, &CLSID_NetworkPlaces))
                 *piIndex = -IDI_SHELL_MY_NETWORK_PLACES;
+#if defined(ENABLE_UNIXFS)
             else if(IsEqualGUID(riid, &CLSID_UnixFolder) ||
                     IsEqualGUID(riid, &CLSID_UnixDosFolder))
                 *piIndex = -IDI_SHELL_DRIVE;
+#endif
             else
                 *piIndex = -IDI_SHELL_FOLDER;
 	  }
diff -urN wine-6.8-orig/dlls/shell32/shellole.c wine-6.8/dlls/shell32/shellole.c
--- wine-6.8-orig/dlls/shell32/shellole.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/shellole.c	2021-05-19 17:20:21 +0900
@@ -82,8 +82,10 @@
 	{&CLSID_ShellFSFolder,	IFSFolder_Constructor},
 	{&CLSID_ShellItem,	IShellItem_Constructor},
 	{&CLSID_ShellLink,	IShellLink_Constructor},
+#if defined(ENABLE_UNIXFS)
 	{&CLSID_UnixDosFolder,  UnixDosFolder_Constructor},
 	{&CLSID_UnixFolder,     UnixFolder_Constructor},
+#endif
 	{&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor},
 	{&CLSID_KnownFolderManager, KnownFolderManager_Constructor},
 	{&CLSID_Shell,          IShellDispatch_Constructor},
diff -urN wine-6.8-orig/dlls/shell32/shellpath.c wine-6.8/dlls/shell32/shellpath.c
--- wine-6.8-orig/dlls/shell32/shellpath.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/shellpath.c	2021-05-19 17:20:21 +0900
@@ -4901,9 +4901,11 @@
         DWORD call_for_attr;
     } folders[] =
     {
+#if defined(ENABLE_UNIXFS)
         { &CLSID_UnixFolder, TRUE, FALSE, FALSE },
         { &CLSID_UnixDosFolder, TRUE, FALSE, FALSE,
           SFGAO_FILESYSANCESTOR|SFGAO_FOLDER|SFGAO_HASSUBFOLDER, SFGAO_FILESYSTEM },
+#endif
         { &CLSID_FolderShortcut, FALSE, FALSE, FALSE,
           SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_LINK,
           SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR },
@@ -5033,9 +5035,11 @@
             *ppidl = _ILCreateDesktop();
             break;
 
+#if defined(ENABLE_UNIXFS)
         case CSIDL_PERSONAL:
             *ppidl = _ILCreateMyDocuments();
             break;
+#endif
 
         case CSIDL_INTERNET:
             *ppidl = _ILCreateIExplore();
diff -urN wine-6.8-orig/dlls/shell32/shfldr.h wine-6.8/dlls/shell32/shfldr.h
--- wine-6.8-orig/dlls/shell32/shfldr.h	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/shfldr.h	2021-05-19 17:20:21 +0900
@@ -80,5 +80,7 @@
 void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) DECLSPEC_HIDDEN;
 BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath) DECLSPEC_HIDDEN;
 
+#if defined(ENABLE_UNIXFS)
 DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd );
 DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 );
+#endif
diff -urN wine-6.8-orig/dlls/shell32/shfldr_desktop.c wine-6.8/dlls/shell32/shfldr_desktop.c
--- wine-6.8-orig/dlls/shell32/shfldr_desktop.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/shfldr_desktop.c	2021-05-19 17:20:21 +0900
@@ -184,10 +184,12 @@
     }
     else if (PathGetDriveNumberW (lpszDisplayName) >= 0)
     {
+#if defined(ENABLE_UNIXFS)
         /* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */
         if (UNIXFS_is_rooted_at_desktop()) 
             pidlTemp = _ILCreateGuid(PT_GUID, &CLSID_UnixDosFolder);
         else
+#endif
             pidlTemp = _ILCreateMyComputer ();
         szNext = lpszDisplayName;
     }
diff -urN wine-6.8-orig/dlls/shell32/shfldr_unixfs.c wine-6.8/dlls/shell32/shfldr_unixfs.c
--- wine-6.8-orig/dlls/shell32/shfldr_unixfs.c	2021-05-08 05:40:28 +0900
+++ wine-6.8/dlls/shell32/shfldr_unixfs.c	2021-05-19 17:20:21 +0900
@@ -165,7 +165,7 @@
 #include "pidl.h"
 #include "debughlp.h"
 
-#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#if !defined(__MINGW32__) && !defined(_MSC_VER) && defined(ENABLE_UNIXFS)
 
 WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
@@ -2577,6 +2577,7 @@
  *  FALSE, if not.
  */
 BOOL UNIXFS_is_rooted_at_desktop(void) {
+#if defined(ENABLE_UNIXFS)
     HKEY hKey;
     WCHAR wszRootedAtDesktop[69 + CHARS_IN_GUID] = {
         'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
@@ -2590,5 +2591,6 @@
         RegCloseKey(hKey);
         return TRUE;
     }
+#endif
     return FALSE;
 }
diff -urN wine-6.8-orig/include/config.h.in wine-6.8/include/config.h.in
--- wine-6.8-orig/include/config.h.in	2021-05-08 05:40:28 +0900
+++ wine-6.8/include/config.h.in	2021-05-19 17:20:21 +0900
@@ -6,6 +6,9 @@
 #error config.h should not be used when cross-compiling
 #endif
 
+/* Define to enable unixfs */
+#undef ENABLE_UNIXFS
+
 /* Define to the file extension for executables. */
 #undef EXEEXT
 
