diff --git a/port/libusb/CMakeLists.txt b/port/libusb/CMakeLists.txt
index d26ec3320..ee360934c 100644
--- a/port/libusb/CMakeLists.txt
+++ b/port/libusb/CMakeLists.txt
@@ -39,6 +39,12 @@ elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
 	# using Visual Studio C++
 endif()
 
+# to find generated .h from .gatt files
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# local dir for btstack_config.h after build dir to avoid using .h from Makefile
+include_directories(.)
+
 include_directories(../../3rd-party/micro-ecc)
 include_directories(../../3rd-party/bluedroid/decoder/include)
 include_directories(../../3rd-party/bluedroid/encoder/include)
@@ -56,7 +62,6 @@ include_directories(../../platform/posix)
 include_directories(../../platform/embedded)
 include_directories(../../platform/lwip)
 include_directories(../../platform/lwip/port)
-include_directories(.)
 
 file(GLOB SOURCES_SRC       "../../src/*.c" "../../example/sco_demo_util.c")
 file(GLOB SOURCES_BLE       "../../src/ble/*.c")
diff --git a/src/classic/hfp_ag.c b/src/classic/hfp_ag.c
index 64c84123e..75bf1d6fe 100644
--- a/src/classic/hfp_ag.c
+++ b/src/classic/hfp_ag.c
@@ -1158,7 +1158,6 @@ static void hfp_ag_handle_reject_outgoing_call(void){
 
 // hfp_connection is used to identify originating HF
 static void hfp_ag_call_sm(hfp_ag_call_event_t event, hfp_connection_t * hfp_connection){
-    int indicator_index;
     int callsetup_indicator_index = get_ag_indicator_index_for_name("callsetup");
     int callheld_indicator_index = get_ag_indicator_index_for_name("callheld");
     int call_indicator_index = get_ag_indicator_index_for_name("call");
diff --git a/test/pts/CMakeLists.txt b/test/pts/CMakeLists.txt
index 8c158786b..c3fb3be2b 100644
--- a/test/pts/CMakeLists.txt
+++ b/test/pts/CMakeLists.txt
@@ -62,7 +62,12 @@ endif()
 # enable optional features
 add_compile_definitions(ENABLE_TESTING_SUPPORT ENABLE_LE_SIGNED_WRITE)
 
+# to find generated .h from .gatt files
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+# local dir for btstack_config.h after build dir to avoid using .h from Makefile
 include_directories(.)
+
 include_directories(../../3rd-party/micro-ecc)
 include_directories(../../3rd-party/bluedroid/decoder/include)
 include_directories(../../3rd-party/bluedroid/encoder/include)