diff --git a/apps/decoder.c b/apps/decoder.c
index dbd92244ded83d335caedabb58e58af019a954c8..32d9c999fa8b09f75375a78d0b3dd97ea8a0166c 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -69,22 +69,10 @@ static
 #endif
     int32_t frame = 0; /* Counter of frames */
 
-#define MIN_NUM_BITS_ACTIVE_FRAME  56
-#define NUM_BITS_SID_IVAS_5K2      104
-#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( IVAS_MAX_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * IVAS_MAX_FRAME_SIZE )
-
-#define ORIENT_TRK_NONE        ( 0 )
-#define ORIENT_TRK_REF         ( 1 )
-#define ORIENT_TRK_AVG         ( 2 )
-#define ORIENT_TRK_REF_VEC     ( 3 )
-#define ORIENT_TRK_REF_VEC_LEV ( 4 )
-
-#ifdef VARIABLE_SPEED_DECODING
-#define VARIABLE_SPEED_FETCH_FRAMESIZE_MS 20
+#ifdef DEBUGGING
+#define MIN_NUM_BITS_ACTIVE_FRAME 56
+#define NUM_BITS_SID_IVAS_5K2     104
 #endif
-#define JBM_FRONTEND_FETCH_FRAMESIZE_MS 20
-#define HEADROTATION_FETCH_FRAMESIZE_MS 5
-#define DEFAULT_FETCH_FRAMESIZE_MS      20
 
 
 /*------------------------------------------------------------------------------------------*
@@ -129,7 +117,7 @@ typedef struct
     IVAS_DEC_INPUT_FORMAT inputFormat;
     bool customLsOutputEnabled;
     char *customLsSetupFilename;
-    int16_t orientation_tracking;
+    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;
     bool non_diegetic_pan_enabled;
     float non_diegetic_pan_gain;
     bool renderConfigEnabled;
@@ -183,7 +171,7 @@ typedef struct
 static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );
 static void usage_dec( void );
 static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
-static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec );
+static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
 static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );
 #ifdef DEBUGGING
 static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
@@ -359,7 +347,7 @@ int main(
         }
 
         /* sanity check */
