diff --git a/bundle.json b/bundle.json
index d3909616ec745f782b1bbff348d0fb92c599f2ba..b30fcc23696086cb020d097316011d1be8a63442 100644
--- a/bundle.json
+++ b/bundle.json
@@ -59,7 +59,6 @@
                 "c_utils",
                 "eventhandler",
                 "hilog",
-                "icu",
                 "init",
                 "ipc",
                 "napi",
@@ -69,6 +68,7 @@
                 "samgr"
             ],
             "third_party": [
+                "icu",
                 "libphonenumber",
                 "libpng",
                 "libxml2"
diff --git a/frameworks/intl/BUILD.gn b/frameworks/intl/BUILD.gn
index 907e18b6cd59279f165dc328d882a1e26eaec445..33fa9cdc3aca6e552e12501bdb7fcab9378943eb 100644
--- a/frameworks/intl/BUILD.gn
+++ b/frameworks/intl/BUILD.gn
@@ -69,6 +69,10 @@ ohos_shared_library("preferred_language") {
 
 config("intl_util_config") {
   include_dirs = [
+    "//third_party/icu/icu4c/source",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+    "//third_party/icu/icu4c/source/common/unicode",
     "//base/global/i18n/frameworks/intl/include",
     "//base/global/i18n/interfaces/native/inner_api/i18n/include",
   ]
@@ -151,6 +155,9 @@ ohos_shared_library("intl_util") {
     ":zh_Hans_region_xml",
     ":zh_Hans_timezone_xml",
     ":zh_datetime_xml",
+    "//third_party/icu/icu4c:ohos_icudat",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libpng:libpng",
     "//third_party/libxml2:xml2",
@@ -163,10 +170,6 @@ ohos_shared_library("intl_util") {
     "access_token:libtokenid_sdk",
     "c_utils:utils",
     "hilog:libhilog",
-    "icu:icundk",
-    "icu:ohos_icudat",
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
     "init:libbegetutil",
     "ipc:ipc_core",
   ]
diff --git a/frameworks/intl/include/collator.h b/frameworks/intl/include/collator.h
index 054641bf770c9bae859f52bfc89578837f12f3e6..3d835b4c5b257a259b34c45a0cb4ae63a1837bb6 100644
--- a/frameworks/intl/include/collator.h
+++ b/frameworks/intl/include/collator.h
@@ -24,7 +24,7 @@
 #include "memory"
 #include "unicode/coll.h"
 #include "unicode/locid.h"
-#include "unicode/utypes.h"
+#include "utypes.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/include/entity_recognizer.h b/frameworks/intl/include/entity_recognizer.h
index cf7dad5783ae86d571457aee083b310e5f050f97..67e1552692ca10f3ba8f1189af20fbcec5709a75 100644
--- a/frameworks/intl/include/entity_recognizer.h
+++ b/frameworks/intl/include/entity_recognizer.h
@@ -15,7 +15,7 @@
 #ifndef OHOS_GLOBAL_I18N_ENTITY_RECOGNIZER_H
 #define OHOS_GLOBAL_I18N_ENTITY_RECOGNIZER_H
 
-#include <unicode/locid.h>
+#include <locid.h>
 #include <string>
 #include <vector>
 #include "date_time_matched.h"
diff --git a/frameworks/intl/include/i18n_break_iterator.h b/frameworks/intl/include/i18n_break_iterator.h
index 8b13c51cdad890f5be639b19d37e3ef0ad731147..2f0e20b11ea863d6e7d81bb8950965c164b72ae2 100644
--- a/frameworks/intl/include/i18n_break_iterator.h
+++ b/frameworks/intl/include/i18n_break_iterator.h
@@ -19,7 +19,7 @@
 
 #include "iosfwd"
 #include "unicode/brkiter.h"
-#include "unicode/unistr.h"
+#include "unistr.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/include/i18n_calendar.h b/frameworks/intl/include/i18n_calendar.h
index 1b1023ee436cd2584e0e05bab1187d154361cd26..f58dc9c60df38cd30bdaabd275c463b9fc03c770 100644
--- a/frameworks/intl/include/i18n_calendar.h
+++ b/frameworks/intl/include/i18n_calendar.h
@@ -19,10 +19,10 @@
 #include <cstdint>
 
 #include "iosfwd"
-#include "unicode/locid.h"
+#include "locid.h"
 #include "unicode/calendar.h"
 #include "unicode/ucal.h"
-#include "unicode/utypes.h"
+#include "utypes.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/include/i18n_normalizer.h b/frameworks/intl/include/i18n_normalizer.h
index cf43cb0168108a106bc73cd00491f9d9cc0d7ed2..af613ff6d358bce1741c4c1f320c04c47bab55c7 100644
--- a/frameworks/intl/include/i18n_normalizer.h
+++ b/frameworks/intl/include/i18n_normalizer.h
@@ -17,7 +17,7 @@
 #define OHOS_GLOBAL_I18N_I18N_NORMALIZER_H
 
 #include "i18n_types.h"
-#include "unicode/normalizer2.h"
+#include "normalizer2.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/include/utils.h b/frameworks/intl/include/utils.h
index 42327c4d41f7bcf222d9fde0fd15e64abe974394..7b219e670993885de1a6f739868036026d14bfa8 100644
--- a/frameworks/intl/include/utils.h
+++ b/frameworks/intl/include/utils.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 #include <unordered_set>
-#include <unicode/locid.h>
+#include <locid.h>
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/src/character.cpp b/frameworks/intl/src/character.cpp
index 9cc8b7e38f931ea387c9626b4b884ba469cad78f..0c9ccd9cd2071b66ede857a64d1e701d24bf6316 100644
--- a/frameworks/intl/src/character.cpp
+++ b/frameworks/intl/src/character.cpp
@@ -21,9 +21,9 @@
 #include "cctype"
 #include "map"
 #include "string"
-#include "unicode/umachine.h"
+#include "umachine.h"
 #include "unicode/unistr.h"
-#include "unicode/urename.h"
+#include "urename.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/src/collator.cpp b/frameworks/intl/src/collator.cpp
index 93821a297ec862fa7403112e9e7e5096e2073a15..4a026211e843a91ba382ef55e688e109a5bb5b31 100644
--- a/frameworks/intl/src/collator.cpp
+++ b/frameworks/intl/src/collator.cpp
@@ -14,19 +14,19 @@
  */
 #include "collator.h"
 
-#include <unicode/stringpiece.h>
+#include <stringpiece.h>
 
 #include "locale_config.h"
 #include "map"
 #include "set"
-#include "unicode/strenum.h"
+#include "strenum.h"
 #include "string"
 #include "unicode/errorcode.h"
 #include "unicode/locid.h"
 #include "unicode/ucol.h"
 #include "unicode/uloc.h"
-#include "unicode/unistr.h"
-#include "unicode/urename.h"
+#include "unistr.h"
+#include "urename.h"
 #include "utility"
 #include "vector"
 
diff --git a/frameworks/intl/src/i18n_break_iterator.cpp b/frameworks/intl/src/i18n_break_iterator.cpp
index 7e762bebf9772cd73843a2ce785de7503ed302db..23e6cfe63e02cc93f83b9baefbb319a54f00f2a3 100644
--- a/frameworks/intl/src/i18n_break_iterator.cpp
+++ b/frameworks/intl/src/i18n_break_iterator.cpp
@@ -14,9 +14,9 @@
  */
 #include "i18n_break_iterator.h"
 
-#include "unicode/brkiter.h"
+#include "brkiter.h"
 #include "string"
-#include "unicode/utypes.h"
+#include "utypes.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/src/i18n_calendar.cpp b/frameworks/intl/src/i18n_calendar.cpp
index 6094f1a0174b4f955c5c7c80ea0d5bb41927140d..78f6ab43ee93eead3e8f4ae0b1a6780c1316928f 100644
--- a/frameworks/intl/src/i18n_calendar.cpp
+++ b/frameworks/intl/src/i18n_calendar.cpp
@@ -22,18 +22,18 @@
 #include "indiancal.h"
 #include "islamcal.h"
 #include "japancal.h"
-#include "unicode/locdspnm.h"
+#include "locdspnm.h"
 #include "persncal.h"
 #include "string"
 #include "ureslocs.h"
 #include "ulocimp.h"
-#include "unicode/umachine.h"
+#include "umachine.h"
 #include "unicode/gregocal.h"
 #include "unicode/timezone.h"
-#include "unicode/unistr.h"
-#include "unicode/urename.h"
+#include "unistr.h"
+#include "urename.h"
 #include "ustr_imp.h"
-#include "unicode/ustring.h"
+#include "ustring.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/frameworks/intl/src/i18n_timezone.cpp b/frameworks/intl/src/i18n_timezone.cpp
index 31b2c37253dab2f54047338df1d877d081c39100..ef05d5ce83bbeb552eae40ce32edbea9062d3364 100644
--- a/frameworks/intl/src/i18n_timezone.cpp
+++ b/frameworks/intl/src/i18n_timezone.cpp
@@ -29,10 +29,10 @@
 #include "set"
 #include "string"
 #include "type_traits"
-#include "unicode/umachine.h"
+#include "umachine.h"
 #include "utility"
 #include "utils.h"
-#include "unicode/utypes.h"
+#include "utypes.h"
 #include "vector"
 #include "unicode/locid.h"
 #include "unicode/unistr.h"
diff --git a/frameworks/intl/src/index_util.cpp b/frameworks/intl/src/index_util.cpp
index e211b191a40fbec47139a3fe5e32fa023e83195a..9605430424c540ab0d35eaef8054d24a1e3be339 100644
--- a/frameworks/intl/src/index_util.cpp
+++ b/frameworks/intl/src/index_util.cpp
@@ -15,10 +15,10 @@
 #include "index_util.h"
 
 #include "locale_config.h"
-#include "unicode/locid.h"
+#include "locid.h"
 #include "string"
-#include "unicode/unistr.h"
-#include "unicode/utypes.h"
+#include "unistr.h"
+#include "utypes.h"
 #include "vector"
 
 namespace OHOS {
diff --git a/frameworks/intl/src/locale_config.cpp b/frameworks/intl/src/locale_config.cpp
index f1cba40c0df785941bd2b3ad5ea3b1221f351ff4..b17189eccb8c4f37a9584d970de5be2a238cde02 100644
--- a/frameworks/intl/src/locale_config.cpp
+++ b/frameworks/intl/src/locale_config.cpp
@@ -26,18 +26,18 @@
 #include "ipc_skeleton.h"
 #include "libxml/parser.h"
 #include "locale_info.h"
-#include "unicode/localebuilder.h"
-#include "unicode/locdspnm.h"
-#include "unicode/locid.h"
+#include "localebuilder.h"
+#include "locdspnm.h"
+#include "locid.h"
 #include "ohos/init_data.h"
 #include "parameter.h"
 #include "securec.h"
 #include "string_ex.h"
 #include "ucase.h"
 #include "ulocimp.h"
-#include "unicode/unistr.h"
+#include "unistr.h"
 #include "ureslocs.h"
-#include "unicode/ustring.h"
+#include "ustring.h"
 #include "ustr_imp.h"
 #include "utils.h"
 #include "tokenid_kit.h"
diff --git a/frameworks/intl/src/phone_number_format.cpp b/frameworks/intl/src/phone_number_format.cpp
index c0425f3ab89628d6cae7f3f21185f0d00a4c5aca..44725f722add32b1f5ebac9fc16f69a64d6ee119 100644
--- a/frameworks/intl/src/phone_number_format.cpp
+++ b/frameworks/intl/src/phone_number_format.cpp
@@ -16,9 +16,9 @@
 
 #include <dlfcn.h>
 
-#include "unicode/localebuilder.h"
+#include "localebuilder.h"
 #include "locale_config.h"
-#include "unicode/locid.h"
+#include "locid.h"
 #include "hilog/log.h"
 #include "map"
 #include "new"
diff --git a/frameworks/intl/src/plural_rules.cpp b/frameworks/intl/src/plural_rules.cpp
index c97fb12424059604a2a55562a420ccf51277bc42..91d5145b2bb74dbfb327b61308081d1faac04f38 100644
--- a/frameworks/intl/src/plural_rules.cpp
+++ b/frameworks/intl/src/plural_rules.cpp
@@ -14,13 +14,13 @@
  */
 #include "plural_rules.h"
 
-#include <unicode/stringpiece.h>
+#include <stringpiece.h>
 
 #include "algorithm"
 #include "hilog/log_c.h"
 #include "hilog/log_cpp.h"
 #include "locale_config.h"
-#include "unicode/locid.h"
+#include "locid.h"
 #include "plural_rules.h"
 #include "map"
 #include "set"
@@ -29,7 +29,7 @@
 #include "unicode/upluralrules.h"
 #include "utility"
 #include "utils.h"
-#include "unicode/utypes.h"
+#include "utypes.h"
 #include "vector"
 
 namespace OHOS {
diff --git a/frameworks/intl/test/BUILD.gn b/frameworks/intl/test/BUILD.gn
index 3459364e4b8f32688e55fc340543921b17aa6cae..f43dfbf47266b30bd5ccff5975680297bd643366 100644
--- a/frameworks/intl/test/BUILD.gn
+++ b/frameworks/intl/test/BUILD.gn
@@ -32,6 +32,9 @@ ohos_unittest("intl_test") {
     "//base/global/i18n/interfaces/native/inner_api/i18n/include",
     "//base/global/i18n/interfaces/native/inner_api/preferred_language/include",
     "//base/global/i18n/services/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/common/unicode",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,8 +44,6 @@ ohos_unittest("intl_test") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
     "init:libbegetutil",
   ]
 
@@ -50,6 +51,8 @@ ohos_unittest("intl_test") {
     "//base/global/i18n/frameworks/intl:build_module",
     "//base/global/i18n/services:i18n_service_ability",
     "//third_party/googletest:gtest_main",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libpng:libpng",
   ]
diff --git a/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn
index 2c4d74ad9f5d0dd7499f2cd64198ded3359b569e..910b11417cd3cbc81d7981dd4ef844cbdf1a4c34 100644
--- a/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/breakiterator_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("BreakIteratorFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/breakiterator_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("BreakIteratorFuzzTest") {
   sources = [ "breakiterator_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn
index 39f0ea246eb8bb21f6cb1224dd4afed1f551241f..cb8412669a4ccfea699f79ad8a3ab428fed2acf3 100644
--- a/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/calendar_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("CalendarFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("CalendarFuzzTest") {
   sources = [ "calendar_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp b/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp
index 21c36326704398145fdc2d4dc0501b0a1b1cf732..eeef4ce2e05d6ba5fa15a23987c98db25c12039b 100644
--- a/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp
+++ b/frameworks/intl/test/fuzztest/calendar_fuzzer/calendar_fuzzer.cpp
@@ -19,7 +19,7 @@
 #include "i18n_calendar.h"
 #include "calendar_fuzzer.h"
 #include "unicode/ucal.h"
-#include "unicode/utypes.h"
+#include "utypes.h"
 
 namespace OHOS {
     bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size)
diff --git a/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn
index 522f5dc4da951056ecce5454e6b8affd1cd3aec2..6d8e626112e406bfc3c696424348a4042a640e2c 100644
--- a/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/character_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("CharacterFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/character_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("CharacterFuzzTest") {
   sources = [ "character_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn
index fc467adeeaee44d93360edcbb33e7a5766f77f30..42f32dd9e58659da65c6aeb66c80f74d8f25490b 100644
--- a/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/collator_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("CollatorFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/collator_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -37,11 +41,10 @@ ohos_fuzztest("CollatorFuzzTest") {
 
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn
index efeade45c84ce9050d6bdb5e6462841d82de1a95..5a7fdad72e6a360abc3f22b63e8ca3280c0383ed 100644
--- a/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/datetimefilter_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("DateTimeFilterFuzzTest") {
 
   include_dirs = [
     "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,15 +43,12 @@ ohos_fuzztest("DateTimeFilterFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libxml2:xml2",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn
index 6064176ae6475a5210a3e04dd8bac4d3710d820c..ee91adf68aedc582c2247a4a6e541c53a41e3786 100644
--- a/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/datetimeformat_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("DateTimeFormatFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("DateTimeFormatFuzzTest") {
   sources = [ "datetimeformat_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn
index 0a57eff59b56f978b0f1ec011ce558946e8c0008..29420aa8da629d2eb41dd2135728cb4d11328e7f 100644
--- a/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/datetimerule_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("DateTimeRuleFuzzTest") {
 
   include_dirs = [
     "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,15 +43,12 @@ ohos_fuzztest("DateTimeRuleFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libxml2:xml2",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn
index 33c7172fb53a9777641de64fcc3aa398d785dda3..5353d5ad6c5a302589a51e9d05d9aee3846e28df 100644
--- a/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/entityrecongnizer_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("EntityRecongnizerFuzzTest") {
 
   include_dirs = [
     "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,15 +43,12 @@ ohos_fuzztest("EntityRecongnizerFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libxml2:xml2",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn
index 7330a49c9e5d1362f659527c4793ae2c917b5906..f33d17fbc8554cce20a7333e234aefef65b1a8b7 100644
--- a/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/holidaymanager_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("HolidayManagerFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("HolidayManagerFuzzTest") {
   sources = [ "holidaymanager_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn
index 21bcd24f9424619412c17acc5e68bc3591d94c3e..41413e70707e07808ee0ad51ff6c853a7246acaa 100644
--- a/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/indexutil_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("IndexUtilFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("IndexUtilFuzzTest") {
   sources = [ "indexutil_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn
index 0e673e5f62c87c6c47e803e31bf54eb48c7dda6a..e031c7d0b908e1de76066252dbd9e8240d7ffa84 100644
--- a/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/localecompare_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("LocaleCompareFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("LocaleCompareFuzzTest") {
   sources = [ "localecompare_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn
index f0e7fe80e35ba7742a2f1ee2f9a05f4a4b929b84..d42b98a407f75facde51c47f1452d15915424e3c 100644
--- a/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/localeconfigget_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("LocaleConfigGetFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/localeconfigget_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("LocaleConfigGetFuzzTest") {
   sources = [ "localeconfigget_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn
index 8581f7b83fccb894228ddeac44523beef30830d9..d5595bf77a07b8dc3a38754d1ee520564d73740c 100644
--- a/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/localeconfigset_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("LocaleConfigSetFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("LocaleConfigSetFuzzTest") {
   sources = [ "localeconfigset_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn
index da85054894683d22e2dd0ca059e1cad95a60294c..ba12b42933533bb1b3f395f9302319821e7625ea 100644
--- a/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/localeinfo_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("LocaleInfoFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/localeinfo_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("LocaleInfoFuzzTest") {
   sources = [ "localeinfo_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn
index 82d82ead771e3ee750487c9dcffdd3a64ffc6c35..f4bd9cb53feb9664826ebbbbe3fa99c00db62f61 100644
--- a/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/measuredata_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("MeasureDataFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/measuredata_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("MeasureDataFuzzTest") {
   sources = [ "measuredata_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn
index d3c4a57301d3aff7923fbf2b367c79bbc45f8e32..8fd80fa625074d5c0ea26a2dcd719b5843c2d23c 100644
--- a/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/normalizer_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("NormalizerFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("NormalizerFuzzTest") {
   sources = [ "normalizer_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn
index 6aa07e0923f8e72725c0aa87de3ab722b2722694..2f67bad2ee519ab86d00a12896fe057866603164 100644
--- a/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/numberformat_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("NumberFormatFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/numberformat_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("NumberFormatFuzzTest") {
   sources = [ "numberformat_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn
index d0081ff17a73b36f0439611c40dba1b3b1d8d3a7..1093990b009d721938e4303b3771810d40063a6f 100644
--- a/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/phonenumberformat_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("PhoneNumberFormatFuzzTest") {
 
   include_dirs = [
     "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/protobuf/src",
@@ -39,11 +41,10 @@ ohos_fuzztest("PhoneNumberFormatFuzzTest") {
   sources = [ "phonenumberformat_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn
index e88f71653de45fafea39e1b5546604e7c1dbe1a9..0ac4be110650bc547b446a229dfbc4c7a073e03a 100644
--- a/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/phonenumbermatched_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("PhoneNumberMatchedFuzzTest") {
 
   include_dirs = [
     "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,14 +43,11 @@ ohos_fuzztest("PhoneNumberMatchedFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn
index d1719d400ae0a8a3409777383f4bbefb55aa9afc..7bf2c5f6982e555b4afb54a10e439e60f71f05ea 100644
--- a/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/pluralrules_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("PluralRulesFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("PluralRulesFuzzTest") {
   sources = [ "pluralrules_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn
index a2d3dab4b75f7368e7f738131bba37c529550193..ee55404ec1e8883f9285deb4f18b69322e0279ad 100644
--- a/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/preferredlanguage_fuzzer/BUILD.gn
@@ -27,6 +27,8 @@ ohos_fuzztest("PreferredLanguageFuzzTest") {
   include_dirs = [
     "../../../include",
     "../../../../../interfaces/native/inner_api/preferred_language/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
   ]
   cflags = [
     "-g",
@@ -37,11 +39,10 @@ ohos_fuzztest("PreferredLanguageFuzzTest") {
   sources = [ "preferredlanguage_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:preferred_language" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:preferred_language",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn
index 42341a205f10d20caa9ce6bec1903864eda91f91..40b2e074147af9227a1e98d5c0ea75a579db949a 100644
--- a/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/regexrule_fuzzer/BUILD.gn
@@ -26,6 +26,8 @@ ohos_fuzztest("RegexRuleFuzzTest") {
 
   include_dirs = [
     "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -41,14 +43,11 @@ ohos_fuzztest("RegexRuleFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn
index eb3888f8aca454348026ea7928306716f0892556..7e1f35156011162c7a7e9493ed708c42ea13056f 100644
--- a/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("RelativeTimeFormatFuzzTest") {
 
   fuzz_config_file = "//base/global/i18n/frameworks/intl/test/fuzztest/relativetimeformat_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("RelativeTimeFormatFuzzTest") {
   sources = [ "relativetimeformat_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn
index 3193d78b52f075259f7a4c2271e29a2a72274ac8..95b9babe6a03ef4f2805b1a4ec6bb856ac66be72 100644
--- a/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/rulesengine_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("RulesEngineFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -36,14 +40,11 @@ ohos_fuzztest("RulesEngineFuzzTest") {
 
   deps = [
     "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libxml2:xml2",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn
index 54c4b1da41ed7ed8efa715bf6b95192757cee7ec..2d121b4342c6d45e0cfe9046683ee0789dfe0189 100644
--- a/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/systemlocalemanager_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("SystemLocaleManagerFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("SystemLocaleManagerFuzzTest") {
   sources = [ "systemlocalemanager_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn
index f629e3b296cc965e713d2fd08555d5564c97bad3..570a6ebce7f7d668874c2425292d613140ec42ea 100644
--- a/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/taboo_fuzzer/BUILD.gn
@@ -24,7 +24,11 @@ ohos_fuzztest("TabooFuzzTest") {
 
   fuzz_config_file = "."
 
-  include_dirs = [ "../../../include" ]
+  include_dirs = [
+    "../../../include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -34,11 +38,10 @@ ohos_fuzztest("TabooFuzzTest") {
   sources = [ "taboo_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "../../../../intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "../../../../intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn
index e6aa96cb50aabe02738bfca2d82e6d1977223b98..40e23c6a981125a0967174209f1314dd1be7148e 100644
--- a/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/timezone_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("TimeZoneFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/timezone_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -37,14 +41,11 @@ ohos_fuzztest("TimeZoneFuzzTest") {
 
   deps = [
     "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libpng:libpng",
   ]
 
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
-
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn b/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn
index 694b653ae4ed3c18fdefc14103d9a1e9410c8423..0cc1aa72a923dda88b68d37b1b7bd80c315ebbe2 100644
--- a/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn
+++ b/frameworks/intl/test/fuzztest/utils_fuzzer/BUILD.gn
@@ -25,7 +25,11 @@ ohos_fuzztest("UtilsFuzzTest") {
   fuzz_config_file =
       "//base/global/i18n/frameworks/intl/test/fuzztest/utils_fuzzer"
 
-  include_dirs = [ "//base/global/i18n/frameworks/intl/include" ]
+  include_dirs = [
+    "//base/global/i18n/frameworks/intl/include",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
+  ]
   cflags = [
     "-g",
     "-O0",
@@ -35,11 +39,10 @@ ohos_fuzztest("UtilsFuzzTest") {
   sources = [ "utils_fuzzer.cpp" ]
   configs = []
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
-
-  external_deps = [
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   subsystem_name = "global"
diff --git a/frameworks/intl/test/unittest/locale_config_test.cpp b/frameworks/intl/test/unittest/locale_config_test.cpp
index e6ab0cc9efd711cbd0f4491670f2093f5ec23dfc..3120d5db71d47d4a3567867d9e7b557a8be30afd 100644
--- a/frameworks/intl/test/unittest/locale_config_test.cpp
+++ b/frameworks/intl/test/unittest/locale_config_test.cpp
@@ -16,7 +16,7 @@
 #include "locale_config_test.h"
 #include <gtest/gtest.h>
 #include "locale_config.h"
-#include "unicode/locid.h"
+#include "locid.h"
 #include "parameter.h"
 
 using namespace OHOS::Global::I18n;
diff --git a/frameworks/zone/BUILD.gn b/frameworks/zone/BUILD.gn
index 9c1f67d80f843a95765de417f4d352853273d681..27998b6fc46a59251693c197f6ad7e7d988196a8 100644
--- a/frameworks/zone/BUILD.gn
+++ b/frameworks/zone/BUILD.gn
@@ -17,6 +17,10 @@ config("zone_util_public_configs") {
   include_dirs = [
     "//base/global/i18n/frameworks/intl/include",
     "//base/global/i18n/interfaces/native/inner_api/zone/include",
+    "//third_party/icu/icu4c/source",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/common/unicode",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libxml2/include",
     "//third_party/protobuf/src",
@@ -35,16 +39,14 @@ ohos_shared_library("zone_util") {
   ]
   deps = [
     "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:ohos_icudat",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libphonenumber/cpp:phonenumber_standard",
     "//third_party/libpng:libpng",
     "//third_party/libxml2:xml2",
   ]
-  external_deps = [
-    "hilog:libhilog",
-    "icu:ohos_icudat",
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
-  ]
+  external_deps = [ "hilog:libhilog" ]
   subsystem_name = "global"
   part_name = "i18n"
 }
diff --git a/frameworks/zone/src/zone_util.cpp b/frameworks/zone/src/zone_util.cpp
index 78174f8c41991e4fba661fef19db32f464094eaa..7ae291a0ab1dc697aa51b6f2016c14a8ca01dbc1 100644
--- a/frameworks/zone/src/zone_util.cpp
+++ b/frameworks/zone/src/zone_util.cpp
@@ -18,7 +18,7 @@
 #include "hilog/log.h"
 #include "i18n_timezone.h"
 #include "ohos/init_data.h"
-#include "unicode/strenum.h"
+#include "strenum.h"
 #include "unicode/timezone.h"
 #include "utils.h"
 #include "zone_util.h"
diff --git a/frameworks/zone/test/BUILD.gn b/frameworks/zone/test/BUILD.gn
index 0c54d83679a7bb59cf37e0fd263866e18a8bd575..de73ed52a92c26791060bb0e275b51a86d91bae6 100644
--- a/frameworks/zone/test/BUILD.gn
+++ b/frameworks/zone/test/BUILD.gn
@@ -37,6 +37,8 @@ ohos_unittest("zone_util_test") {
     "//third_party/googletest/googletest/include",
     "//third_party/googletest/googletest",
     "//base/global/i18n/interfaces/native/inner_api/zone/include",
+    "//third_party/icu/icu4c/source/common/unicode",
+    "//third_party/icu/icu4c/source/common",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/protobuf/src",
     "//third_party/protobuf/src/google",
diff --git a/interfaces/js/kits/BUILD.gn b/interfaces/js/kits/BUILD.gn
index 932bc81b341cef35915d86d6d797c6e1c14e5ecb..6fab5bc19d6b74738604c3cd8ba331125c2e9d1d 100644
--- a/interfaces/js/kits/BUILD.gn
+++ b/interfaces/js/kits/BUILD.gn
@@ -30,6 +30,9 @@ ohos_shared_library("intl") {
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
     "//third_party/node/src",
+    "//third_party/icu/icu4c/source",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -37,10 +40,12 @@ ohos_shared_library("intl") {
 
   sources = [ "src/intl_addon.cpp" ]
 
-  deps = [ "//base/global/i18n/frameworks/intl:intl_util" ]
+  deps = [
+    "//base/global/i18n/frameworks/intl:intl_util",
+    "//third_party/icu/icu4c:shared_icuuc",
+  ]
   external_deps = [
     "hilog:libhilog",
-    "icu:shared_icuuc",
     "napi:ace_napi",
   ]
   relative_install_dir = "module"
@@ -58,6 +63,9 @@ ohos_shared_library("i18n") {
     "//foundation/arkui/napi/native_engine",
     "//foundation/arkui/napi/interfaces/kits",
     "//third_party/node/src",
+    "//third_party/icu/icu4c/source",
+    "//third_party/icu/icu4c/source/common",
+    "//third_party/icu/icu4c/source/i18n",
     "//third_party/libphonenumber/cpp/src",
     "//third_party/libphonenumber",
     "//third_party/protobuf/src",
@@ -82,13 +90,13 @@ ohos_shared_library("i18n") {
     "//base/global/i18n/frameworks/intl:intl_util",
     "//base/global/i18n/frameworks/intl:preferred_language",
     "//base/global/i18n/services:i18n_sa_client",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
     "//third_party/libpng:libpng",
   ]
   external_deps = [
     "c_utils:utils",
     "hilog:libhilog",
-    "icu:shared_icui18n",
-    "icu:shared_icuuc",
     "ipc:ipc_core",
     "napi:ace_napi",
     "samgr:samgr_proxy",
diff --git a/interfaces/js/kits/src/entity_recognizer_addon.cpp b/interfaces/js/kits/src/entity_recognizer_addon.cpp
index 6a29f3c7835e83c941553f0bce44e7f95f15f400..2209236276cb7d9923e0f6ab1b019658abfd701f 100644
--- a/interfaces/js/kits/src/entity_recognizer_addon.cpp
+++ b/interfaces/js/kits/src/entity_recognizer_addon.cpp
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <unicode/locid.h>
+#include <locid.h>
 #include "error_util.h"
 #include "hilog/log.h"
 #include "utils.h"
diff --git a/interfaces/native/inner_api/zone/include/zone_util.h b/interfaces/native/inner_api/zone/include/zone_util.h
index 21d898d87317989a363c732ed8623438c471d4e6..ca14643a93298d7960b90cab0cf71b2e03a309c6 100644
--- a/interfaces/native/inner_api/zone/include/zone_util.h
+++ b/interfaces/native/inner_api/zone/include/zone_util.h
@@ -23,7 +23,7 @@
 #include "libxml/tree.h"
 #include "libxml/xmlstring.h"
 #include "phonenumbers/phonenumberutil.h"
-#include "unicode/strenum.h"
+#include "strenum.h"
 
 namespace OHOS {
 namespace Global {
diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn
index 8b22d808314d02e40c0d561a1249fa23670ec63e..6b10acd7f692f1cc1d669b5fec61d4983e78976f 100644
--- a/services/test/BUILD.gn
+++ b/services/test/BUILD.gn
@@ -24,6 +24,7 @@ ohos_unittest("i18n_service_test") {
     "../../frameworks/intl/include",
     "../../interfaces/native/inner_api/preferred_language/include",
     "../../services/include",
+    "//third_party/icu/icu4c/source/common/unicode",
   ]
 
   external_deps = [
@@ -38,6 +39,8 @@ ohos_unittest("i18n_service_test") {
     "../../services:i18n_sa",
     "../../services:i18n_sa_client",
     "//third_party/googletest:gtest_main",
+    "//third_party/icu/icu4c:shared_icui18n",
+    "//third_party/icu/icu4c:shared_icuuc",
   ]
 
   defines = [ "SUPPORT_GRAPHICS" ]