diff --git a/distributedscreen.gni b/distributedscreen.gni
index 217b56cfbb6cdddad7a933b385d47905c940b325..c296f4cf64782ac09f93cebda27200582668cd4b 100644
--- a/distributedscreen.gni
+++ b/distributedscreen.gni
@@ -12,14 +12,15 @@
 # limitations under the License.
 
 distributedscreen_path = "//foundation/distributedhardware/distributedscreen"
-distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardwarefwk"
+distributedhardwarefwk_path =
+    "//foundation/distributedhardware/distributedhardwarefwk"
 windowmanager_path = "//foundation/windowmanager"
 mediastandard_path = "//foundation/multimedia/media_standard"
-graphicstandard_path = "//foundation/graphic/standard"
+graphicstandard_path = "//foundation/graphic/graphic"
 common_path = "${distributedscreen_path}/common"
 services_path = "${distributedscreen_path}/services"
 interfaces_path = "${distributedscreen_path}/interfaces"
 fwk_utils_path = "${distributedhardwarefwk_path}/utils"
 fwk_common_path = "${distributedhardwarefwk_path}/common"
 fwk_services_path = "${distributedhardwarefwk_path}/services"
-build_flags = ["-Werror"]
\ No newline at end of file
+build_flags = [ "-Werror" ]
diff --git a/screenhandler/BUILD.gn b/screenhandler/BUILD.gn
index 727296f6c4b7442b61b239236d021a533f4a7238..b079cf109696e5fc3df17a9863414887147ce337 100644
--- a/screenhandler/BUILD.gn
+++ b/screenhandler/BUILD.gn
@@ -36,7 +36,7 @@ ohos_shared_library("distributed_screen_handler") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
index c003bc1910a376bbea75aeaf7bb0a85a46214d2b..115d0e5a92dde4f94c827869514785864b151605 100644
--- a/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
+++ b/screenhandler/test/fuzztest/dscreenhandler_fuzzer/BUILD.gn
@@ -54,7 +54,7 @@ ohos_fuzztest("DscreenHandlerFuzzTest") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${windowmanager_path}/dm:libdm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screenclient/BUILD.gn b/services/screenclient/BUILD.gn
index cd000bddf225535012cb2c7698b41fd8532bc4d9..ab4e73c2d61097468192efb4a248f560bd2e0d8b 100644
--- a/services/screenclient/BUILD.gn
+++ b/services/screenclient/BUILD.gn
@@ -40,7 +40,7 @@ ohos_shared_library("distributed_screen_client") {
     "${graphicstandard_path}/frameworks/surface:surface",
     "${windowmanager_path}/wm:libwm",
     "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
-    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
   ]
 
   defines = [
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index 1b85c0e040074352cafed65d44f304dde3998d16..99bed633f2f9e9709ad502932c24b8ca363bdc6e 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -21,7 +21,7 @@ ohos_shared_library("distributed_screen_sink") {
     "//third_party/json/include",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${windowmanager_path}/interfaces/innerkits/dm",
     "${fwk_common_path}/utils/include",
   ]
@@ -59,7 +59,7 @@ ohos_shared_library("distributed_screen_sink") {
     "${services_path}/screenclient:distributed_screen_client",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 922c984444db5ca4c7ca6fc1086a42bbaa765211..a821fa9610b7587748dc2017b989ab3e29717b16 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -22,7 +22,7 @@ ohos_shared_library("distributed_screen_source") {
     "${windowmanager_path}/interfaces/innerkits/dm",
     "//utils/native/base/include",
     "//utils/system/safwk/native/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${mediastandard_path}/interfaces/inner_api/native",
   ]
@@ -62,8 +62,8 @@ ohos_shared_library("distributed_screen_source") {
     "${mediastandard_path}/interfaces/inner_api/native:media_client",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/standard/frameworks/surface:surface",
-    "//foundation/graphic/standard/rosen/modules/render_service_client:librender_service_client",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
+    "//foundation/graphic/graphic/rosen/modules/render_service_client:librender_service_client",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index e0a631f40970b76574d604928abcd91ef9146b97..7f22e34f64926b4f934965bf80e72ee47798a9cc 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -19,7 +19,7 @@ import(
 ohos_shared_library("distributed_screen_sinktrans") {
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -49,7 +49,7 @@ ohos_shared_library("distributed_screen_sinktrans") {
 
   deps = [
     "${common_path}:distributed_screen_utils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index a8e5ae18b0ed62d5a0c0bfd8b2695d5972b4be09..fa3f89a743b36998a2bc2d55da897c359945f8e2 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -19,7 +19,7 @@ import(
 ohos_shared_library("distributed_screen_sourcetrans") {
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -48,7 +48,7 @@ ohos_shared_library("distributed_screen_sourcetrans") {
 
   deps = [
     "${common_path}:distributed_screen_utils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
index 7895eec60a42e058d92f28478dd323b999734f70..919d8dcb63686615395b91a41693d1357e9cc2e6 100644
--- a/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screendatachannel_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenDataChannelFuzzTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
index 4648931cc5c1f74141674d276e716e400f75ff6e..230759f934058a24043853fa1ec96bf2cea70809 100644
--- a/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensinkprocessor_fuzzer/BUILD.gn
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -57,7 +57,7 @@ ohos_fuzztest("ScreenSinkProcessorFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
index 97ed2768bed195c4dbecc06ad0970cebaf9ab210..b4334b0f47db4701fe9ae56e04f61e0878067271 100644
--- a/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensinktrans_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -59,7 +59,7 @@ ohos_fuzztest("ScreenSinkTransFuzzTest") {
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screenservice/sinkservice:distributed_screen_sink",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
index 979a7ea02971c7180a7e08713524e807779cac34..2416f88efd7366bef0cd61357b96c75bdd931400 100644
--- a/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourceprocessor_fuzzer/BUILD.gn
@@ -25,7 +25,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -58,7 +58,7 @@ ohos_fuzztest("ScreenSourceProcessorFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
index bee0caa718a73b859439830d3f14600b93dff4b3..074ffc9412d859c76424abbb51b5bfc3002998b5 100644
--- a/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
+++ b/services/screentransport/test/fuzztest/screensourcetrans_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${windowmanager_path}/interfaces/innerkits/dm",
     "${fwk_common_path}/log/include",
     "${fwk_common_path}/utils/include",
@@ -50,7 +50,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
     "${services_path}/screentransport/screensourceprocessor/encoder/include",
     "${services_path}/softbusadapter/include",
     "${services_path}/screenservice/sourceservice/dscreenmgr/include",
-    "//foundation/graphic/standard/rosen/modules/render_service_base/include",
+    "//foundation/graphic/graphic/rosen/modules/render_service_base/include",
     "${interfaces_path}/innerkits/native_cpp/screen_sink/include",
     "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback",
   ]
@@ -70,7 +70,7 @@ ohos_fuzztest("ScreenSourceTransFuzzTest") {
     "${services_path}/screenservice/sourceservice:distributed_screen_source",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
     "${windowmanager_path}/dm:libdm",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn
index da29a56d42e5b6f4463efdcb0a1aab4a5450fc2a..13822b95d03ac02cf0ee60945fe35acdb50c15e7 100644
--- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn
+++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/data_channel_test"
 
@@ -20,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -50,11 +51,11 @@ ohos_unittest("DataChannelTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
@@ -70,8 +71,9 @@ ohos_unittest("DataChannelTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  cflags = [ "-frtti",
-    "-fexceptions"
+  cflags = [
+    "-frtti",
+    "-fexceptions",
   ]
   cflags_cc = cflags
 }
diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
index c61f8fb00c7fdbc5f7f48b7ad58d6e80e146c1fb..b5bb758fc02a197109f4b9222d921f4c64a77d02 100644
--- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn
@@ -11,10 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/test.gni")
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import("//build/test.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/sink_processor_test"
 
@@ -22,7 +23,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -49,17 +50,17 @@ ohos_unittest("SinkProcessorTest") {
 
   sources = [
     "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_decoder_test.cpp",
-    "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp"
+    "${services_path}/screentransport/test/unittest/screensinkprocessor/src/image_sink_processor_test.cpp",
   ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
@@ -83,4 +84,4 @@ ohos_unittest("SinkProcessorTest") {
 group("sink_processor_test") {
   testonly = true
   deps = [ ":SinkProcessorTest" ]
-}
\ No newline at end of file
+}
diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
index 90ecbf7990cf88ed2c027adb16dbc420ea39b444..39fdb36baf88c0753ce04adb31dfddd6608b7881 100644
--- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn
@@ -11,10 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/test.gni")
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import("//build/test.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/sink_trans_test"
 
@@ -22,7 +23,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
   ]
 
@@ -46,18 +47,16 @@ config("module_private_config") {
 ohos_unittest("SinkTransTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp"
-  ]
+  sources = [ "${services_path}/screentransport/test/unittest/screensinktrans/src/screen_sink_trans_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
@@ -81,4 +80,4 @@ ohos_unittest("SinkTransTest") {
 group("sink_trans_test") {
   testonly = true
   deps = [ ":SinkTransTest" ]
-}
\ No newline at end of file
+}
diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
index 2f9353492e94a83bd8af0479f36424e7461c5871..ce81a19b09355c7f68704fa25166095472b88db9 100644
--- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/source_processor_test"
 
@@ -20,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -47,18 +48,18 @@ ohos_unittest("SourceProcessorTest") {
   module_out_path = module_out_path
 
   sources = [
-    "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp",
     "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_encoder_test.cpp",
+    "${services_path}/screentransport/test/unittest/screensourceprocessor/src/image_source_processor_test.cpp",
   ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
index 09c1d9867dda0aa27736471e306cda454c6b63f9..e681ecd3a15f3153330325a620e6b507e5442ea3 100644
--- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
+++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/source_trans_test"
 
@@ -20,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/log/include",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
@@ -54,11 +55,11 @@ ohos_unittest("SourceTransTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
index 016636e86ebcc10db30e2023a558220c216544ba..f90f883abc5d608b569c36f74518d2d7bf52da9f 100644
--- a/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
@@ -26,7 +26,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
 
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -57,7 +57,7 @@ ohos_fuzztest("SoftbusAdapterFuzzTest") {
   deps = [
     "${fwk_utils_path}:distributedhardwareutils",
     "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "//foundation/graphic/standard/frameworks/surface:surface",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]
 
diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn
index 53959db3f0338df0878e0e8b2c7571cafff76668..5cf515303d369a71c78ce5df3b1604d8c37d530d 100644
--- a/services/softbusadapter/test/unittest/BUILD.gn
+++ b/services/softbusadapter/test/unittest/BUILD.gn
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 module_out_path = "distributed_screen/soft_bus_adapter_test"
 
@@ -20,7 +21,7 @@ config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
     "//third_party/json/include",
-    "//foundation/graphic/standard/interfaces/innerkits/surface",
+    "//foundation/graphic/graphic/interfaces/innerkits/surface",
     "${fwk_common_path}/utils/include",
     "${fwk_utils_path}/include/",
   ]
@@ -49,11 +50,11 @@ ohos_unittest("SoftBusAdapterTest") {
   configs = [ ":module_private_config" ]
 
   deps = [
+    "${fwk_utils_path}:distributedhardwareutils",
+    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
+    "//foundation/graphic/graphic/frameworks/surface:surface",
     "//third_party/googletest:gmock",
     "//third_party/googletest:gtest_main",
-    "${services_path}/screentransport/screensourcetrans:distributed_screen_sourcetrans",
-    "${fwk_utils_path}:distributedhardwareutils",
-    "//foundation/graphic/standard/frameworks/surface:surface",
     "//utils/native/base:utils",
   ]