-        if ( arg.orientation_tracking != ORIENT_TRK_REF )
+        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF )
         {
             fprintf( stderr, "\nError: Reference rotation file can be used in '-otr ref' mode only.\n\n" );
             goto cleanup;
@@ -386,7 +374,7 @@ int main(
         }
 
         /* sanity check */
-        if ( arg.orientation_tracking != ORIENT_TRK_REF_VEC && arg.orientation_tracking != ORIENT_TRK_REF_VEC_LEV )
+        if ( arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC && arg.orientation_tracking != IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV )
         {
             fprintf( stderr, "\nError: Reference trajectory file can be used in '-otr ref_vec' or '-otr ref_vec_lev' mode only.\n\n" );
             goto cleanup;
@@ -770,7 +758,7 @@ int main(
 
     if ( arg.voipMode )
     {
-        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec );
+        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );
     }
     else
     {
@@ -968,6 +956,10 @@ static bool parseCmdlIVAS_dec(
     int16_t i;
     char argv_to_upper[FILENAME_MAX];
 
+    /*-----------------------------------------------------------------*
+     * Set default values
+     *-----------------------------------------------------------------*/
+
 #ifdef DEBUGGING
     float ftmp;
 
@@ -976,7 +968,7 @@ static bool parseCmdlIVAS_dec(
     arg->agcBitstream = NULL;
 #endif
 #endif
-    arg->output_Fs = 48000;
+    arg->output_Fs = IVAS_MAX_SAMPLING_RATE;
     arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;
     arg->decMode = IVAS_DEC_MODE_IVAS;
     arg->quietModeEnabled = false;
@@ -986,7 +978,7 @@ static bool parseCmdlIVAS_dec(
 
     arg->enableHeadRotation = false;
     arg->headrotTrajFileName = NULL;
-    arg->orientation_tracking = ORIENT_TRK_NONE;
+    arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
     arg->enableReferenceRotation = false;
     arg->headrotTrajFileName = NULL;
     arg->enableReferenceVectorTracking = false;
@@ -1198,9 +1190,9 @@ static bool parseCmdlIVAS_dec(
                 }
                 arg->tsmScale = (uint16_t) tmp;
 
-                if ( arg->tsmScale < 50 || arg->tsmScale > 150 )
+                if ( arg->tsmScale < IVAS_TIME_SCALE_MIN || arg->tsmScale > IVAS_TIME_SCALE_MAX )
                 {
-                    fprintf( stderr, "Error: Scaling factor value must be 50 <= fac <= 150!\n\n" );
+                    fprintf( stderr, "Error: Scaling factor value must be IVAS_TIME_SCALE_MIN <= fac <= IVAS_TIME_SCALE_MAX!\n\n" );
                     usage_dec();
                     return false;
                 }
@@ -1275,23 +1267,23 @@ static bool parseCmdlIVAS_dec(
 
             if ( strcmp( argv_to_upper, "NONE" ) == 0 )
             {
-                arg->orientation_tracking = ORIENT_TRK_NONE;
+                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_NONE;
             }
             else if ( strcmp( argv_to_upper, "REF" ) == 0 )
             {
-                arg->orientation_tracking = ORIENT_TRK_REF;
+                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF;
             }
             else if ( strcmp( argv_to_upper, "AVG" ) == 0 )
             {
-                arg->orientation_tracking = ORIENT_TRK_AVG;
+                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_AVG;
             }
             else if ( strcmp( argv_to_upper, "REF_VEC" ) == 0 )
             {
-                arg->orientation_tracking = ORIENT_TRK_REF_VEC;
+                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC;
             }
             else if ( strcmp( argv_to_upper, "REF_VEC_LEV" ) == 0 )
             {
-                arg->orientation_tracking = ORIENT_TRK_REF_VEC_LEV;
+                arg->orientation_tracking = IVAS_HEAD_ORIENT_TRK_REF_VEC_LEV;
             }
             else
             {
@@ -1686,7 +1678,7 @@ static void usage_dec( void )
 #ifdef DEBUGGING
 #ifdef VARIABLE_SPEED_DECODING
     fprintf( stdout, "-VS fac             : Variable Speed mode: change speed of playout fac as integer in percent.\n" );
-    fprintf( stdout, "                      50 <= fac <= 150; fac<100 faster, fac>100 slower\n" );
+    fprintf( stdout, "                      IVAS_TIME_SCALE_MIN <= fac <= IVAS_TIME_SCALE_MAX; fac<100 faster, fac>100 slower\n" );
 #endif
 #endif
     fprintf( stdout, "-fr L               : render frame size in ms L=(5,10,20), default is 20)\n" );
@@ -3023,14 +3015,15 @@ static ivas_error decodeVoIP(
     RotFileReader *refRotReader,
     Vector3PairFileReader *referenceVectorReader,
     ObjectEditFileReader *objectEditFileReader,
-    IVAS_DEC_HANDLE hIvasDec )
+    IVAS_DEC_HANDLE hIvasDec,
+    int16_t *pcmBuf )
 {
     bool decodingFailed = true; /* Assume failure until cleanup is reached without errors */
     ivas_error error = IVAS_ERR_OK;
 
     uint32_t nextPacketRcvTime_ms = 0;
     uint32_t systemTime_ms = 0;
-    uint32_t systemTimeInc_ms = (uint32_t) JBM_FRONTEND_FETCH_FRAMESIZE_MS;
+    uint32_t systemTimeInc_ms = (uint32_t) ( 1000 / IVAS_NUM_FRAMES_PER_SEC );
     int32_t nFramesFed = 0;
 
     uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];
@@ -3044,7 +3037,6 @@ static ivas_error decodeVoIP(
     MasaFileWriter *masaWriter = NULL;
     uint16_t numObj = 0;
 
-    int16_t pcmBuf[MAX_OUTPUT_PCM_BUFFER_SIZE];
     AudioFileWriter *afWriter = NULL;
 #ifdef SUPPORT_JBM_TRACEFILE
     JbmTraceFileWriter *jbmTraceWriter = NULL;
diff --git a/apps/encoder.c b/apps/encoder.c
index c91acdea23727619a4798430ea3c14c370d80ee1..9bf625bc972c3e94cff543cfe01b5b47f93ec185 100644
--- a/apps/encoder.c
+++ b/apps/encoder.c
@@ -154,7 +154,6 @@ typedef struct
  * Local functions prototypes
  *------------------------------------------------------------------------------------------*/
 
-static void initArgStruct( EncArguments *arg );
 static bool parseCmdlIVAS_enc( int16_t argc, char *argv[], EncArguments *arg );
 static void usage_enc( void );
 static bool readBandwidth( FILE *file, IVAS_ENC_BANDWIDTH *bandwidth, int32_t *bandwidthFrameCounter );
@@ -207,8 +206,6 @@ int main(
     reset_mem( USE_BYTES );
 #endif
 
-    initArgStruct( &arg );
-
     /*------------------------------------------------------------------------------------------*
      * Parse command-line arguments
      *------------------------------------------------------------------------------------------*/
@@ -878,14 +875,29 @@ cleanup:
  * Local functions
  *-------------------------------------------------------------------*/
 
-#define IVAS_DEFAULT_AGC ( 0 )
+/*---------------------------------------------------------------------*
+ * parseCmdlIVAS_enc()
+ *
+ * Encoder command-line parsing
+ *---------------------------------------------------------------------*/
 
-static void initArgStruct( EncArguments *arg )
+static bool parseCmdlIVAS_enc(
+    int16_t argc,
+    char *argv[],
+    EncArguments *arg )
 {
-    /* Set default values here */
+    int16_t i, j;
+    char argv_to_upper[FILENAME_MAX];
+    char stmp[FILENAME_MAX];
+    int32_t tmp;
+
+    /*-----------------------------------------------------------------*
+     * Set default values
+     *-----------------------------------------------------------------*/
+
     arg->inputWavFilename = NULL;
     arg->outputBitstreamFilename = NULL;
-    arg->inputFs = 0;
+    arg->inputFs = IVAS_MAX_SAMPLING_RATE;
     arg->inputFormat = IVAS_ENC_INPUT_MONO;
     arg->is_binaural = false;
     arg->inputFormatConfig.stereoToMonoDownmix = false;
@@ -919,25 +931,9 @@ static void initArgStruct( EncArguments *arg )
 #endif
     arg->pca = false;
 
-    return;
-}
-
-
-/*---------------------------------------------------------------------*
- * parseCmdlIVAS_enc()
- *
- * Encoder command-line parsing
- *---------------------------------------------------------------------*/
-
-static bool parseCmdlIVAS_enc(
-    int16_t argc,
-    char *argv[],
-    EncArguments *arg )
-{
-    int16_t i, j;
-    char argv_to_upper[FILENAME_MAX];
-    char stmp[FILENAME_MAX];
-    int32_t tmp;
+    /*-----------------------------------------------------------------*
+     * Initialization
+     *-----------------------------------------------------------------*/
 
     if ( argc < 5 )
     {
diff --git a/apps/isar_post_rend.c b/apps/isar_post_rend.c
index 64aab53ed057511ce8f8a2079e1b6903933aadc9..bf08f63796ff15674050563d2a4552a046225c7e 100644
--- a/apps/isar_post_rend.c
+++ b/apps/isar_post_rend.c
@@ -945,7 +945,7 @@ int main(
 
     memset( outBuffer.data, 0, outBuffer.config.numSamplesPerChannel * outBuffer.config.numChannels * sizeof( float ) );
 
-    bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;
+    bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;
 
     if ( bitsBufferSize > 0 )
     {
diff --git a/apps/renderer.c b/apps/renderer.c
index 775a9d6ee930b1c47be50ed13eee4f104a8bb5fa..1fb83acc5ae1689af041495acb51c5cd2e031916 100644
--- a/apps/renderer.c
+++ b/apps/renderer.c
@@ -168,7 +168,7 @@ typedef struct
     char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
     char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
     char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
-    int8_t orientation_tracking;
+    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;
     int16_t Opt_Headrotation;
     int16_t Opt_ExternalOrientation;
     int16_t nonDiegeticPan;
@@ -1436,7 +1436,7 @@ int main(
 
     if ( is_split_pre_rend_mode( &args ) )
     {
-        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;
+        bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;
     }
     else
     {
@@ -2268,7 +2268,7 @@ static bool parseRenderFramesize(
 
 static bool parseOrientationTracking(
     char *value,
-    int8_t *orientation_tracking )
+    IVAS_HEAD_ORIENT_TRK_T *orientation_tracking )
 {
     to_upper( value );
 
diff --git a/lib_com/common_api_types.h b/lib_com/common_api_types.h
index 7e3e86ec43e6a81e100c12327d2299bfc0497e4c..dd1f707ffb1ba7b4780b49a37617a37f4c9aa1fc 100644
--- a/lib_com/common_api_types.h
+++ b/lib_com/common_api_types.h
@@ -44,24 +44,27 @@
  * Common API constants
  *----------------------------------------------------------------------------------*/
 
-#define IVAS_NUM_FRAMES_PER_SEC 50
-#define IVAS_MAX_FRAME_SIZE     ( 48000 / IVAS_NUM_FRAMES_PER_SEC )
-#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )
+#define IVAS_NUM_FRAMES_PER_SEC 50                                                   /* number of frames per second */
+#define IVAS_MAX_SAMPLING_RATE  48000                                                /* maximum supported sampling rate in Hz */
+#define IVAS_MAX_FRAME_SIZE     ( IVAS_MAX_SAMPLING_RATE / IVAS_NUM_FRAMES_PER_SEC ) /* maximum frame buffer length (per channel) in samples */
+#define IVAS_MAX_BITS_PER_FRAME ( 512000 / IVAS_NUM_FRAMES_PER_SEC )                 /* maximum bits per frame; corresponds to maximum bitrate of 512 kbps */
 
 #define IVAS_MAX_NUM_OBJECTS       4
 #define IVAS_MAX_INPUT_CHANNELS    16
-#define IVAS_MAX_OUTPUT_CHANNELS   16
+#define IVAS_MAX_OUTPUT_CHANNELS   16 /* Note: there is an exception for OSBA and EXT otuput where it can be 20 (HOA3 + 4 ISM channels) */
 #define IVAS_CLDFB_NO_COL_MAX      16
 #define IVAS_CLDFB_NO_CHANNELS_MAX 60
 
+/* Renderer constants */
 #define IVAS_MAX_PARAM_SPATIAL_SUBFRAMES 4
 #define IVAS_ROOM_ABS_COEFF              6
+#define IVAS_REVERB_PREDELAY_MAX         20 /* Max input delay for reverb module */
+#define IVAS_ER_LIST_HEIGHT              1.6f
 
-/* Maximum buffer length (per channel) in samples */
-#define MAX_BUFFER_LENGTH_PER_CHANNEL ( L_FRAME48k )
+/* JBM constants for adaptive-playout */
+#define IVAS_TIME_SCALE_MIN 50  /* min. time-scaling [%] */
+#define IVAS_TIME_SCALE_MAX 150 /* max. time-scaling [%] */
 
-/* Frame size required when rendering to binaural */
-#define BINAURAL_RENDERING_FRAME_SIZE_MS 5
 
 /*----------------------------------------------------------------------------------*
  * Common API enum for output audio configurations
@@ -174,12 +177,12 @@ typedef enum
 typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
 typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;
 
-typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;
+typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;
 typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;
-typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
-typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
-typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
-typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;
+typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;
+typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;
+typedef struct ivas_hrtf_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;
+typedef struct ivas_cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;
 
 typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;
 typedef struct ivas_LS_setup_custom IVAS_LSSETUP_CUSTOM_STRUCT;
@@ -228,7 +231,7 @@ typedef enum _ivas_binaural_renderer_type
 #define ISAR_MAX_SPLIT_REND_BITRATE                   768000
 #define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )
 #define ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ      1
-#define SPLIT_REND_BITS_BUFF_SIZE                     ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )
+#define ISAR_SPLIT_REND_BITS_BUFF_SIZE                ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )
 
 typedef enum
 {
@@ -306,8 +309,8 @@ typedef enum
     IVAS_RENDER_TYPE_OVERRIDE_FASTCONV
 
 } IVAS_RENDER_TYPE_OVERRIDE;
-#endif
 
+#endif
 typedef struct _IVAS_ROOM_ACOUSTICS_CONFIG
 {
     int16_t nBands;                                   /* Number of frequency bands for which reverb properties are provided, integer, range [2..256]        */
@@ -350,6 +353,7 @@ typedef struct
 {
     IVAS_REND_AudioBufferConfig config;
     float *data;
+
 } IVAS_REND_AudioBuffer;
 
 #endif /* COMMON_API_TYPES_H */
diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 8a9e8dea1924480f48ec57f3d0555b274c4e373b..d2c2db4900af8458e78632f5d67bbd3674a80d58 100755
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -133,7 +133,7 @@ typedef enum
 #define MAX_INTERN_CHANNELS                     16                          /* Maximum number of intern channels (HOA 3rd order) */
 #define HEAD_ROTATION_HOA_ORDER                 3                           /* HOA 3rd order */
 #define MAX_CICP_CHANNELS                       16                          /* max channels for loudspeaker layouts (16 for custom layouts)*/
-#define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order), == IVAS_MAX_OUTPUT_CHANNELS */
+#define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order) without separate objects in combined formats */
 #define MAX_OUTPUT_CHANNELS_IN_DIEGETIC_PAN     2                           /* Maximum number of output channels with non diegetic panning */
 
 #define BINAURAL_CHANNELS                       2                           /* number of channels for binaural output configuration */
@@ -1490,7 +1490,6 @@ typedef enum
 #define HRTF_SH_CHANNELS                        HOA3_CHANNELS
 #define HRTF_LS_CHANNELS                        15
 #define HRTF_NUM_BINS                           60
-#define REVERB_PREDELAY_MAX                     20                          /* Max input delay for reverb module */
 #define GAIN_LFE                                1.88364911f                 /* Gain applied to LFE during renderering */
 #define LOW_BIT_RATE_BINAURAL_EQ_BINS           17                          /* Number of bins in an EQ applied at low bit rates in binauralization */
 #define LOW_BIT_RATE_BINAURAL_EQ_OFFSET         14                          /* Offset of bins where the low-bit-rate EQ starts*/
@@ -1722,9 +1721,7 @@ typedef enum
  *----------------------------------------------------------------------------------*/
 
 #define ER_RADIUS                               (1.0f)
-#define ER_LIST_ORIGIN_X                        (0.0f)
-#define ER_LIST_ORIGIN_Y                        (0.0f)
-#define ER_LIST_HEIGHT                          (1.6f)
+#define ER_LIST_HEIGHT                          IVAS_ER_LIST_HEIGHT
 
 
 /*----------------------------------------------------------------------------------*
diff --git a/lib_com/stat_com.h b/lib_com/stat_com.h
index 622a07eb1f84f4effef66fd4f09ded4af332e43c..4f459ef531af9409ffe1733321edba991b965cad 100644
--- a/lib_com/stat_com.h
+++ b/lib_com/stat_com.h
@@ -573,7 +573,7 @@ typedef struct
 
 } FrameSizeParams;
 
-typedef struct cldfb_filter_bank_struct
+typedef struct ivas_cldfb_filter_bank_struct
 {
     int16_t no_channels;
     int16_t no_col;
diff --git a/lib_dec/jbm_pcmdsp_apa.h b/lib_dec/jbm_pcmdsp_apa.h
index 26c380e38a16e5230fc773e090514e64042d1d92..a728cb53d346366279f716c756017a71eda89711 100644
--- a/lib_dec/jbm_pcmdsp_apa.h
+++ b/lib_dec/jbm_pcmdsp_apa.h
@@ -39,9 +39,9 @@
 #ifndef JBM_PCMDSP_APA_H
 #define JBM_PCMDSP_APA_H JBM_PCMDSP_APA_H
 
+#include "common_api_types.h"
 #include <stdbool.h>
-#include <stdint.h>
-#include "options.h"
+
 
 /*
 ********************************************************************************
@@ -50,17 +50,17 @@
 */
 
 /* size of IO buffers (a_in[], a_out[]) for apa_exec() */
-#define APA_BUF_PER_CHANNEL  ( 960 * 3 )
+#define APA_BUF_PER_CHANNEL  ( IVAS_MAX_FRAME_SIZE * 3 )
 #define APA_MAX_NUM_CHANNELS 16
 #define APA_BUF              ( APA_BUF_PER_CHANNEL * APA_MAX_NUM_CHANNELS )
 
 /* min/max sampling rate [Hz] */
 #define APA_MIN_RATE 1000
-#define APA_MAX_RATE 48000
+#define APA_MAX_RATE IVAS_MAX_SAMPLING_RATE
 
 /* min/max  scaling [%] */
-#define APA_MIN_SCALE 50
-#define APA_MAX_SCALE 150
+#define APA_MIN_SCALE IVAS_TIME_SCALE_MIN
+#define APA_MAX_SCALE IVAS_TIME_SCALE_MAX
 
 #define APA_SM_SURROUND       1
 #define APA_SM_LOGARITHMIC    2
diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c
index 37b50287ad714e62d7754339bf05a4a26dacc877..93f05178020560a28f70b9128a7630dc85f504cc 100644
--- a/lib_dec/lib_dec.c
+++ b/lib_dec/lib_dec.c
@@ -2613,7 +2613,7 @@ ivas_error IVAS_DEC_GetFormat(
 
 
 /*---------------------------------------------------------------------*
- * getInputBufferSize()
+ * getOutputBufferSize()
  *
  * Get size of output buffer in samples
  *---------------------------------------------------------------------*/
diff --git a/lib_isar/isar_cnst.h b/lib_isar/isar_cnst.h
index a2eecd7426ea9e413e8ba695be3869fc1aaec094..b7065bac4cbb78325df48cf9008b212e883afae3 100644
--- a/lib_isar/isar_cnst.h
+++ b/lib_isar/isar_cnst.h
@@ -110,7 +110,7 @@ typedef enum
 #define ISAR_SPLIT_REND_ROT_AXIS_BITS       3
 #define ISAR_SPLIT_REND_RO_FLAG_BITS        1
 
-#define IVAS_LC3PLUS_MAX_NUM_DECODERS       2
+#define ISAR_LC3PLUS_MAX_NUM_DECODERS       2
 
 /*----------------------------------------------------------------------------------*
  * Split rendering bitrate constants
diff --git a/lib_isar/isar_lc3plus_dec.c b/lib_isar/isar_lc3plus_dec.c
index 01296ebaa76c2e10daacbd7d9ec0dd972f32aec2..560f34f1c46077a88416829e3c748c11caf75e2b 100644
--- a/lib_isar/isar_lc3plus_dec.c
+++ b/lib_isar/isar_lc3plus_dec.c
@@ -66,9 +66,9 @@ ivas_error ISAR_LC3PLUS_DEC_Open(
         return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for LC3plus wrapper handle\n" );
     }
 
-    if ( config.channels > IVAS_LC3PLUS_MAX_NUM_DECODERS )
+    if ( config.channels > ISAR_LC3PLUS_MAX_NUM_DECODERS )
     {
-        return IVAS_ERROR( IVAS_ERR_INIT_ERROR, "Maximum number of channels exceeds IVAS_LC3PLUS_MAX_NUM_DECODERS\n" );
+        return IVAS_ERROR( IVAS_ERR_INIT_ERROR, "Maximum number of channels exceeds ISAR_LC3PLUS_MAX_NUM_DECODERS\n" );
     }
 
     ( *handle )->num_decs = 0;
diff --git a/lib_isar/isar_stat.h b/lib_isar/isar_stat.h
index acdddd83938c685c31aec5211e335030916cc9d2..587c3c8ea7309fc6a4fe0fe3cbc66dbebfdcd0f8 100644
--- a/lib_isar/isar_stat.h
+++ b/lib_isar/isar_stat.h
@@ -48,9 +48,9 @@
  *  ISAR post rend constants
  *-------------------------------------------------------------------*/
 
-#define MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL ( MAX_BUFFER_LENGTH_PER_CHANNEL * 2 )
+#define MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL ( L_FRAME_MAX * 2 )
 #define MAX_CLDFB_BUFFER_LENGTH             ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )
-#define MAX_BIN_BUFFER_LENGTH               ( MAX_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS )
+#define MAX_BIN_BUFFER_LENGTH               ( L_FRAME_MAX * BINAURAL_CHANNELS )
 #define MAX_CLDFB_BIN_BUFFER_LENGTH         ( MAX_CLDFB_BUFFER_LENGTH_PER_CHANNEL * BINAURAL_CHANNELS )
 
 /*-------------------------------------------------------------------*
diff --git a/lib_isar/lib_isar_post_rend.c b/lib_isar/lib_isar_post_rend.c
index 7e050abc068ffad6beb394193e3b8bf346a2ad61..82870621677b67808e7cce7a08a7dbc7568391eb 100644
--- a/lib_isar/lib_isar_post_rend.c
+++ b/lib_isar/lib_isar_post_rend.c
@@ -1037,8 +1037,8 @@ ivas_error ISAR_POST_REND_FeedInputAudio(
 
     cldfb2tdSampleFact = ( inputAudio.config.is_cldfb ) ? 2 : 1;
 
-    if ( inputAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) ||
-         ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) )
+    if ( inputAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) ||
+         ( ( L_FRAME_MAX * cldfb2tdSampleFact ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Buffer size outside of supported range" );
     }
@@ -1652,8 +1652,8 @@ ivas_error ISAR_POST_REND_getSamples(
 
     cldfb2tdSampleFact = ( outAudio.config.is_cldfb ) ? 2 : 1;
 
-    if ( outAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
-         ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
+    if ( outAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
+         ( ( L_FRAME_MAX * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
     {
         return IVAS_ERR_INVALID_BUFFER_SIZE;
     }
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb.c
index 98a46150c1a3310beaad952d94f5ee7333293309..2811a3c4d03ec644555e7daa56eca3dd233f1638 100644
--- a/lib_rend/ivas_reverb.c
+++ b/lib_rend/ivas_reverb.c
@@ -158,9 +158,9 @@ static void ivas_binaural_reverb_setPreDelay(
         return;
     }
 
-    if ( delaySamples > REVERB_PREDELAY_MAX )
+    if ( delaySamples > IVAS_REVERB_PREDELAY_MAX )
     {
-        hReverb->preDelayBufferLength = REVERB_PREDELAY_MAX;
+        hReverb->preDelayBufferLength = IVAS_REVERB_PREDELAY_MAX;
 
         return;
     }
@@ -1784,7 +1784,7 @@ static ivas_error ivas_binaural_reverb_open(
     hReverb->numBins = numBins;
     hReverb->blockSize = numCldfbSlotsPerFrame;
 
-    for ( k = 0; k < REVERB_PREDELAY_MAX + 1; k++ )
+    for ( k = 0; k < IVAS_REVERB_PREDELAY_MAX + 1; k++ )
     {
         set_f( hReverb->preDelayBufferReal[k], 0.0f, hReverb->numBins );
         set_f( hReverb->preDelayBufferImag[k], 0.0f, hReverb->numBins );
diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils.c
index b2c0fb3cbb9df8a195d5fba59ac3c77b8b52fa7d..855d47673cf13a6c40daa4be91eb53e95b1b4739 100644
--- a/lib_rend/ivas_reverb_utils.c
+++ b/lib_rend/ivas_reverb_utils.c
@@ -47,7 +47,6 @@
  *-----------------------------------------------------------------------------------------*/
 
 #define DEFAULT_SRC_DIST          ( 1.5f ) /* default source distance [m] for reverb dmx factor computing */
-#define MAX_SAMPLING_RATE         ( 48000 )
 #define CLDFB_CONVOLVER_NTAPS_MAX ( 16 )
 #define FFT_SPECTRUM_SIZE         ( 1 + ( RV_FILTER_MAX_FFT_SIZE / 2 ) )
 
@@ -92,7 +91,7 @@ ivas_error ivas_reverb_prepare_cldfb_params(
 
     for ( idx = 0; idx < CLDFB_NO_CHANNELS_MAX; idx++ )
     {
-        fc[idx] = ( (float) idx + 0.5f ) * ( (float) MAX_SAMPLING_RATE / (float) ( 2 * CLDFB_NO_CHANNELS_MAX ) );
+        fc[idx] = ( (float) idx + 0.5f ) * ( (float) IVAS_MAX_SAMPLING_RATE / (float) ( 2 * IVAS_CLDFB_NO_CHANNELS_MAX ) );
     }
 
     ivas_reverb_interpolate_acoustic_data( pInput_params->nBands, pInput_params->pFc_input, pInput_params->pAcoustic_rt60, pInput_params->pAcoustic_dsr, CLDFB_NO_CHANNELS_MAX, fc, pOutput_t60, pOutput_ene );
@@ -135,9 +134,9 @@ static void ivas_reverb_set_energies(
     float *avg_pwr_right )
 {
     int16_t freq_idx;
-    const int16_t cldfb_freq_halfstep = MAX_SAMPLING_RATE / ( 4 * CLDFB_NO_CHANNELS_MAX );
+    const int16_t cldfb_freq_halfstep = IVAS_MAX_SAMPLING_RATE / ( 4 * IVAS_CLDFB_NO_CHANNELS_MAX );
     float input_fc[FFT_SPECTRUM_SIZE];
-    float output_fc[CLDFB_NO_CHANNELS_MAX];
+    float output_fc[IVAS_CLDFB_NO_CHANNELS_MAX];
     const int16_t avg_pwr_len = sampling_rate == 16000 ? LR_IAC_LENGTH_NR_FC_16KHZ : LR_IAC_LENGTH_NR_FC;
 
     for ( freq_idx = 0; freq_idx < avg_pwr_len; freq_idx++ )
@@ -145,10 +144,10 @@ static void ivas_reverb_set_energies(
         input_fc[freq_idx] = freq_idx * ( 0.5f * sampling_rate / (float) ( avg_pwr_len - 1 ) );
     }
 
-    for ( freq_idx = 0; freq_idx < CLDFB_NO_CHANNELS_MAX; freq_idx++ )
+    for ( freq_idx = 0; freq_idx < IVAS_CLDFB_NO_CHANNELS_MAX; freq_idx++ )
     {
         output_fc[freq_idx] = (float) ( ( 2 * freq_idx + 1 ) * cldfb_freq_halfstep );
     }
 
-    ivas_reverb_interpolate_acoustic_data( avg_pwr_len, input_fc, avg_pwr_l, avg_pwr_r, CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );
+    ivas_reverb_interpolate_acoustic_data( avg_pwr_len, input_fc, avg_pwr_l, avg_pwr_r, IVAS_CLDFB_NO_CHANNELS_MAX, output_fc, avg_pwr_left, avg_pwr_right );
 }
diff --git a/lib_rend/ivas_stat_rend.h b/lib_rend/ivas_stat_rend.h
index 8969b3188fa852766696f58b5730bbd3cccc37d0..e990c336f69e0d8c2e45520c92754ff21f3a992d 100644
--- a/lib_rend/ivas_stat_rend.h
+++ b/lib_rend/ivas_stat_rend.h
@@ -452,8 +452,8 @@ typedef struct ivas_binaural_reverb_struct
 {
     float *loopBufReal[CLDFB_NO_CHANNELS_MAX];
     float *loopBufImag[CLDFB_NO_CHANNELS_MAX];
-    float preDelayBufferReal[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX];
-    float preDelayBufferImag[REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX];
+    float preDelayBufferReal[IVAS_REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX];
+    float preDelayBufferImag[IVAS_REVERB_PREDELAY_MAX + 1][CLDFB_NO_CHANNELS_MAX];
     float **tapPointersReal[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS];
     float **tapPointersImag[CLDFB_NO_CHANNELS_MAX][BINAURAL_CHANNELS];
 
@@ -495,7 +495,7 @@ typedef struct ivas_diffuse_distribution_data_structure
 } DIFFUSE_DISTRIBUTION_DATA, *DIFFUSE_DISTRIBUTION_HANDLE;
 
 /* Parametric binaural renderer HRTF structure */
-typedef struct ivas_hrtfs_parambin_struct
+typedef struct ivas_hrtf_parambin_struct
 {
     float hrtfShCoeffsRe[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];
     float hrtfShCoeffsIm[BINAURAL_CHANNELS][HRTF_SH_CHANNELS][HRTF_NUM_BINS];
@@ -1026,7 +1026,7 @@ typedef struct
 } TDREND_MIX_Listener_t;
 
 /* HR filter */
-typedef struct TDREND_HRFILT_FiltSet_struct
+typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct
 {
     int32_t SampleRate; /* Sample rate of the HR filter */
     int16_t NumPos;
@@ -1245,7 +1245,7 @@ typedef struct ivas_binaural_rendering_struct
  *------------------------------------------------------------------------------------------*/
 
 /* Fastconv binaural data structure */
-typedef struct ivas_hrtfs_fastconv_struct
+typedef struct ivas_hrtf_fastconv_struct
 {
     float FASTCONV_latency_s;
     float ***leftReal;
@@ -1263,7 +1263,7 @@ typedef struct ivas_hrtfs_fastconv_struct
 } HRTFS_FASTCONV, *HRTFS_FASTCONV_HANDLE;
 
 
-typedef struct ivas_hrtfs_statistics_struct
+typedef struct ivas_hrtf_statistics_struct
 {
     const float *average_energy_l;
     const float *average_energy_r;
diff --git a/lib_rend/lib_rend.c b/lib_rend/lib_rend.c
index e3e5c2faa2d9e2ce691a64febb02d650681791d2..2d77b66ed67f1a287b1ed9a2ef145badee6e80ca 100644
--- a/lib_rend/lib_rend.c
+++ b/lib_rend/lib_rend.c
@@ -51,7 +51,7 @@
  *-------------------------------------------------------------------*/
 
 /* Maximum buffer length (total) in samples. */
-#define MAX_BUFFER_LENGTH     ( MAX_BUFFER_LENGTH_PER_CHANNEL * MAX_INPUT_CHANNELS )
+#define MAX_BUFFER_LENGTH     ( L_FRAME_MAX * MAX_INPUT_CHANNELS )
 #define MAX_BIN_DELAY_SAMPLES 150 /* Maximum supported rendering latency for binaural IRs */
 
 /*-------------------------------------------------------------------*
@@ -3956,8 +3956,8 @@ ivas_error IVAS_REND_FeedInputAudio(
 
     cldfb2tdSampleFact = ( inputAudio.config.is_cldfb ) ? 2 : 1;
 
-    if ( inputAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) ||
-         ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) )
+    if ( inputAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 0 ) ||
+         ( ( L_FRAME_MAX * cldfb2tdSampleFact ) < inputAudio.config.numSamplesPerChannel && inputAudio.config.is_cldfb == 1 ) )
     {
         return IVAS_ERROR( IVAS_ERR_INVALID_BUFFER_SIZE, "Buffer size outside of supported range" );
     }
@@ -5727,7 +5727,7 @@ static ivas_error renderLfeToBinaural(
     int16_t pose_idx, num_poses;
     float gain;
     int16_t ear_idx;
-    float tmpLfeBuffer[MAX_BUFFER_LENGTH_PER_CHANNEL];
+    float tmpLfeBuffer[L_FRAME_MAX];
     int16_t frame_size, num_cpy_smpl_cur_frame, num_cpy_smpl_prev_frame;
     const float *lfeInput;
     float *writePtr;
@@ -7355,8 +7355,8 @@ static ivas_error getSamplesInternal(
 
     cldfb2tdSampleFact = ( outAudio.config.is_cldfb ) ? 2 : 1;
 
-    if ( outAudio.config.numSamplesPerChannel <= 0 || ( MAX_BUFFER_LENGTH_PER_CHANNEL < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
-         ( ( MAX_BUFFER_LENGTH_PER_CHANNEL * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
+    if ( outAudio.config.numSamplesPerChannel <= 0 || ( L_FRAME_MAX < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 0 ) ||
+         ( ( L_FRAME_MAX * cldfb2tdSampleFact ) < outAudio.config.numSamplesPerChannel && outAudio.config.is_cldfb == 1 ) )
     {
         return IVAS_ERR_INVALID_BUFFER_SIZE;
     }
diff --git a/lib_rend/lib_rend.h b/lib_rend/lib_rend.h
index 806f7983a85f304bce0b87c181d9a238d2a8b453..f71a1a5384af99db36a33a7ac77f696011c1fb36 100644
--- a/lib_rend/lib_rend.h
+++ b/lib_rend/lib_rend.h
@@ -41,12 +41,16 @@
  * Renderer constants
  *---------------------------------------------------------------------*/
 
-#define RENDERER_MAX_ISM_INPUTS         4
+#define RENDERER_MAX_ISM_INPUTS         IVAS_MAX_NUM_OBJECTS
 #define RENDERER_MAX_MC_INPUTS          1
 #define RENDERER_MAX_SBA_INPUTS         1
 #define RENDERER_MAX_MASA_INPUTS        1
 #define RENDERER_MAX_INPUT_LFE_CHANNELS 4
 
+/* Frame size required when rendering to binaural */
+#define BINAURAL_RENDERING_FRAME_SIZE_MS 5
+
+
 /*---------------------------------------------------------------------*
  * Renderer structures
  *---------------------------------------------------------------------*/
diff --git a/lib_util/ambi_convert.c b/lib_util/ambi_convert.c
index b8208824a4050ef52cc9ef9c88f003949d7dda0c..282f4a08726273423d57d4986c8cad17d2666b1e 100644
--- a/lib_util/ambi_convert.c
+++ b/lib_util/ambi_convert.c
@@ -29,7 +29,7 @@
    the United Nations Convention on Contracts on the International Sales of Goods.
 
 *******************************************************************************************************/
-#include <stdint.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include "ambi_convert.h"
diff --git a/lib_util/audio_file_reader.c b/lib_util/audio_file_reader.c
index ca5e6e4963b676da58526fbb30a3cf07d9f34f77..1b52daaa772cf7bf0487f178202f1107c59af36c 100644
--- a/lib_util/audio_file_reader.c
+++ b/lib_util/audio_file_reader.c
@@ -32,9 +32,6 @@
 
 #include "audio_file_reader.h"
 #include "tinywavein_c.h"
-#include <stdint.h>
-#include <stdio.h>
-#include "wmc_auto.h"
 
 struct AudioFileReader
 {
diff --git a/lib_util/audio_file_writer.c b/lib_util/audio_file_writer.c
index fb7a64c425b6f648667a969290b6086c11158887..321063101959dc6ecab0a60103f1f2de3246a52e 100644
--- a/lib_util/audio_file_writer.c
+++ b/lib_util/audio_file_writer.c
@@ -32,9 +32,8 @@
 
 #include "audio_file_writer.h"
 #include "tinywaveout_c.h"
-#include <stdio.h>
 #include <string.h>
-#include "wmc_auto.h"
+
 
 struct AudioFileWriter
 {
diff --git a/lib_util/bitstream_reader.c b/lib_util/bitstream_reader.c
index 45c82ed4c889158c02e451c1fe0c76dd2b562670..a250a34a70323023220c7345f0c7424ff730af18 100644
--- a/lib_util/bitstream_reader.c
+++ b/lib_util/bitstream_reader.c
@@ -33,7 +33,6 @@
 #include "bitstream_reader.h"
 #include "g192.h"
 #include "mime_io.h"
-#include "ivas_error.h"
 #include "ivas_error_utils.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib_util/ls_custom_file_reader.c b/lib_util/ls_custom_file_reader.c
index 01d1f0307ad721fc38ffa53ff338563ab5c792ad..48c87a88eae79e998a5dc7774c9962932d7f5f5f 100644
--- a/lib_util/ls_custom_file_reader.c
+++ b/lib_util/ls_custom_file_reader.c
@@ -34,7 +34,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "ivas_prot.h"
-#include "prot.h"
 
 
 struct LsCustomFileReader
@@ -126,6 +125,13 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate(
     float azi_tmp[IVAS_MAX_OUTPUT_CHANNELS];
     float ele_tmp[IVAS_MAX_OUTPUT_CHANNELS];
 
+    for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
+    {
+        dup[i] = 0;
+        azi_tmp[i] = 0.0f;
+        ele_tmp[i] = 0.0f;
+    }
+
     if ( *num_azi != *num_ele )
     {
         return LS_CUSTOM_FILEREADER_NUM_SPK_MISMATCH_ERROR;
@@ -150,7 +156,6 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate(
 
     /* Check for and flag duplicate loudspeakers */
     dup_count = 0;
-    set_s( dup, 0, IVAS_MAX_OUTPUT_CHANNELS );
     for ( i = 0; i < *num_azi; i++ )
     {
         for ( j = i + 1; j < *num_azi; j++ )
@@ -163,9 +168,6 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate(
     }
 
     /* Remove duplicates from array */
-    set_zero( azi_tmp, IVAS_MAX_OUTPUT_CHANNELS );
-    set_zero( ele_tmp, IVAS_MAX_OUTPUT_CHANNELS );
-
     for ( i = 0, j = 0; i < *num_azi; i++ )
     {
         if ( dup[i] )
@@ -179,8 +181,12 @@ static LS_CUSTOM_FILEREADER_ERROR CustomLoudspeakerLayout_validate(
     }
 
     ( *num_azi ) -= dup_count;
-    mvr2r( azi_tmp, azi, IVAS_MAX_OUTPUT_CHANNELS );
-    mvr2r( ele_tmp, ele, IVAS_MAX_OUTPUT_CHANNELS );
+
+    for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
+    {
+        azi[i] = azi_tmp[i];
+        ele[i] = ele_tmp[i];
+    }
 
     return LS_CUSTOM_FILEREADER_NO_ERROR;
 }
@@ -237,16 +243,19 @@ LS_CUSTOM_FILEREADER_ERROR CustomLsFileReading(
     char line[200]; /* > (10 chars * IVAS_MAX_OUTPUT_CHANNELS) i.e. "-999,     " */
     const char *tok;
 
-    int16_t num_azi, num_ele, num_lfe;
+    int16_t i, num_azi, num_ele, num_lfe;
 
     /* initialize variables */
     num_azi = 0;
     num_ele = 0;
     num_lfe = 0;
 
-    set_zero( hLsCustomData->azimuth, IVAS_MAX_OUTPUT_CHANNELS );
-    set_zero( hLsCustomData->elevation, IVAS_MAX_OUTPUT_CHANNELS );
-    set_s( hLsCustomData->lfe_idx, -1, IVAS_MAX_OUTPUT_CHANNELS );
+    for ( i = 0; i < IVAS_MAX_OUTPUT_CHANNELS; i++ )
+    {
+        hLsCustomData->lfe_idx[i] = -1;
+        hLsCustomData->azimuth[i] = 0.0f;
+        hLsCustomData->elevation[i] = 0.0f;
+    }
 
     if ( hLsCustomReader->file == NULL )
     {
diff --git a/lib_util/obj_edit_file_reader.c b/lib_util/obj_edit_file_reader.c
index b003110743bcff570a1621e5c64ab12264e951a7..9963e722bae33266b9edaecb07f2920be73123db 100644
--- a/lib_util/obj_edit_file_reader.c
+++ b/lib_util/obj_edit_file_reader.c
@@ -30,12 +30,19 @@ the United Nations Convention on Contracts on the International Sales of Goods.
 
 *******************************************************************************************************/
 
+#include "obj_edit_file_reader.h"
 #include <stdlib.h>
 #include <string.h>
-#include "obj_edit_file_reader.h"
-#include "prot.h"
 
 
+#ifndef min
+#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
+#endif
+
+#ifndef max
+#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
+#endif
+
 /*-----------------------------------------------------------------------*
  * ObjectEditFileReader_open()
  *
diff --git a/lib_util/render_config_reader.c b/lib_util/render_config_reader.c
index fed68002a7071b092ef446b067fe9b8ea7bc97c1..dd3e84ac8700575362f5a97adbeba571b7dfd69a 100644
--- a/lib_util/render_config_reader.c
+++ b/lib_util/render_config_reader.c
@@ -35,9 +35,7 @@
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include "cmdl_tools.h"
-#include "prot.h"
 
 
 /*------------------------------------------------------------------------------------------*
@@ -58,9 +56,9 @@
 #define ACOUSTIC_DSR_MAX            ( 1.0e+2f )
 #define ACOUSTIC_DSR_EPSILON        ( 1.0e-15f )
 #define ACOUSTICPREDELAY_JOTREV_MIN ( SHORTEST_REV_DEL_LINE )
-#define ACOUSTICPREDELAY_JOTREV_MAX ( SHORTEST_REV_DEL_LINE + 1.0f / (float) FRAMES_PER_SEC )
-#define ACOUSTICPREDELAY_FDREV_MIN  ( 1.0f / (float) ( 16 * FRAMES_PER_SEC ) )
-#define ACOUSTICPREDELAY_FDREV_MAX  ( (float) ( REVERB_PREDELAY_MAX ) / (float) ( 16 * FRAMES_PER_SEC ) )
+#define ACOUSTICPREDELAY_JOTREV_MAX ( SHORTEST_REV_DEL_LINE + 1.0f / (float) IVAS_NUM_FRAMES_PER_SEC )
+#define ACOUSTICPREDELAY_FDREV_MIN  ( 1.0f / (float) ( 16 * IVAS_NUM_FRAMES_PER_SEC ) )
+#define ACOUSTICPREDELAY_FDREV_MAX  ( (float) ( IVAS_REVERB_PREDELAY_MAX ) / (float) ( 16 * IVAS_NUM_FRAMES_PER_SEC ) )
 #define INPUTPREDELAY_MIN           ( 0.0f )
 #define INPUTPREDELAY_MAX           ( 1.0e+2f )
 
@@ -69,6 +67,24 @@
 #define ER_MIN_ABS_COEFF      ( 0.0f )
 #define ER_MAX_ABS_COEFF      ( 1.0f )
 
+#define IVAS_ER_LIST_ORIGIN_X 0.0f
+#define IVAS_ER_LIST_ORIGIN_Y 0.0f
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef min
+#define min( x, y ) ( ( x ) < ( y ) ? ( x ) : ( y ) )
+#endif
+
+#ifndef max
+#define max( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
+#endif
+
 /*------------------------------------------------------------------------------------------*
  * Local Type definitions
  *------------------------------------------------------------------------------------------*/
@@ -945,8 +961,30 @@ static ivas_error read_txt_bool(
         *pTarget = FALSE;
         return IVAS_ERR_OK;
     }
+
     return IVAS_ERR_INVALID_RENDER_CONFIG;
 }
+
+
+/*-------------------------------------------------------------------*
+ * usdequant_rend_cfg()
+ *
+ * Uniform scalar de-quantizer routine
+ *-------------------------------------------------------------------*/
+
+static float usdequant_rend_cfg(
+    const uint32_t idx, /* i  : quantizer index                 */
+    const float qlow,   /* i  : lowest codebook entry (index 0) */
+    const float delta   /* i  : quantization step               */
+)
+{
+    float g;
+
+    g = idx * delta + qlow;
+
+    return ( g );
+}
+
 /*-----------------------------------------------------------------------------------------*
  * Function get_bin_angle()
  * Gets an angle value in degrees [0,360]
@@ -965,7 +1003,7 @@ static ivas_error get_bin_angle(
         return error;
     }
 
-    *pResult = usdequant( (int16_t) value, 0.0f, 20.0f );
+    *pResult = usdequant_rend_cfg( value, 0.0f, 20.0f );
 
     return IVAS_ERR_OK;
 }
@@ -989,7 +1027,7 @@ static ivas_error get_bin_outer_attenuation(
         return error;
     }
 
-    logval = usdequant( (int16_t) value, -90.0f, 3.0f );
+    logval = usdequant_rend_cfg( value, -90.0f, 3.0f );
     att = powf( 10, logval / 20.0f );
 
     *pResult = att;
@@ -1015,7 +1053,7 @@ static ivas_error get_bin_max_dist(
         return error;
     }
 
-    *pResult = usdequant( (int16_t) value, 1.0f, 1.0f );
+    *pResult = usdequant_rend_cfg( value, 1.0f, 1.0f );
 
     return IVAS_ERR_OK;
 }
@@ -1038,7 +1076,7 @@ static ivas_error get_bin_ref_dist(
         return error;
     }
 
-    *pResult = usdequant( (int16_t) value, 0.1f, 0.1f );
+    *pResult = usdequant_rend_cfg( value, 0.1f, 0.1f );
 
     return IVAS_ERR_OK;
 }
@@ -1061,7 +1099,7 @@ static ivas_error get_bin_rolloff(
         return error;
     }
 
-    *pResult = usdequant( (int16_t) value, 0.0f, 0.1f );
+    *pResult = usdequant_rend_cfg( value, 0.0f, 0.1f );
 
     return IVAS_ERR_OK;
 }
@@ -1807,9 +1845,9 @@ static ivas_error RenderConfigReader_readBinary(
                     {
                         return IVAS_ERR_FAILED_ALLOC;
                     }
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->x = ER_LIST_ORIGIN_X;
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->y = ER_LIST_ORIGIN_Y;
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->z = ER_LIST_HEIGHT;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->x = IVAS_ER_LIST_ORIGIN_X;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->y = IVAS_ER_LIST_ORIGIN_Y;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->z = IVAS_ER_LIST_HEIGHT;
                 }
 
                 /* Low complexity mode */
@@ -2971,9 +3009,9 @@ ivas_error RenderConfigReader_getAcousticEnvironment(
                     {
                         return IVAS_ERR_FAILED_ALLOC;
                     }
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->x = ER_LIST_ORIGIN_X;
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->y = ER_LIST_ORIGIN_Y;
-                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->z = ER_LIST_HEIGHT;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->x = IVAS_ER_LIST_ORIGIN_X;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->y = IVAS_ER_LIST_ORIGIN_Y;
+                    pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin->z = IVAS_ER_LIST_HEIGHT;
                 }
                 pAcEnv->ListenerOrigin = *pRenderConfigReader->pAE[n].pEarlyReflections->pListenerOrigin;
                 for ( j = 0; j < IVAS_ROOM_ABS_COEFF; j++ )
@@ -3004,7 +3042,7 @@ ivas_error RenderConfigReader_getDirectivity(
     float *directivity                       /* o  : Target directivity                     */
 )
 {
-    uint16_t n, m;
+    uint16_t n, m, i;
     uint16_t last_specified_id;
     bool idExists;
 
@@ -3014,7 +3052,7 @@ ivas_error RenderConfigReader_getDirectivity(
     }
     if ( pRenderConfigReader->pDP == NULL )
     {
-        for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
+        for ( n = 0; n < IVAS_MAX_NUM_OBJECTS; n++ )
         {
             directivity[n * 3] = 360.0f;
             directivity[n * 3 + 1] = 360.0f;
@@ -3026,7 +3064,7 @@ ivas_error RenderConfigReader_getDirectivity(
         last_specified_id = id[0];
 
         /* set unpspecified Directivity Patterns ID to last specified ID */
-        for ( n = MAX_NUM_OBJECTS - 1; n > 0; n-- )
+        for ( n = IVAS_MAX_NUM_OBJECTS - 1; n > 0; n-- )
         {
             if ( id[n] != 65535 )
             {
@@ -3040,13 +3078,13 @@ ivas_error RenderConfigReader_getDirectivity(
             last_specified_id = (uint16_t) pRenderConfigReader->pDP[0].id;
         }
 
-        for ( ; n < MAX_NUM_OBJECTS; n++ )
+        for ( ; n < IVAS_MAX_NUM_OBJECTS; n++ )
         {
             id[n] = last_specified_id;
         }
 
 
-        for ( n = 0; n < MAX_NUM_OBJECTS; n++ )
+        for ( n = 0; n < IVAS_MAX_NUM_OBJECTS; n++ )
         {
             idExists = false;
             for ( m = 0; m < pRenderConfigReader->nDP; m++ )
@@ -3054,7 +3092,10 @@ ivas_error RenderConfigReader_getDirectivity(
                 if ( id[n] == pRenderConfigReader->pDP[m].id )
                 {
                     idExists = true;
-                    mvr2r( pRenderConfigReader->pDP[m].pDirectivity, directivity + ( n * 3 ), 3 );
+                    for ( i = 0; i < 3; i++ )
+                    {
+                        directivity[n * 3 + i] = pRenderConfigReader->pDP[m].pDirectivity[i];
+                    }
                     break;
                 }
             }
diff --git a/lib_util/rotation_file_reader.c b/lib_util/rotation_file_reader.c
index b948a51524b2c6bf4412eb974e51ec8ec529f8f0..f659fbb9fa558c8312f2b8c1c3b909f73b980474 100644
--- a/lib_util/rotation_file_reader.c
+++ b/lib_util/rotation_file_reader.c
@@ -33,8 +33,7 @@
 #include "rotation_file_reader.h"
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include "prot.h"
+#include <stdbool.h>
 
 
 struct RotFileReader
diff --git a/lib_util/split_rend_bfi_file_reader.c b/lib_util/split_rend_bfi_file_reader.c
index 15d5b24d66d65136565afd2ec81b70ebd8e75362..70e695048ef0b88f8a1550f418f9c65f54c6687f 100644
--- a/lib_util/split_rend_bfi_file_reader.c
+++ b/lib_util/split_rend_bfi_file_reader.c
@@ -30,11 +30,11 @@
 
 *******************************************************************************************************/
 
-#include <stdint.h>
-#include "options.h"
 #include "split_rend_bfi_file_reader.h"
 #include <string.h>
-#include "prot.h"
+#include <stdbool.h>
+#include <stdlib.h>
+
 
 struct SplitRendBFIFileReader
 {
diff --git a/lib_util/split_render_file_read_write.c b/lib_util/split_render_file_read_write.c
index 9cc6e4bf7e33946f0b77d5794bf5794cc82770a0..3afd0682809001aa8e9f572ac639ac0041f31a44 100644
--- a/lib_util/split_render_file_read_write.c
+++ b/lib_util/split_render_file_read_write.c
@@ -30,10 +30,10 @@
 
 *******************************************************************************************************/
 
-#include <stdint.h>
 #include "split_render_file_read_write.h"
+#include "ivas_error_utils.h"
 #include <string.h>
-#include "prot.h"
+#include <stdlib.h>
 
 
 /*------------------------------------------------------------------------------------------*
diff --git a/lib_util/tsm_scale_file_reader.c b/lib_util/tsm_scale_file_reader.c
index e61f80763ddab05f01a294ae510e2059f8d0c6b3..653fc0f2f6f99f6d0d274cbe2adfc63d33123edb 100644
--- a/lib_util/tsm_scale_file_reader.c
+++ b/lib_util/tsm_scale_file_reader.c
@@ -32,10 +32,10 @@
 
 #include "tsm_scale_file_reader.h"
 #include "cmdl_tools.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+
 #ifdef DEBUGGING
 #ifdef VARIABLE_SPEED_DECODING
 
diff --git a/lib_util/vector3_pair_file_reader.c b/lib_util/vector3_pair_file_reader.c
index a6aee3eefb31c7276e2b7e0e1775e34e72da767e..8a46a97d1d2f8920bd5daf2d90283ac13c9087b1 100644
--- a/lib_util/vector3_pair_file_reader.c
+++ b/lib_util/vector3_pair_file_reader.c
@@ -31,12 +31,8 @@
 *******************************************************************************************************/
 
 #include "vector3_pair_file_reader.h"
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdint.h>
-#include "prot.h"
-#include "options.h" /* only included to get access to the feature-defines */
 
 
 struct Vector3PairFileReader
diff --git a/readme.txt b/readme.txt
index fa9397c31b17488b8d2826bc46a2bffbc5706ee8..f656e6ee64ab26df17f995df975c287d0a818c7c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -397,7 +397,7 @@ Where the first two rows are comma separated azimuth and elevation positions of
 The output channel ordering is 0, 1, ... N-1. The third row contains an index "LFE0" (zero based) 
 specifying the output channel to which the LFE input will be routed if present. If the third row is 
 omitted, the LFE input is downmixed to all channels with a factor of 1/N. Position is not considered for
-the LFE channel.
+the LFE channel. Maximum number of supported loudskpeakers N is 16.
 An example custom loudspeaker layout file is available: ls_setup_16ch_8+4+4.txt