diff --git a/frameworks/innerkitsimpl/egl_image/BUILD.gn b/frameworks/innerkitsimpl/egl_image/BUILD.gn
index b38f5aabb2ac5d4d442c152751a62d305f2bacc4..b452adcf124fa2de83c98c5328417f21074f39d6 100644
--- a/frameworks/innerkitsimpl/egl_image/BUILD.gn
+++ b/frameworks/innerkitsimpl/egl_image/BUILD.gn
@@ -90,9 +90,9 @@ if (!use_clang_ios && !use_clang_android) {
     }
     external_deps = [
       "ipc:ipc_single",
+      "c_utils:utils",
     ]
     public_external_deps = [
-      "c_utils:utils",
       "graphic_2d:EGL",
       "graphic_2d:GLESv3",
       "graphic_2d:color_manager",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp2_fuzzer/BUILD.gn
index d4e6178d1234d42a3b17ac33a7fedef07cf802f2..de39947d7b184427325c84958c713a3a12bc6902 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp2_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("ImageFwkDecodeBmp2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp_fuzzer/BUILD.gn
index f1050e83ea3abc1cf3e41c63d43ef24cf76de2ba..a358ccd58011561cf2e65069166ae5186f1f23a8 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodebmp_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("ImageFwkDecodeBmpFuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext2_fuzzer/BUILD.gn
index 89480658f56a5e14c7e446079e159890f62d9fe2..b7cae90f4961649a219078fb4e012f9d582c5bc9 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext2_fuzzer/BUILD.gn
@@ -65,6 +65,7 @@ ohos_fuzztest("Imagefwkdecodeext2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext_fuzzer/BUILD.gn
index 4d9396002474c8b90f574c7d8874471391c3cf95..6cd1bd64c070909a1595321608c2c810ec71af93 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodeext_fuzzer/BUILD.gn
@@ -64,6 +64,7 @@ ohos_fuzztest("ImageFwkDecodeExtFuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif2_fuzzer/BUILD.gn
index 410cb6b77389a8c5677c27b1f284623ed652f7a6..cefb69b3b7b3b912f93bcc1c12833a59a6c0c2c9 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif2_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("ImageFwkDecodeGif2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif_fuzzer/BUILD.gn
index dba33cfec5359dd87898596f1955abd046876cd6..7ce34131324001e6783be9b1a7d82f4190f9b278 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodegif_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("ImageFwkDecodeGifFuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr2_fuzzer/BUILD.gn
index 06b1ce43cf2c28b9a0df728906c096b2be8751d8..3e1d11ba46d1d9c34a0bbe262a66e415640a29d7 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr2_fuzzer/BUILD.gn
@@ -56,6 +56,7 @@ ohos_fuzztest("ImageFwkDecodeHdr2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr_fuzzer/BUILD.gn
index 9914a6bf0ff3b74e351303fecb09b6ce72a5d3eb..941207f3634aedcfe401676cd9f13c2d44a948d3 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodehdr_fuzzer/BUILD.gn
@@ -56,6 +56,7 @@ ohos_fuzztest("ImageFwkDecodeHdrFuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg2_fuzzer/BUILD.gn
index f87d91b478d45e1b8b7146597f9a0d79afc091cd..0aa81ecc5dc186ebd7235bd57234d7a397cffab5 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg2_fuzzer/BUILD.gn
@@ -56,6 +56,7 @@ ohos_fuzztest("Imagefwkdecodejpeg2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg3_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg3_fuzzer/BUILD.gn
index 1ae89d8667a480fef68f0c9098ae052c85412eef..29733bb63ca92bf432a7cfe9b517fc9e399a5614 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg3_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg3_fuzzer/BUILD.gn
@@ -56,6 +56,7 @@ ohos_fuzztest("Imagefwkdecodejpeg3FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg_fuzzer/BUILD.gn
index e98b0950ab5891e4a4e269de5ed1a84ab7057e73..540af5e0fad1d945f16acb576d8bd6320d71ca6b 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkdecodejpeg_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("ImageFwkDecodeJpegFuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodeext2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodeext2_fuzzer/BUILD.gn
index 4b47e5379f3ba937be74e76268f71a483ac21a03..01f513e8f6eded1889742de19d7a96e8de3842ef 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodeext2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodeext2_fuzzer/BUILD.gn
@@ -65,6 +65,7 @@ ohos_fuzztest("Imagefwkencodeext2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodegif2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodegif2_fuzzer/BUILD.gn
index 41a24283c2e2c082922ea6712d26757a7f8ce18f..59c609a83dc439c83d035821613f5ccaaa603c91 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodegif2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodegif2_fuzzer/BUILD.gn
@@ -59,6 +59,7 @@ ohos_fuzztest("Imagefwkencodegif2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodejpeg2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodejpeg2_fuzzer/BUILD.gn
index 32ef83b07a8fde0c9b3bcd3936aaec97cabd1676..e9af2dc046d4b99e5c7768419800f28454f0fcc6 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodejpeg2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imagefwkencodejpeg2_fuzzer/BUILD.gn
@@ -57,6 +57,7 @@ ohos_fuzztest("Imagefwkencodejpeg2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imageplugin2_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imageplugin2_fuzzer/BUILD.gn
index 46bf145fa198a71b054985fa63fa9f7cbf3743d1..9c93898e613e18fa4a58a0dff9f9d79c30f9e29f 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imageplugin2_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imageplugin2_fuzzer/BUILD.gn
@@ -56,6 +56,7 @@ ohos_fuzztest("ImagePlugin2FuzzTest") {
     "drivers_interface_display:libdisplay_buffer_hdi_impl",
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/innerkitsimpl/test/fuzztest/imageplugin_fuzzer/BUILD.gn b/frameworks/innerkitsimpl/test/fuzztest/imageplugin_fuzzer/BUILD.gn
index a3a63b8f3c584999506a5294f8e4e412113134e8..c0a74722a929f6f27907dbf511ac9ac1621c88c3 100644
--- a/frameworks/innerkitsimpl/test/fuzztest/imageplugin_fuzzer/BUILD.gn
+++ b/frameworks/innerkitsimpl/test/fuzztest/imageplugin_fuzzer/BUILD.gn
@@ -54,6 +54,7 @@ ohos_fuzztest("ImagePluginFuzzTest") {
     "drivers_interface_display:libdisplay_composer_hdi_impl_1.2",
     "drivers_interface_display:libdisplay_composer_proxy_1.0",
     "graphic_2d:color_manager",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "libexif:libexif",
     "libjpeg-turbo:turbojpeg",
diff --git a/frameworks/kits/js/common/picture_ndk/BUILD.gn b/frameworks/kits/js/common/picture_ndk/BUILD.gn
index e9af0b512a7d30100fe89ff38d2a252ff293d688..1e53f2a4ebd616e59d2f4d9d68a80b589513c706 100644
--- a/frameworks/kits/js/common/picture_ndk/BUILD.gn
+++ b/frameworks/kits/js/common/picture_ndk/BUILD.gn
@@ -93,6 +93,7 @@ ohos_shared_library("picture") {
 
   external_deps = [
     "c_utils:utils",
+    "graphic_surface:surface",
     "hilog:libhilog",
     "ipc:ipc_single",
   ]