diff --git a/embdrv/sbc/BUILD.gn b/embdrv/sbc/BUILD.gn
index 696080a..a3449aa 100644
--- a/embdrv/sbc/BUILD.gn
+++ b/embdrv/sbc/BUILD.gn
@@ -35,6 +35,10 @@
   include_dirs = [ "decoder/include" ]
 }
 
+config("sbc_encoder_includes_config") {
+  include_dirs = ["encoder/include"]
+}
+
 source_set("sbc_encoder") {
   sources = [
     "encoder/srce/sbc_analysis.c",
@@ -47,11 +51,7 @@
     "encoder/srce/sbc_packing.c",
   ]
 
-  include_dirs = [
-    "encoder/include",
-    "//internal_include",
-    "//stack/include",
-  ]
+  public_configs = [":sbc_encoder_includes_config"]
 }
 
 static_library("sbc") {
diff --git a/embdrv/sbc/encoder/include/sbc_encoder.h b/embdrv/sbc/encoder/include/sbc_encoder.h
index 53a04a2..a63d78e 100644
--- a/embdrv/sbc/encoder/include/sbc_encoder.h
+++ b/embdrv/sbc/encoder/include/sbc_encoder.h
@@ -27,8 +27,6 @@
 
 #define ENCODER_VERSION "0025"
 
-#include "bt_target.h"
-
 /*DEFINES*/
 #ifndef FALSE
 #define FALSE 0
diff --git a/embdrv/sbc/encoder/include/sbc_types.h b/embdrv/sbc/encoder/include/sbc_types.h
index 211c693..0aece6f 100644
--- a/embdrv/sbc/encoder/include/sbc_types.h
+++ b/embdrv/sbc/encoder/include/sbc_types.h
@@ -27,9 +27,6 @@
 
 #include <stdint.h>
 
-#include "bt_target.h"
-#include "bt_types.h"
-
 #define abs32(x) (((x) >= 0) ? (x) : (-(x)))
 
 #endif
diff --git a/embdrv/sbc/encoder/srce/sbc_encoder.c b/embdrv/sbc/encoder/srce/sbc_encoder.c
index 54212ad..35f5413 100644
--- a/embdrv/sbc/encoder/srce/sbc_encoder.c
+++ b/embdrv/sbc/encoder/srce/sbc_encoder.c
@@ -24,7 +24,6 @@
 
 #include "sbc_encoder.h"
 #include <string.h>
-#include "bt_target.h"
 #include "sbc_enc_func_declare.h"
 
 int16_t EncMaxShiftCounter;