diff --git a/package/kodi-imagedecoder-heif/Config.in b/package/kodi-imagedecoder-heif/Config.in
index d0950385a0..f41b164ff4 100644
--- a/package/kodi-imagedecoder-heif/Config.in
+++ b/package/kodi-imagedecoder-heif/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF
 	bool "kodi-imagedecoder-heif"
 	depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libde265
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libde265, libheif
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif
 	select BR2_PACKAGE_LIBDE265
diff --git a/package/libheif/Config.in b/package/libheif/Config.in
index 1452cf2718..0ae86a07f4 100644
--- a/package/libheif/Config.in
+++ b/package/libheif/Config.in
@@ -3,11 +3,13 @@ config BR2_PACKAGE_LIBHEIF
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libheif is an HEIF and AVIF file format decoder and encoder.
 
 	  https://github.com/strukturag/libheif
 
-comment "libheif needs a toolchain w/ C++, gcc >= 4.8"
+comment "libheif needs a toolchain w/ C++, threads, gcc >= 4.8"
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/libheif/libheif.mk b/package/libheif/libheif.mk
index 13e8295b0e..d82ec6a0ec 100644
--- a/package/libheif/libheif.mk
+++ b/package/libheif/libheif.mk
@@ -72,17 +72,10 @@ else
 LIBHEIF_CONF_OPTS += -DWITH_X265=OFF
 endif
 
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
-LIBHEIF_CONF_OPTS += -DENABLE_MULTITHREADING_SUPPORT=ON
 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
 LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=OFF
 else
 LIBHEIF_CONF_OPTS += -DENABLE_PARALLEL_TILE_DECODING=ON
 endif
-else
-LIBHEIF_CONF_OPTS += \
-	-DENABLE_MULTITHREADING_SUPPORT=OFF \
-	-DENABLE_PARALLEL_TILE_DECODING=OFF
-endif
 
 $(eval $(cmake-package))