diff --git a/Android.bp b/Android.bp
index cf5087e..86d3b14 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,5 +12,5 @@
     ],
     // -D_32BIT_FIXED_POINT should be added to cflags for devices without a FPU
     // unit such as ARM Cortex-R series or external 32-bit DSPs.
-    cflags: ["-O2", "-Werror"],
+    cflags: ["-O2", "-Werror", "-Wall", "-Wextra"],
 }
diff --git a/src/ldacBT_internal.c b/src/ldacBT_internal.c
index d399a0c..94affa4 100644
--- a/src/ldacBT_internal.c
+++ b/src/ldacBT_internal.c
@@ -149,7 +149,7 @@
     }
     return LDACBT_ERR_NONE;
 }
-DECLFUNC int ldacBT_assert_cci( int cci )
+UNUSED_ATTR DECLFUNC int ldacBT_assert_cci( int cci )
 {
     if( (cci != LDAC_CCI_STEREO )
         && (cci != LDAC_CCI_DUAL_CHANNEL )
@@ -403,7 +403,7 @@
  * The argument cci, channel_config_index, must be checked by the function ldacBT_assert_cci() before
  * calling this function.
  */
-DECLFUNC int  ldacBT_cci_to_cm( int cci )
+UNUSED_ATTR DECLFUNC int  ldacBT_cci_to_cm( int cci )
 {
     if( cci == LDAC_CCI_STEREO ){
         return LDACBT_CHANNEL_MODE_STEREO;
diff --git a/src/struct_ldac.h b/src/struct_ldac.h
index 57d2874..f4f2576 100644
--- a/src/struct_ldac.h
+++ b/src/struct_ldac.h
@@ -27,6 +27,7 @@
 ***************************************************************************************************/
 
 #define DECLFUNC static
+#define UNUSED_ATTR __attribute__((unused))
 
 #ifndef PI
 #ifdef M_PI