diff --git a/bundle.json b/bundle.json
index 93938dbfc075c196b75195dfb1129a1d98e30091..8ab60af475059359ad837d6569530097663a5929 100644
--- a/bundle.json
+++ b/bundle.json
@@ -75,11 +75,17 @@
           "name": "//base/security/security_component_manager/services/security_component_service/sa:security_component_common",
           "header": {
             "header_files": [
+              "i_sec_comp_probe.h",
+              "sec_comp_base.h",
+              "sec_comp_enhance_adapter.h",
+              "sec_comp_err.h",
+              "sec_comp_info.h",
+              "security_component_service_ipc_interface_code.h",
               "delay_exit_task.h",
               "sec_comp_info_helper.h",
               "sec_event_handler.h"
             ],
-            "header_base": "//base/security/security_component_manager/interfaces/inner_api/security_component_common"
+            "header_base": "//base/security/security_component_manager/interfaces/inner_api/security_component/include"
           }
         }
       ],
diff --git a/frameworks/BUILD.gn b/frameworks/BUILD.gn
index 584cc1595518432087040c925945cb935b4813f7..4e930039059160bed79fec257cd196d38e63c02e 100644
--- a/frameworks/BUILD.gn
+++ b/frameworks/BUILD.gn
@@ -19,7 +19,6 @@ config("security_component_framework_src_set_config") {
   include_dirs = [
     "common/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
   ]
 }
@@ -69,7 +68,6 @@ config("security_component_enhance_adapter_src_set_config") {
     "common/include",
     "enhance_adapter/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
   ]
 }
