diff --git a/common/BUILD.gn b/common/BUILD.gn
index 4ce2814cd2b7bc000935dbf2df4ebada039f7849..4b6be7f19cf9ed7c0a3d203564b569c674673179 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -12,13 +12,10 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_utils") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "include/constants",
     "include/utils",
     "${feeding_smoother_path}/base",
diff --git a/common/test/unittest/common/utils/BUILD.gn b/common/test/unittest/common/utils/BUILD.gn
index da9b6b49d17cedbe68219851fc75b03fadadb14a..471bdd715b83cdafc0b093a3077e1df5e519c365 100644
--- a/common/test/unittest/common/utils/BUILD.gn
+++ b/common/test/unittest/common/utils/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/utils_test"
 
@@ -23,8 +22,6 @@ config("module_private_config") {
   include_dirs = [
     "${common_path}/include/constants",
     "${common_path}/include/utils",
-    "//foundation/graphic/graphic_2d/interfaces/innerkits/surface",
-    "//foundation/graphic/graphic_2d/frameworks/surface/include",
     "${feeding_smoother_path}/base",
     "${services_path}/cameraservice/base/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn
index 7b9e08ab2f541cce37db22c51ba3a05dec3ec7e6..90e9f710fb77856445c6325ac41995f26f734ab8 100644
--- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn
@@ -12,15 +12,10 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_sink_sdk") {
-  include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
-    "${fwk_common_path}/utils/include",
-  ]
+  include_dirs = [ "${fwk_common_path}/utils/include" ]
 
   include_dirs += [
     "include",
diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn
index 839f694c021f4eca82f6c843c93569edb07b38e5..3a5cb7644b8aa8fca248ca768a7a1fb6b8ec836e 100644
--- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn
@@ -12,13 +12,10 @@
 # limitations under the License.
 
 import("//build/ohos.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_source_sdk") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn
index b5e1e843fb5ac77e949e02a22f47f6925403ac1d..26f82673c55518417c8bcc9cb69ae56ffce22cfc 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyregresult_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("CallbackOnNotifyRegResultFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("CallbackOnNotifyRegResultFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/callbackonnotifyregresult_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn
index ea946c1548c908c14983342e855acc6899941d8b..68d2dc43d958df15b400af388c382dfd6b05c41f 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonnotifyunregresult_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("CallbackOnNotifyUnRegResultFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("CallbackOnNotifyUnRegResultFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/callbackonnotifyunregresult_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonremoterequest_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonremoterequest_fuzzer/BUILD.gn
index 830a3d7fc42eed701197bced7d3c2866ba8b2535..8ad728fa54be6a3ca4c1039deca37a47577a8787 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonremoterequest_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/callbackonremoterequest_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("CallbackOnRemoteRequestFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/callbackonremoterequest_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn
index 486779d5bf6854cb793becda754cb181fbb7f024..9e4103a79a92c46066232a9c95b26cd30e1608f3 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") {
@@ -25,8 +24,6 @@ ohos_fuzztest("OnSinkLocalCamSrvDiedFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/onsinklocalcamsrvdied_fuzzer"
 
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_utils_path}/include",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn
index 59a798669f6897539a83d8668479b334de83b988..1c424e46bb60a6eb1e567af1403d3caf5c3f4b68 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("OnSourceLocalCamSrvDiedFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/onsourcelocalcamsrvdied_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn
index b0c39b6cfd6e7f377d5e8e7c85538576cf977294..d622fda1c4ecb5ce6f9b31569992bf4d9a9af8ae 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkHandlerInitSinkFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkHandlerInitSinkFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkhandlerinitsink_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn
index 1d61dd1cbfdfbe153171e78154af2032471ba526..121b03890e4b79801887e74974d8551beae604b8 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkHandlerSubscribeLocalHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkhandlersubscribelocalhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn
index e878202a16c56dc409ed5d8576c7b73f3d5e9a23..6a18da90826f04c69c21e73d1a3740b6bc36c8ad 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkHandlerUnsubscribeLocalHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkhandlerunsubscribelocalhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn
index 994cd12065be5e24744287cedd98724046affc09..8a0e4e3fa30baf80dcc5534d1b61242d0cc97104 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilityFailFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkonloadsystemabilityfail_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn
index 100001f867d74f97089dd17b397d526bcaf0d4df..e8b01d7400c34508d45730a19ea62d712365244f 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkOnLoadSystemAbilitySuccessFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkonloadsystemabilitysuccess_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn
index b720f0b97c1d4f3fcf8d4a2be8d9daeba86ce7d9..f04468dd9cfca151220996fb3bbbc6a149e4c957 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyChannelNegFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyChannelNegFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxychannelneg_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn
index f57f3449e2ca1ad296e1de2b1935a1c98af8012d..7a1392c0a43af06b916d432f5d98439c77f2a4fd 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyCloseChannelFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyCloseChannelFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxyclosechannel_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn
index 4091f708595875ee4ef78ff8030358439b8bf600..a702e431cd3edd17b17f4e54153b8f1a480ca83a 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyGetCameraInfoFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxygetcamerainfo_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn
index c14a638220d84089d580eae338bec9316d748d81..f29ea4b1bda267503dc6cbc7f7de7a38c402ec83 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyInitSinkFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyInitSinkFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxyinitsink_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn
index e98fcfaf19b8684b30c310fb7897efbc3a3192d4..b30006c33dc2517facfe7aabffa126a4b7e6cbed 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyOpenChannelFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyOpenChannelFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxyopenchannel_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn
index 73a8b15992b67a458cdb8f3f508a56e47bc28363..b95d7c8f068a6b2f9372f215967bd4ffb5e793fa 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyStopCaptureFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SinkProxyStopCaptureFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sinkproxystopcapture_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn
index 42d3750f87e97ce2a49923ec5d3900b5ea8f23aa..df817ee0b4bb9d55c10b224a2be5dca37936143c 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkProxySubscribeLocalHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkproxysubscribelocalhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn
index 64aa31e9c3ceff18547ca2c3340555bf66d44c89..aeca39c4e70035b498c98170e3fe596671677332 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SinkProxyUnsubscribeLocalHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sinkproxyunsubscribelocalhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn
index 1b290fa069175d1ca09383851444758f4c6b2379..6bab554290318038d2e9f4d314ecdc545a773577 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") {
@@ -23,9 +22,7 @@ ohos_fuzztest("SourceHandlerConfigDistributedHardwareFuzzTest") {
 
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourcehandlerconfigdistributedhardware_fuzzer"
 
-  include_dirs = [ "//utils/system/safwk/native/include" ]
-
-  include_dirs += [
+  include_dirs = [
     "include",
     "${common_path}/include",
     "${common_path}/include/constants",
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn
index b1669460406afe6f16d7a82ab6d1bba945251bf3..0548a115fd08eee3f443e0ccb7280d5eee797e5d 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceHandlerInitSourceFuzzTest") {
@@ -23,9 +22,7 @@ ohos_fuzztest("SourceHandlerInitSourceFuzzTest") {
 
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourcehandlerinitsource_fuzzer"
 
-  include_dirs = [ "//utils/system/safwk/native/include" ]
-
-  include_dirs += [
+  include_dirs = [
     "include",
     "${common_path}/include",
     "${common_path}/include/constants",
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn
index c062f1c9cd1a2d67607e56f14c202f37c37db8cf..382bd44b27a8b10f336ce50e632b3e5de6d7b10e 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SourceHandlerRegisterDistributedHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourcehandlerregisterdistributedhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn
index e2bbc33bad26fb58aa019adcaf9df3b010ed37ac..7a6848d875d5290688535c011dfe0b7024142181 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SourceHandlerUnregisterDistributedHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourcehandlerunregisterdistributedhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn
index 203c5ff490ee6228ad75a9c872db69e87f1ef944..41a4aee3304d1e360456e3e0c0741d0572d4dfc9 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilityFailFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourceonloadsystemabilityfail_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn
index 4287c5ae368b2fea06e3e8d603199cbefe257e1e..bbf366a1ef02d9007c931e2000617d3fa0ccc5c5 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SourceOnLoadSystemAbilitySuccessFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourceonloadsystemabilitysuccess_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn
index 0e9584b60c9ee7bb4ae8a3bba6bf2be9155ab8e6..b43d03a360b4e8d6bbd03d62ab90f3986f1735c9 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SourceProxyDCameraNotifyFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourceproxydcameranotify_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn
index 5dfafc925f76071f670840b613a5c0dbc5fd19a1..478ab487760df79e621089360516c769f39aaa9f 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceProxyInitSourceFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SourceProxyInitSourceFuzzTest") {
       "${innerkits_path}/native_cpp/test/fuzztest/sourceproxyinitsource_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn
index 0ce7d3808a665472d0ecbacba95d804a57ed4869..21b725300ff5e7d68dff6aec6d5cd31941d76234 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") {
@@ -24,7 +23,6 @@ ohos_fuzztest("SourceProxyRegisterDistributedHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourceproxyregisterdistributedhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn
index 5636a884f7ba7e4e4103421b5bbf74ac83888039..e6d2ce96aa094331f9c97df9e8b891b86a07774e 100644
--- a/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer/BUILD.gn
@@ -14,8 +14,7 @@
 #####################hydra-fuzz###################
 import("//build/config/features.gni")
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 ##############################fuzztest##########################################
 ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") {
@@ -25,7 +24,6 @@ ohos_fuzztest("SourceProxyUnregisterDistributedHardwareFuzzTest") {
   fuzz_config_file = "${innerkits_path}/native_cpp/test/fuzztest/sourceproxyunregisterdistributedhardware_fuzzer"
 
   include_dirs = [
-    "//utils/system/safwk/native/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${fwk_common_path}/utils/include",
   ]
diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn
index 609bcb078efbcabdd1824dca2e1a0ead755bbf6c..1ff87c09f72c828598a6c4ace3dfe72359f97427 100644
--- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_sink_handler_test"
 
@@ -26,8 +25,6 @@ config("module_private_config") {
     "${common_path}/include/utils",
     "${innerkits_path}/native_cpp/camera_sink/include",
     "${innerkits_path}/native_cpp/camera_sink/include/callback",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 }
diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn
index a152f8309fe9849f0026f9ec831069a726ddf6c8..95d541919031c76fdc9cdcb02e117290c0a9f803 100644
--- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn
+++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_source/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_source_handler_test"
 
@@ -28,8 +27,6 @@ config("module_private_config") {
     "${innerkits_path}/native_cpp/camera_source/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${innerkits_path}/native_cpp/test/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
   ]
 }
diff --git a/services/cameraservice/base/test/unittest/common/base/BUILD.gn b/services/cameraservice/base/test/unittest/common/base/BUILD.gn
index 29198df5265053edaa210349ef99d9b6600a51ae..55dc99ac61a2748d4fd67a66b42e9f8b693429a0 100755
--- a/services/cameraservice/base/test/unittest/common/base/BUILD.gn
+++ b/services/cameraservice/base/test/unittest/common/base/BUILD.gn
@@ -12,16 +12,13 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_services_base_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "//drivers/peripheral/base",
     "${fwk_common_path}/log/include",
     "${fwk_common_path}/utils/include",
diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn
index 727a0feb1897b535f88f08f47456a2a2c9d2788d..96826a35b5e20a9cb70d579a7873f7e1512a7e8b 100644
--- a/services/cameraservice/cameraoperator/client/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/BUILD.gn
@@ -13,13 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_client") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
index bd45a50ea40532b3beeaef64a0e1b10590aa60c3..0e38a467c183b46efdb78e776cef3ca330a451ad 100644
--- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn
@@ -13,14 +13,11 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 config("module_private_config") {
   include_dirs = [
     "//third_party/jsoncpp/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
@@ -69,8 +66,6 @@ ohos_executable("dcamera_client_demo") {
     "${graphicstandard_path}:libsurface",
     "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client",
     "${services_path}/cameraservice/sinkservice:distributed_camera_sink",
-    "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken",
-    "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc",
     "//third_party/jsoncpp:jsoncpp",
   ]
 
@@ -84,6 +79,8 @@ ohos_executable("dcamera_client_demo") {
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "multimedia_player_framework:media_client",
+    "access_token:libnativetoken",
+    "access_token:libtoken_setproc",
   ]
 
   defines = [
diff --git a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
index 1d19db84389661c74b7c7f510c8f0e351b8788be..87691789719585bd71f5fed968c9e54dc3188de9 100644
--- a/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
+++ b/services/cameraservice/cameraoperator/client/test/unittest/common/cameraoperator/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_client_test"
 
@@ -21,8 +20,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/jsoncpp/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn
index ffc0c8eb5bbd2ce224ed84c0bf1991cfc3c5ef82..ef79fd8b7b3712372e68a0abd59ed3daf2b8133e 100644
--- a/services/cameraservice/cameraoperator/handler/BUILD.gn
+++ b/services/cameraservice/cameraoperator/handler/BUILD.gn
@@ -13,14 +13,11 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_handler") {
   include_dirs = [
     "//third_party/jsoncpp/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn
index 3f2031346381d96807e5d50e869a066c46151dc0..a74e4494c8b56c414305c573572acf11b21e9f20 100644
--- a/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn
+++ b/services/cameraservice/cameraoperator/handler/test/unittest/common/dcamerahandler/BUILD.gn
@@ -12,16 +12,13 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_handler_test"
 
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn
index 25cce91d47429dba9a482120457486a566f37345..edb71a4bf3168bbf65e92e36a58b0304ab078f3c 100644
--- a/services/cameraservice/sinkservice/BUILD.gn
+++ b/services/cameraservice/sinkservice/BUILD.gn
@@ -13,13 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_sink") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
index 3bf4f7a0689b8f7858753f99010fa547dd4b77cb..a04a4f60902310312a86205bea806d09deae788f 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_sink_test"
 
@@ -21,8 +20,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/jsoncpp/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${graphicstandard_path}/frameworks/surface/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include",
     "${camerastandard_path}/interfaces/inner_api/native/camera/include/input",
diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
index f0507f9eb818fb59563dac587c033d9501ea51a2..0a53f811c14aae7f6c339b19bb722f81444b7fe0 100644
--- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_sink_mgr_test"
 
diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn
index 07da119208527db46aed38b4a9e47c39c57e767b..c9659d2ec4828440d2486ea1e86083588c906a5d 100644
--- a/services/cameraservice/sourceservice/BUILD.gn
+++ b/services/cameraservice/sourceservice/BUILD.gn
@@ -13,13 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_source") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
     "//third_party/jsoncpp/include",
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
index 2e703d7bef73d8427b2105ec5e582fb4477faa92..6e4b26763df4d4fc752a5ab344ab6349ade053c1 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_source_test"
 
@@ -44,8 +43,6 @@ config("module_private_config") {
     "${fwk_utils_path}/include",
     "${fwk_utils_path}/include/eventbus",
     "${fwk_common_path}/utils/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "//third_party/jsoncpp/include",
     "//drivers/peripheral/base/",
     "${graphicstandard_path}/frameworks/surface/include",
diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
index acc3ba9f498fd1979fcdb0cff3c86ee7ba89fa67..ba44147840c89784f9b387f0d0f0d308c5ea93a7 100644
--- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
+++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_source_mgr_test"
 
@@ -44,8 +43,6 @@ config("module_private_config") {
     "${fwk_utils_path}/include",
     "${fwk_utils_path}/include/eventbus",
     "${fwk_common_path}/utils/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "//third_party/jsoncpp/include",
     "//drivers/peripheral/base/",
     "${graphicstandard_path}/frameworks/surface/include",
diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn
index 29b8049c7011faa452814ca8a2bf4546f374a961..fb210c4feadec3e07d242f5820dfd64aaa8856ce 100644
--- a/services/channel/BUILD.gn
+++ b/services/channel/BUILD.gn
@@ -13,13 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_channel") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "${fwk_common_path}/utils/include",
     "${services_path}/cameraservice/base/include",
   ]
diff --git a/services/channel/test/unittest/common/channel/BUILD.gn b/services/channel/test/unittest/common/channel/BUILD.gn
index ff0cfb8457ddea689e8277a1ed294ce536f24316..c7392905871fba6200023cf354707dfb1014d7c0 100644
--- a/services/channel/test/unittest/common/channel/BUILD.gn
+++ b/services/channel/test/unittest/common/channel/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_channel_test"
 
@@ -48,8 +47,6 @@ config("module_private_config") {
     "${innerkits_path}/native_cpp/camera_source/include",
     "${innerkits_path}/native_cpp/camera_source/include/callback",
     "${graphicstandard_path}/frameworks/surface/include",
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
     "//third_party/jsoncpp/include",
     "${feeding_smoother_path}/base",
   ]
diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn
index cfba89263bfe73377c30a921e38c85fc83f6e848..8f3747a2dafe771a494cf700ad27dd264e4f0b68 100644
--- a/services/data_process/BUILD.gn
+++ b/services/data_process/BUILD.gn
@@ -13,15 +13,10 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../distributedcamera.gni")
 
 ohos_shared_library("distributed_camera_data_process") {
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
-    "//utils/system/safwk/native/include",
-    "//foundation/graphic/graphic_2d/interfaces/innerkits/common",
-    "//foundation/multimedia/player_framework/interfaces/innerkits/native/media/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
     "${graphicstandard_path}/frameworks/surface/include",
diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn
index 64b655e6e3d01366d4606baaa461a80b499e1080..3f11c086c5e3db6c51bdac39c409a8d22ffc7629 100644
--- a/services/data_process/test/unittest/common/pipeline/BUILD.gn
+++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_data_process_test"
 
@@ -32,7 +31,6 @@ config("module_private_config") {
     "${common_path}/include/constants",
     "${common_path}/include/utils",
     "${innerkits_path}/native_cpp/camera_source/include",
-    "//commonlibrary/c_utils/base/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
     "${feeding_smoother_path}/base",
@@ -53,7 +51,6 @@ ohos_unittest("DCameraDataProcessPipelineTest") {
   deps = [
     "${common_path}:distributed_camera_utils",
     "${services_path}/data_process:distributed_camera_data_process",
-    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/ffmpeg:libohosffmpeg",
   ]
 
@@ -62,6 +59,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") {
     "eventhandler:libeventhandler",
     "hitrace_native:hitrace_meter",
     "multimedia_player_framework:media_client",
+    "graphic_standard:surface",
   ]
 
   defines = [
diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
index 903662ea8f7a702aae703eb9b2b609b50ee74134..56f2793cfb175f18f77aed4aed845330fcce20ff 100644
--- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
+++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn
@@ -12,8 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import(
-    "//foundation/distributedhardware/distributed_camera/distributedcamera.gni")
+import("./../../../../../../distributedcamera.gni")
 
 module_out_path = "distributed_camera/dcamera_data_process_test"
 
@@ -32,7 +31,6 @@ config("module_private_config") {
     "${common_path}/include/constants",
     "${common_path}/include/utils",
     "${innerkits_path}/native_cpp/camera_source/include",
-    "//commonlibrary/c_utils/base/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/eventbus",
     "//third_party/ffmpeg/",
@@ -65,7 +63,6 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") {
   deps = [
     "${common_path}:distributed_camera_utils",
     "${services_path}/data_process:distributed_camera_data_process",
-    "//foundation/graphic/graphic_2d/frameworks/surface:surface",
     "//third_party/ffmpeg:libohosffmpeg",
   ]
 
@@ -74,6 +71,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") {
     "eventhandler:libeventhandler",
     "hitrace_native:hitrace_meter",
     "multimedia_player_framework:media_client",
+    "graphic_standard:surface",
   ]
 
   defines = [