diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index ff2bd3e504..5d1b30a549 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -151,7 +151,7 @@ add_library(
 
 set_source_files_properties(zbic_compression.cpp PROPERTIES
     INCLUDE_DIRECTORIES "${ZBIC_INCLUDE_DIR}"
-    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function>")
+    COMPILE_OPTIONS "$<$<CXX_COMPILER_ID:Clang,GNU>:-Wno-unused-function;-Wno-missing-declarations;-Wno-shadow>")
 
 if(WIN32)
     target_sources(common PRIVATE windows/timer_resolution.cpp
diff --git a/src/common/zbic_compression.cpp b/src/common/zbic_compression.cpp
index 0ce7594d44..5e0e4d947b 100644
--- a/src/common/zbic_compression.cpp
+++ b/src/common/zbic_compression.cpp
@@ -12,8 +12,14 @@
 #define ZSTDERRORLIB_HIDDEN static
 #undef ZSTD_MULTITHREAD
 
+#if defined(__ANDROID__)
+#undef _GNU_SOURCE
+#endif
+
 #include "zstd.h"
+#define g_ZSTD_threading_useless_symbol g_ZSTD_zbic_threading_useless_symbol
 #include "zstd.c"
+#undef g_ZSTD_threading_useless_symbol
 
 namespace Common::Compression {