@@ -179,7 +177,6 @@ ohos_source_set("security_component_no_cfi_enhance_adapter_src_set") {
   include_dirs = [
     "common/include",
     "enhance_adapter/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
   ]
diff --git a/frameworks/inner_api/security_component/BUILD.gn b/frameworks/inner_api/security_component/BUILD.gn
index e3088354c669161e3b79ffcd0e4c73358e7d0aa9..0cd4f48318349eef769a0003c9cdcf9dc1911541 100644
--- a/frameworks/inner_api/security_component/BUILD.gn
+++ b/frameworks/inner_api/security_component/BUILD.gn
@@ -36,7 +36,6 @@ ohos_shared_library("libsecurity_component_sdk") {
     "${sec_comp_root_dir}/frameworks/enhance_adapter/include/",
     "${sec_comp_root_dir}/frameworks/inner_api/enhance_kits/include",
     "${sec_comp_root_dir}/frameworks/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
   ]
 
   sources = [
diff --git a/frameworks/inner_api/security_component/test/BUILD.gn b/frameworks/inner_api/security_component/test/BUILD.gn
index cfa52e3f0e0b3d2c8b30f6ff46d5c0813a43a1e1..727b3639ae398b1c8ae6d5b807cc89a60a194052 100644
--- a/frameworks/inner_api/security_component/test/BUILD.gn
+++ b/frameworks/inner_api/security_component/test/BUILD.gn
@@ -78,7 +78,6 @@ ohos_unittest("sec_comp_register_callback_test") {
     "${sec_comp_root_dir}/frameworks/common/include",
     "${sec_comp_root_dir}/frameworks/security_component/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
   ]
 
diff --git a/interfaces/inner_api/security_component_common/delay_exit_task.h b/interfaces/inner_api/security_component/include/delay_exit_task.h
similarity index 100%
rename from interfaces/inner_api/security_component_common/delay_exit_task.h
rename to interfaces/inner_api/security_component/include/delay_exit_task.h
diff --git a/interfaces/inner_api/security_component_common/sec_comp_info_helper.h b/interfaces/inner_api/security_component/include/sec_comp_info_helper.h
similarity index 100%
rename from interfaces/inner_api/security_component_common/sec_comp_info_helper.h
rename to interfaces/inner_api/security_component/include/sec_comp_info_helper.h
diff --git a/interfaces/inner_api/security_component_common/sec_event_handler.h b/interfaces/inner_api/security_component/include/sec_event_handler.h
similarity index 100%
rename from interfaces/inner_api/security_component_common/sec_event_handler.h
rename to interfaces/inner_api/security_component/include/sec_event_handler.h
diff --git a/services/security_component_service/sa/BUILD.gn b/services/security_component_service/sa/BUILD.gn
index 73c5072c647b94da81a429629419d0524a16db24..073a5b9ae29af7fe702dfc5ca3551ba5f2c74e91 100644
--- a/services/security_component_service/sa/BUILD.gn
+++ b/services/security_component_service/sa/BUILD.gn
@@ -16,10 +16,9 @@ import("//build/ohos.gni")
 sec_comp_root_dir = "../../.."
 
 config("security_component_common_config") {
-  include_dirs = [
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
-  ]
+  visibility = [ "//base/security/*" ]
+  include_dirs =
+      [ "${sec_comp_root_dir}/interfaces/inner_api/security_component/include" ]
 }
 
 ohos_shared_library("security_component_common") {
@@ -40,7 +39,6 @@ ohos_shared_library("security_component_common") {
     "${sec_comp_root_dir}/frameworks/common/include",
     "${sec_comp_root_dir}/frameworks/security_component/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
   ]
 
@@ -112,7 +110,6 @@ ohos_source_set("security_component_service_src_set") {
     "${sec_comp_root_dir}/frameworks/common/include",
     "${sec_comp_root_dir}/frameworks/enhance_adapter/include",
     "${sec_comp_root_dir}/frameworks/inner_api/security_component/include",
-    "${sec_comp_root_dir}/interfaces/inner_api/security_component_common",
     "${sec_comp_root_dir}/interfaces/inner_api/security_component/include",
   ]
 
diff --git a/services/security_component_service/sa/test/BUILD.gn b/services/security_component_service/sa/test/BUILD.gn
index ec3ec8a7b8a9e35743376be0619e7ee4aec41472..3d71a9236923715016ac157060c2d7ed438805e7 100644
--- a/services/security_component_service/sa/test/BUILD.gn
+++ b/services/security_component_service/sa/test/BUILD.gn
@@ -69,7 +69,6 @@ ohos_unittest("sec_comp_service_test") {
   deps = [
     "${sec_comp_root_dir}/frameworks:security_component_no_cfi_enhance_adapter_src_set",
     "${sec_comp_root_dir}/frameworks:security_component_no_cfi_framework_src_set",
-    "//third_party/googletest:gmock_main",
   ]
 
   external_deps = [
@@ -83,6 +82,7 @@ ohos_unittest("sec_comp_service_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock_main",
     "graphic_2d:librender_service_client",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
@@ -141,10 +141,8 @@ ohos_unittest("sec_comp_service_mock_test") {
   configs = [ "${sec_comp_root_dir}/config:coverage_flags" ]
   cflags_cc = [ "-DHILOG_ENABLE" ]
 
-  deps = [
-    "${sec_comp_root_dir}/frameworks:security_component_framework_src_set",
-    "//third_party/googletest:gmock_main",
-  ]
+  deps =
+      [ "${sec_comp_root_dir}/frameworks:security_component_framework_src_set" ]
 
   external_deps = [
     "ability_base:base",
@@ -157,6 +155,7 @@ ohos_unittest("sec_comp_service_mock_test") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock_main",
     "graphic_2d:librender_service_client",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
diff --git a/test/fuzztest/security_component/service/security_component_fuzz.gni b/test/fuzztest/security_component/service/security_component_fuzz.gni
index f0cf8821a3cc51b3a8e08218ad2eda3f466b4a6e..db8402f33e98cd4f10d970a8c23fd5cc76a1db20 100644
--- a/test/fuzztest/security_component/service/security_component_fuzz.gni
+++ b/test/fuzztest/security_component/service/security_component_fuzz.gni
@@ -20,7 +20,6 @@ sc_include_dirs = [
   "${sec_comp_dir}/frameworks/enhance_adapter/include",
   "${sec_comp_dir}/frameworks/security_component/include",
   "${sec_comp_dir}/frameworks/inner_api/security_component/include",
-  "${sec_comp_dir}/interfaces/inner_api/security_component_common",
   "${sec_comp_dir}/interfaces/inner_api/security_component/include",
   "${sec_comp_dir}/services/security_component_service/sa/test/mock/include",
   "${sec_comp_dir}/test/fuzztest/security_component/common",