diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 5b8572189..4beac0db8 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -463,7 +463,9 @@ isEfiFilesystemSuitable(const Partition* candidate)
             }
             cWarning() << "FAT32 filesystem is too small (" << size << "bytes)";
             return false;
+#ifdef WITH_KPMCORE4API
         case FileSystem::Type::Fat12:
+#endif
         case FileSystem::Type::Fat16:
             cWarning() << "FAT12 and FAT16 are probably not supported by EFI";
             return false;
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 61e7d2fdc..233f5117a 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -152,9 +152,11 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
         case FileSystem::Lvm2_PV:
         case FileSystem::Udf:
         case FileSystem::Iso9660:
+#ifdef WITH_KPMCORE4API
         case FileSystem::Luks2:
         case FileSystem::LinuxRaidMember:
         case FileSystem::BitLocker:
+#endif
             // bad bad
             cWarning() << "The selected default FS" << defaultFsType << "is not suitable." << "Using ext4 instead.";
             defaultFsType = FileSystem::Ext4;
@@ -173,7 +175,6 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
         case FileSystem::F2fs:
             // ok
             break;
-        case FileSystem::Fat12:
         case FileSystem::Fat16:
         case FileSystem::Hfs:
         case FileSystem::HfsPlus:
@@ -181,8 +182,11 @@ PartitionLayout::setDefaultFsType(FileSystem::Type defaultFsType)
         case FileSystem::Hpfs:
         case FileSystem::Zfs:
         case FileSystem::Nilfs2:
+#ifdef WITH_KPMCORE4API
+        case FileSystem::Fat12:
         case FileSystem::Apfs:
         case FileSystem::Minix:
+#endif
             // weird
             cWarning() << "The selected default FS" << defaultFsType << "is unusual, but not wrong.";
             break;