diff --git a/libheif/bitstream.cc b/libheif/bitstream.cc
index 9063718179..e31784aca2 100644
--- a/libheif/bitstream.cc
+++ b/libheif/bitstream.cc
@@ -23,7 +23,12 @@
 #include <utility>
 #include <cstring>
 #include <cassert>
+
+#if defined(GNUC) && GNUC < 9
+#include <type_traits>
+#else
 #include <bit>
+#endif
 
 #define MAX_UVLC_LEADING_ZEROS 20
 
diff --git a/libheif/codecs/uncompressed/decoder_abstract.cc b/libheif/codecs/uncompressed/decoder_abstract.cc
index bbe469204e..60993e3bd3 100644
--- a/libheif/codecs/uncompressed/decoder_abstract.cc
+++ b/libheif/codecs/uncompressed/decoder_abstract.cc
@@ -23,7 +23,12 @@
 #include <iostream>
 #include <cassert>
 #include <utility>
+
+#if defined(GNUC) && GNUC < 9
+#include <type_traits>
+#else
 #include <bit>
+#endif
 
 #include "common_utils.h"
 #include "context.h"