diff --git a/test/sbc/sbc_decoder.h b/src/classic/sbc_decoder.h
similarity index 100%
rename from test/sbc/sbc_decoder.h
rename to src/classic/sbc_decoder.h
diff --git a/test/sbc/sbc_decoder_bludroid.c b/src/classic/sbc_decoder_bludroid.c
similarity index 97%
rename from test/sbc/sbc_decoder_bludroid.c
rename to src/classic/sbc_decoder_bludroid.c
index 1beee9a36..cb32e3d2e 100644
--- a/test/sbc/sbc_decoder_bludroid.c
+++ b/src/classic/sbc_decoder_bludroid.c
@@ -156,8 +156,8 @@ void sbc_decoder_process_data(sbc_decoder_state_t * state, uint8_t * buffer, int
                 break;
             }
             
-            int frameBytes = OI_CODEC_SBC_CalculateFramelen(&(bd_decoder_state->decoder_context.common.frameInfo));
-            //printf("frame bytes %d\n", frameBytes);
+            // int frameBytes = OI_CODEC_SBC_CalculateFramelen(&(bd_decoder_state->decoder_context.common.frameInfo));
+            // printf("frame bytes %d\n", frameBytes);
 
             state->handle_pcm_data(bd_decoder_state->pcm_data, 
                                         sbc_decoder_num_samples_per_frame(state), 
diff --git a/test/sbc/Makefile b/test/sbc/Makefile
index 8f001aa00..0bcf799c6 100644
--- a/test/sbc/Makefile
+++ b/test/sbc/Makefile
@@ -10,7 +10,7 @@ include ${SBC_ENCODER_ROOT}/Makefile.inc
 SBC_DECODER_OBJ  = $(SBC_DECODER:.c=.o) 
 SBC_ENCODER_OBJ  = $(SBC_ENCODER:.c=.o)
 
-CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${SBC_DECODER_ROOT}/include -I${SBC_ENCODER_ROOT}/include -D PRINT_SAMPLES -D PRINT_SCALEFACTORS -D OI_DEBUG -D SBC_NO_PCM_CPY_OPTION
+CFLAGS  = -g -Wall -I. -I../ -I${BTSTACK_ROOT}/src -I${BTSTACK_ROOT}/src/classic -I${SBC_DECODER_ROOT}/include -I${SBC_ENCODER_ROOT}/include -D PRINT_SAMPLES -D PRINT_SCALEFACTORS -D OI_DEBUG -D SBC_NO_PCM_CPY_OPTION
 # -D TRACE_EXECUTION -D CODEC_DEBUG 
 LDFLAGS += -lCppUTest -lCppUTestExt
 VPATH += ${SBC_DECODER_ROOT}/srce 
@@ -27,7 +27,7 @@ SBC_TESTS = sbc_decoder_test sbc_encoder_test
 
 all: ${SBC_TESTS}
 
-sbc_decoder_test: ${SBC_DECODER_OBJ} ${COMMON_OBJ} sbc_decoder_bludroid.o sbc_decoder_test.o  
+sbc_decoder_test: ${SBC_DECODER_OBJ} ${COMMON_OBJ} ${BTSTACK_ROOT}/src/classic/sbc_decoder_bludroid.o sbc_decoder_test.o  
 	${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
 
 sbc_encoder_test: ${SBC_ENCODER_OBJ} sbc_encoder_test.o