diff --git a/lib_com/options.h b/lib_com/options.h
index 94c706fa81a15e4daa25928bf4c7e001d1ea28fe..94e2ae1529ffa58d53faca3e75596b8c4a7ae178 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -155,6 +155,7 @@
 #define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */
 #define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */
 #define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */
+#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_rend/ivas_NoiseGen.c b/lib_rend/ivas_NoiseGen.c
index e4a24fabd8d653cb5fa3b1043d7b36952a2cc783..ecd7d7b098181201a8d9cfe7be56fc25501a0c14 100644
--- a/lib_rend/ivas_NoiseGen.c
+++ b/lib_rend/ivas_NoiseGen.c
@@ -39,7 +39,7 @@
 #include "ivas_prot_rend.h"
 #include "wmc_auto.h"
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*------------------------------------------------------------------------------------------*
  * Function CreateNoiseGen()
  *
@@ -80,7 +80,7 @@ NoiseGen *CreateNoiseGen( void )
 
     return psNoiseGen;
 }
-
+#endif
 
 /*------------------------------------------------------------------------------------------*
  * Function DeleteNoiseGen()
diff --git a/lib_rend/ivas_RMSEnvGrouping.c b/lib_rend/ivas_RMSEnvGrouping.c
index 770165ba6fb07d13cbba26733e9874f15d39bcff..53cd3ab6b8e5dd2849b4dd09f971da3546a15c48 100644
--- a/lib_rend/ivas_RMSEnvGrouping.c
+++ b/lib_rend/ivas_RMSEnvGrouping.c
@@ -275,7 +275,7 @@ static void ComputeBandEnergy(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function TryMerge()
  *
@@ -375,7 +375,7 @@ static float TryMerge(
 
     return fMeanCost;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * Function ComputeMergeRMS()
@@ -588,7 +588,7 @@ static float TryMerge2(
     return fMergedCost;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups()
  *
@@ -650,8 +650,9 @@ static void ComputeGreedyGroups(
 
     return;
 }
+#endif
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups2()
  *
@@ -702,7 +703,7 @@ static void ComputeGreedyGroups2(
 
     return;
 }
-
+#endif
 
 /*-------------------------------------------------------------------*
  * Function ComputeGreedyGroups3()
@@ -917,9 +918,9 @@ void ComputeEnvelopeGrouping(
     }
 
     /* Perform grouping via Greedy Merge */
-
+#ifndef FIX_917_LCLD_WARNINGS
     /* ComputeGreedyGroups2( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths );*/
-
+#endif
     /* Allows control over max groups can call using 16 if want same as previous call */
     ComputeGreedyGroups3( psRMSEnvelopeGrouping, iChannels, iNumBands, piBandwidths, LCLD_BLOCKS_PER_FRAME );
 
diff --git a/lib_rend/ivas_lcld_encoder.c b/lib_rend/ivas_lcld_encoder.c
index 127aaea5c82d6b421ed39b5d01ac7cad15f6c7f8..4bc64df16a70dc678da9abf04e76a07c3b3c3ea7 100644
--- a/lib_rend/ivas_lcld_encoder.c
+++ b/lib_rend/ivas_lcld_encoder.c
@@ -483,7 +483,9 @@ static int32_t CountLCLDBits( const int32_t iNumGroups, const int32_t *piGroupLe
 
 static int32_t WriteHeaderInformation( const int32_t iNumBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );
 
+#ifdef ENABLE_PMOD_ADJUST
 static int32_t WritePmodInformation( const int32_t **ppiHiSMRFlags, IVAS_SPLIT_REND_BITS_HANDLE pBits, int32_t iChannels, int32_t iNumBands );
+#endif
 
 static int32_t WriteMSInformation( const int32_t iNumBands, const int32_t iMSMode, const int32_t *piMSFlags, const int32_t *piLRPhaseDiffs, const int32_t *piMSPredCoefs, int32_t iNumMSPredBands, IVAS_SPLIT_REND_BITS_HANDLE pBits );
 
@@ -1198,7 +1200,7 @@ static void QuantizeSpectrumDPCM_Opt(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 static void QuantizeSpectrumDPCM(
     const int32_t iNumGroups,
     const int32_t *piGroupLengths,
@@ -1334,7 +1336,7 @@ static void QuantizeSpectrumDPCM(
 
     return;
 }
-
+#endif
 
 static int32_t CountLCLDBits(
     const int32_t iNumGroups,
diff --git a/lib_rend/ivas_lcld_prot.h b/lib_rend/ivas_lcld_prot.h
index ad35e50f0096b570da5a585ac0b310b0d2b62945..1ff4e37e55377aa940a0ae600bac33b709a42364 100644
--- a/lib_rend/ivas_lcld_prot.h
+++ b/lib_rend/ivas_lcld_prot.h
@@ -195,9 +195,11 @@ typedef struct NOISE_GEN
     float *pfNoiseBuffer;
 } NoiseGen;
 
+#ifndef FIX_917_LCLD_WARNINGS
 NoiseGen *CreateNoiseGen( 
     void 
 );
+#endif
 
 void DeleteNoiseGen( 
     NoiseGen *psNoiseGen 
diff --git a/lib_rend/ivas_splitRendererPost.c b/lib_rend/ivas_splitRendererPost.c
index 8eb542892e983dfa68d7cc97c53f2dd67f43af8b..8b513f3d87efea7c00c8ccfdf7d90300e6c2d3e6 100644
--- a/lib_rend/ivas_splitRendererPost.c
+++ b/lib_rend/ivas_splitRendererPost.c
@@ -163,7 +163,7 @@ void ivas_splitBinPostRendClose(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_huffman_code_bits_present()
  *
@@ -195,7 +195,7 @@ static int32_t ivas_split_rend_huffman_code_bits_present(
 
     return index;
 }
-
+#endif
 
 /*-----------------------------------------------------------------------------------------*
  * Function ivas_split_rend_huffman_decode_opt()
@@ -1161,7 +1161,7 @@ static void get_interpolation_vars(
     return;
 }
 
-
+#ifndef FIX_917_LCLD_WARNINGS
 /*-----------------------------------------------------------------------------------------*
  * Function interpolate_gain_matrix()
  *
@@ -1212,7 +1212,7 @@ static void interpolate_gain_matrix(
 
     return;
 }
-
+#endif
 
 /*-----------------------------------------------------------------------------------------*
  * Function interpolate_pred_matrix()