diff --git a/libheif/bitstream.cc b/libheif/bitstream.cc
index e31784aca2..cce5fe2ae6 100644
--- a/libheif/bitstream.cc
+++ b/libheif/bitstream.cc
@@ -24,7 +24,7 @@
 #include <cstring>
 #include <cassert>
 
-#if defined(GNUC) && GNUC < 9
+#if (defined(__GNUC__) && __GNUC__ < 9) || (defined(__clang__) && __clang_major__ < 10)
 #include <type_traits>
 #else
 #include <bit>
diff --git a/libheif/codecs/uncompressed/decoder_abstract.cc b/libheif/codecs/uncompressed/decoder_abstract.cc
index 60993e3bd3..a13a80fdcf 100644
--- a/libheif/codecs/uncompressed/decoder_abstract.cc
+++ b/libheif/codecs/uncompressed/decoder_abstract.cc
@@ -24,7 +24,7 @@
 #include <cassert>
 #include <utility>
 
-#if defined(GNUC) && GNUC < 9
+#if (defined(__GNUC__) && __GNUC__ < 9) || (defined(__clang__) && __clang_major__ < 10)
 #include <type_traits>
 #else
 #include <bit>