diff --git a/base/setup/lib/fsutil.c b/base/setup/lib/fsutil.c
index 875e8ec7f9d..1b418ce59df 100644
--- a/base/setup/lib/fsutil.c
+++ b/base/setup/lib/fsutil.c
@@ -22,7 +22,7 @@
 #include "fsutil.h"
 
 #include <fslib/vfatlib.h>
-#include <fslib/btrfslib.h>
+// #include <fslib/btrfslib.h>
 // #include <fslib/ext2lib.h>
 // #include <fslib/ntfslib.h>
 
@@ -165,9 +165,7 @@ static FILE_SYSTEM RegisteredFileSystems[] =
 #if 0
     { L"FATX" , VfatxFormat, VfatxChkdsk },
     { L"NTFS" , NtfsFormat, NtfsChkdsk },
-#endif
     { L"BTRFS", BtrfsFormat, BtrfsChkdsk },
-#if 0
     { L"EXT2" , Ext2Format, Ext2Chkdsk },
     { L"EXT3" , Ext2Format, Ext2Chkdsk },
     { L"EXT4" , Ext2Format, Ext2Chkdsk },
diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
index 4f077440ab2..bab386d6994 100644
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -3122,9 +3122,9 @@ IsSupportedActivePartition(
 
         /* NOTE: Please keep in sync with the RegisteredFileSystems list! */
         if (wcsicmp(Volume->Info.FileSystem, L"FAT")   == 0 ||
-            wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0 ||
+            wcsicmp(Volume->Info.FileSystem, L"FAT32") == 0)
          // wcsicmp(Volume->Info.FileSystem, L"NTFS")  == 0 ||
-            wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0)
+         // wcsicmp(Volume->Info.FileSystem, L"BTRFS") == 0)
         {
             return TRUE;
         }
diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
index 6516663e7fb..2acfc0bffc6 100644
--- a/base/setup/reactos/CMakeLists.txt
+++ b/base/setup/reactos/CMakeLists.txt
@@ -19,7 +19,7 @@ add_rc_deps(reactos.rc ${reactos_rc_deps})
 add_executable(reactos ${SOURCE} reactos.rc)
 add_pch(reactos reactos.h SOURCE)
 set_module_type(reactos win32gui UNICODE)
-target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib)
+target_link_libraries(reactos uuid setuplib ext2lib vfatlib)
 target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
 add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)
 add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)
diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 94ef7cffd14..f170cb1743c 100644
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -35,6 +35,6 @@ endif()
 
 add_pch(usetup usetup.h SOURCE)
 set_module_type(usetup nativecui)
-target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk)
+target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib chkstk)
 add_importlibs(usetup ntdll)
 add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)