diff --git a/CMakeLists.txt b/CMakeLists.txt
index fec05bd3edfdf33a89612f2be67b0f05817a6c5c..1f2b29b9c5e7277247ba8998d1179df1908b0c37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ if(UNIX)
   # C compiler flags
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter -Wno-unused-function")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")
   # CLANG
   if(CLANG)
     find_program(clangBin NAMES /home/amm-archiv/soft/Linux/clang/current/bin/clang clang REQUIRED)
@@ -162,10 +162,6 @@ if(INCLUDE_SPLIT)
   endif()
 endif()
 
-if(INCLUDE_SPLIT)
-  file(GLOB libCldfbTransCodecSrcs "lib_rend/ivas_cldfb_trans_codec/*.c")
-  file(GLOB libCldfbTransCodecHeaders "lib_rend/ivas_cldfb_trans_codec/*.h")
-endif()
 file(GLOB libRendSrcs "lib_rend/*.c")
 file(GLOB libRendHeaders "lib_rend/*.h")
 if(NOT INCLUDE_SPLIT)
@@ -184,11 +180,7 @@ if(NOT INCLUDE_SPLIT)
   list(FILTER libRendHeaders EXCLUDE REGEX ".*lib_rend\/.*ivas_lcld_rom_tables.*\.h$")
 endif()
 
-if(INCLUDE_SPLIT)
-  add_library(lib_rend ${libRendSrcs} ${libCldfbTransCodecSrcs} ${libRendHeaders}  ${libCldfbTransCodecHeaders})
-else()
-  add_library(lib_rend ${libRendSrcs} ${libRendHeaders})
-endif()
+add_library(lib_rend ${libRendSrcs} ${libRendHeaders})
 target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.
 if(INCLUDE_SPLIT)
   target_link_libraries(lib_rend lib_lc3plus)
diff --git a/lib_rend/ivas_lc3plus_dec.c b/lib_rend/ivas_lc3plus_dec.c
index d2258e7e13c47c60e5ceb66fc419a5b03aa57164..5dfdb9cec794a8127d290146a7a9a1bbc9af5acf 100644
--- a/lib_rend/ivas_lc3plus_dec.c
+++ b/lib_rend/ivas_lc3plus_dec.c
@@ -40,6 +40,7 @@
 #include "ivas_error_utils.h"
 #include "wmc_auto.h"
 
+#ifdef SPLIT_REND_WITH_HEAD_ROT
 
 /*-------------------------------------------------------------------------
  * IVAS_LC3PLUS_DEC_Open()
@@ -699,3 +700,4 @@ ivas_error IVAS_LC3PLUS_DEC_Conceal(
 
     return IVAS_LC3PLUS_DEC_Decode_or_Conceal_internal( handle, bitstream_in, 0, badFrameIndicator, pcm_out );
 }
+#endif /* SPLIT_REND_WITH_HEAD_ROT */
diff --git a/lib_rend/ivas_lc3plus_enc.c b/lib_rend/ivas_lc3plus_enc.c
index dd52d243d57bcf15db212712afc7ddc23b11aad8..8751d3dacc061fb39e80f01bd06896ba068b57af 100644
--- a/lib_rend/ivas_lc3plus_enc.c
+++ b/lib_rend/ivas_lc3plus_enc.c
@@ -37,7 +37,7 @@
 #include "prot.h"
 #include "wmc_auto.h"
 
-
+#ifdef SPLIT_REND_WITH_HEAD_ROT
 /*-------------------------------------------------------------------*
  * Function IVAS_LC3PLUS_ENC_Open()
  *
@@ -331,3 +331,4 @@ ivas_error IVAS_LC3PLUS_ENC_Encode(
 
     return IVAS_ERR_OK;
 }
+#endif /* SPLIT_REND_WITH_HEAD_ROT */
diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c
index 4b49bc4315cc24b2b2810123390937a934e35aa8..3b45e1ec6578d680391a53c42780d6e97a50abdf 100644
--- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c
+++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test.c
@@ -39,6 +39,7 @@ the United Nations Convention on Contracts on the International Sales of Goods.
 #include "ivas_error_utils.h"
 
 #ifdef SPLIT_REND_WITH_HEAD_ROT
+
 #define MAX_SAMPLES_PER_CHANNEL 960
 
 static int encodeAndDecodeOneStereoFrame( LC3PLUS_CONFIG config )
diff --git a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c
index d90e98ed5bf5b601dc216964746b77806fb82166..afbcf9bd0d981bcb00781e12676bbf46b5e54533 100644
--- a/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c
+++ b/scripts/split_rendering/lc3plus/ivas_lc3plus_unit_test_selective_decoding.c
@@ -37,6 +37,8 @@ the United Nations Convention on Contracts on the International Sales of Goods.
 #include "ivas_lc3plus_dec.h"
 #include "ivas_error_utils.h"
 
+#ifdef SPLIT_REND_WITH_HEAD_ROT
+
 #define MAX_SAMPLES_PER_CHANNEL 960
 
 /* included by ivas_lc3plus_unit_test.c */
@@ -1946,9 +1948,4 @@ static int selectiveDecIvas20msLc3plus5ms_48kHz_scenario_get_active_dont_cache(
     }
     return err;
 }
-
-
-
-
-
-
+#endif /* SPLIT_REND_WITH_HEAD_ROT */