diff --git a/bundle.json b/bundle.json
index c564fdcc70917fedd0fcb891617b70224c84c064..e3b350c6422f58da7ae1861e92f0bf12992f6e7e 100644
--- a/bundle.json
+++ b/bundle.json
@@ -102,12 +102,17 @@
         "openssl",
         "power_manager",
         "dsoftbus",
-        "zlib"
+        "zlib",
+        "libuv",
+        "json",
+        "node"
       ],
       "third_party": [
         "libuv",
         "libxml2",
-        "icu"
+        "icu",
+        "json",
+        "node"
       ]
     },
     "build": {
diff --git a/frameworks/ans/BUILD.gn b/frameworks/ans/BUILD.gn
index 80a21b60fc19a8271b2afd250913596d6fff409b..1b9dd66a424ce5c36bcea7be7d1612cc2a345890 100644
--- a/frameworks/ans/BUILD.gn
+++ b/frameworks/ans/BUILD.gn
@@ -67,7 +67,6 @@ config("ans_innerkits_public_config") {
     "${core_path}/common/include",
     "${core_path}/include",
     "${target_gen_dir}",
-    "//third_party/json/single_include",
   ]
   configs = [ "${multimedia_path}/interfaces/innerkits:image_external_config" ]
 }
@@ -293,6 +292,7 @@ ohos_shared_library("ans_innerkits") {
   public_external_deps = [
     "ability_runtime:wantagent_innerkits",
     "image_framework:image_native",
+    "json:nlohmann_json_static",
   ]
 
   if (is_double_framework) {
diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn
index 74a703fdc211d8b78738e77311cc1dc10361729d..c90cde0df5c4e2f3db1097db92281fcb978990a9 100644
--- a/frameworks/core/BUILD.gn
+++ b/frameworks/core/BUILD.gn
@@ -72,6 +72,7 @@ ohos_shared_library("ans_core") {
   external_deps = [
     "ability_base:want",
     "ability_base:zuri",
+    "ability_runtime:app_context",
     "ability_runtime:wantagent_innerkits",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
diff --git a/frameworks/js/napi/BUILD.gn b/frameworks/js/napi/BUILD.gn
index 0e776651bde04a5dbc70014d5e5c078cf023a34f..0378bfb0600da64e2536e730ede67ab31fbe0ac0 100644
--- a/frameworks/js/napi/BUILD.gn
+++ b/frameworks/js/napi/BUILD.gn
@@ -62,12 +62,7 @@ ohos_shared_library("notification") {
   branch_protector_ret = "pac_ret"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/ability/native",
-    "${ability_runtime_napi_path}/inner/napi_common",
     "include",
-    "//third_party/node/src",
-    "//third_party/libuv/include",
-    "//third_party/json/single_include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -139,6 +134,9 @@ ohos_shared_library("notification") {
     "napi:ace_napi",
     "relational_store:native_rdb",
     "resource_management:global_resmgr",
+    "json:nlohmann_json_static",
+    "node:node_header_notice",
+    "libuv:uv",
   ]
 
   relative_install_dir = "module"
diff --git a/frameworks/js/napi/src/manager/BUILD.gn b/frameworks/js/napi/src/manager/BUILD.gn
index 817088fd1846040d5b054571c5e96da16d27983c..3a7e5a31cc01a721deda07094f9911f6b2bef9eb 100644
--- a/frameworks/js/napi/src/manager/BUILD.gn
+++ b/frameworks/js/napi/src/manager/BUILD.gn
@@ -47,11 +47,8 @@ ohos_shared_library("notificationmanager") {
   branch_protector_ret = "pac_ret"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/ability/native",
-    "${ability_runtime_napi_path}/inner/napi_common",
     "../../include",
     "../../include/manager",
-    "//third_party/node/src",
   ]
 
   configs = [ ":native_module_config" ]
@@ -122,6 +119,7 @@ ohos_shared_library("notificationmanager") {
     "ipc:ipc_single",
     "napi:ace_napi",
     "relational_store:native_rdb",
+    "node:node_header_notice",
   ]
 
   defines = []
diff --git a/frameworks/js/napi/src/reminder/BUILD.gn b/frameworks/js/napi/src/reminder/BUILD.gn
index a47a16503e8be2af60231d5ae9808b4e380c2874..edb5a19de92a1e280e6d8ebd67f7c42d948b3300 100644
--- a/frameworks/js/napi/src/reminder/BUILD.gn
+++ b/frameworks/js/napi/src/reminder/BUILD.gn
@@ -39,8 +39,6 @@ ohos_shared_library("reminderagent") {
 
   include_dirs = [
     "../../include",
-    "//third_party/node/src",
-    "//third_party/libuv/include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -78,6 +76,8 @@ ohos_shared_library("reminderagent") {
     "ipc:ipc_single",
     "napi:ace_napi",
     "relational_store:native_rdb",
+    "node:node_header_notice",
+    "libuv:uv",
   ]
 
   relative_install_dir = "module"
@@ -100,8 +100,6 @@ ohos_shared_library("reminderagentmanager") {
   include_dirs = [
     "../../include",
     "../../include/manager",
-    "//third_party/node/src",
-    "//third_party/libuv/include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -136,6 +134,8 @@ ohos_shared_library("reminderagentmanager") {
     "ipc:ipc_single",
     "napi:ace_napi",
     "relational_store:native_rdb",
+    "node:node_header_notice",
+    "libuv:uv",
   ]
 
   relative_install_dir = "module"
diff --git a/frameworks/js/napi/src/subscribe/BUILD.gn b/frameworks/js/napi/src/subscribe/BUILD.gn
index e4445a45cab2c0d4c1f37ff0926d07390f01d62e..51fa5e3bee282ea9f246e6675a213a2c41d8a833 100644
--- a/frameworks/js/napi/src/subscribe/BUILD.gn
+++ b/frameworks/js/napi/src/subscribe/BUILD.gn
@@ -47,12 +47,8 @@ ohos_shared_library("notificationsubscribe") {
   branch_protector_ret = "pac_ret"
 
   include_dirs = [
-    "${ability_runtime_path}/interfaces/kits/native/ability/native",
-    "${ability_runtime_napi_path}/inner/napi_common",
     "../../include",
     "../../include/subscribe",
-    "//third_party/node/src",
-    "//third_party/libuv/include",
   ]
 
   configs = [ ":native_module_config" ]
@@ -90,6 +86,8 @@ ohos_shared_library("notificationsubscribe") {
     "ipc:ipc_single",
     "napi:ace_napi",
     "relational_store:native_rdb",
+    "node:node_header_notice",
+    "libuv:uv",
   ]
 
   relative_install_dir = "module"
diff --git a/frameworks/test/moduletest/BUILD.gn b/frameworks/test/moduletest/BUILD.gn
index 1ed0daf2bede06d0267e8f544569d5de1a9354e7..b9d2b48c51d1af1107c9270fe4c1a5a50ed57a01 100644
--- a/frameworks/test/moduletest/BUILD.gn
+++ b/frameworks/test/moduletest/BUILD.gn
@@ -35,7 +35,6 @@ ohos_moduletest("ans_fw_module_test") {
     "${core_path}/common/include",
     "${core_path}/include",
     "${component_path}/services/ans/include",
-    "//third_party/json/include",
     "${inner_api_path}",
     "${core_path}/common/include",
     "${core_path}/include",
@@ -61,7 +60,6 @@ ohos_moduletest("ans_fw_module_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   defines = []
@@ -88,6 +86,8 @@ ohos_moduletest("ans_fw_module_test") {
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
+    "googletest:gtest_main",
+    "json:nlohmann_json_static",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -112,7 +112,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
     "${core_path}/common/include",
     "${core_path}/include",
     "${component_path}/services/ans/include",
-    "//third_party/json/include",
     "${inner_api_path}",
     "${core_path}/common/include",
     "${core_path}/include",
@@ -134,7 +133,6 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
     "${ability_runtime_path}/frameworks/native/appkit:app_context",
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   defines = []
@@ -164,6 +162,7 @@ ohos_moduletest("ans_innerkits_module_publish_test") {
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
+    "json:nlohmann_json_static",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -202,7 +201,6 @@ ohos_moduletest("ans_innerkits_module_slot_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   defines = []
@@ -231,6 +229,8 @@ ohos_moduletest("ans_innerkits_module_slot_test") {
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
+    "googletest:gtest_main",
+    "json:nlohmann_json_static",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -275,7 +275,6 @@ ohos_moduletest("ans_innerkits_module_setting_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   defines = []
@@ -304,6 +303,8 @@ ohos_moduletest("ans_innerkits_module_setting_test") {
     "relational_store:native_rdb",
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
+    "googletest:gtest_main",
+    "json:nlohmann_json_static",
   ]
 
   subsystem_name = "${subsystem_name}"
diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn
index d0071feac1a31d824cb80f70173ec71456067dde..07329cfd0dafead39c553ae70467803ca9b76a35 100644
--- a/services/ans/BUILD.gn
+++ b/services/ans/BUILD.gn
@@ -56,6 +56,7 @@ ohos_source_set("ans_service_sources") {
     "${services_path}/ans/include/notification_extension",
     "${services_path}/ans/include/utils",
     "${services_path}/ans/include/slot_manager",
+    "${services_path}/ans/src",
   ]
 
   defines = []
diff --git a/services/ans/src/advanced_notification_publish/live_publish_process.cpp b/services/ans/src/advanced_notification_publish/live_publish_process.cpp
index 35dda3e3fc0f587461ca13d54e252e13a0cd73ab..35487d3040259de8be18522292f15ce3a374a9ef 100644
--- a/services/ans/src/advanced_notification_publish/live_publish_process.cpp
+++ b/services/ans/src/advanced_notification_publish/live_publish_process.cpp
@@ -24,7 +24,7 @@
 #include "notification_live_view_content.h"
 #include "os_account_manager_helper.h"
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 
 namespace OHOS {
 namespace Notification {
diff --git a/services/ans/src/disturb_manager/add_do_not_disturb_profiles.cpp b/services/ans/src/disturb_manager/add_do_not_disturb_profiles.cpp
index daf9d105401d33b81ae7d3f172588cf33173fdca..feef2611764257e38efbb1420e960d7727581606 100644
--- a/services/ans/src/disturb_manager/add_do_not_disturb_profiles.cpp
+++ b/services/ans/src/disturb_manager/add_do_not_disturb_profiles.cpp
@@ -23,7 +23,7 @@
 #include "notification_preferences.h"
 #include "os_account_manager_helper.h"
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 namespace OHOS {
 namespace Notification {
 ErrCode DisturbManager::HandleAddDoNotDisturbProfiles(MessageParcel &data, MessageParcel &reply)
diff --git a/services/ans/src/disturb_manager/get_do_not_disturb_date.cpp b/services/ans/src/disturb_manager/get_do_not_disturb_date.cpp
index f803bb07f3aa2a5ffbe6848927aaad5deb903334..286584514f70acc7fcbce1e69111b5064235df52 100644
--- a/services/ans/src/disturb_manager/get_do_not_disturb_date.cpp
+++ b/services/ans/src/disturb_manager/get_do_not_disturb_date.cpp
@@ -23,7 +23,7 @@
 #include "notification_preferences.h"
 #include "os_account_manager_helper.h"
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 namespace OHOS {
 namespace Notification {
 ErrCode DisturbManager::HandleGetDoNotDisturbDate(MessageParcel &data, MessageParcel &reply)
diff --git a/services/ans/src/disturb_manager/get_do_not_disturb_profile.cpp b/services/ans/src/disturb_manager/get_do_not_disturb_profile.cpp
index 365271f6a1e7a9bbf5451ea5d6c1ea809eb9ffaa..68c9d3438e56c6c3dc069b45bd9da6ebf7fe937b 100644
--- a/services/ans/src/disturb_manager/get_do_not_disturb_profile.cpp
+++ b/services/ans/src/disturb_manager/get_do_not_disturb_profile.cpp
@@ -23,7 +23,7 @@
 #include "notification_preferences.h"
 #include "os_account_manager_helper.h"
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 namespace OHOS {
 namespace Notification {
 ErrCode DisturbManager::HandleGetDoNotDisturbProfile(MessageParcel &data, MessageParcel &reply)
diff --git a/services/ans/src/disturb_manager/set_do_not_disturb_date.cpp b/services/ans/src/disturb_manager/set_do_not_disturb_date.cpp
index 52b42d0b487c6226d4ba154cff6d6a2c503bd205..50f3006668a431e92dfd67ead9023209180ce97d 100644
--- a/services/ans/src/disturb_manager/set_do_not_disturb_date.cpp
+++ b/services/ans/src/disturb_manager/set_do_not_disturb_date.cpp
@@ -23,7 +23,7 @@
 #include "notification_preferences.h"
 #include "os_account_manager_helper.h"
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 
 namespace OHOS {
 namespace Notification {
diff --git a/services/ans/src/slot_manager/AddSlots.cpp b/services/ans/src/slot_manager/AddSlots.cpp
index 4809b484bc0f934df251509f4858933dc6408f73..8ce65c814f2cde7728395ac81d9e4d6248d7b2a7 100644
--- a/services/ans/src/slot_manager/AddSlots.cpp
+++ b/services/ans/src/slot_manager/AddSlots.cpp
@@ -33,7 +33,7 @@
 #include "smart_reminder_center.h"
 #endif
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 #include "notification_extension_wrapper.h"
 #include "notification_analytics_util.h"
 
diff --git a/services/ans/src/slot_manager/setNotificationEnableSlot.cpp b/services/ans/src/slot_manager/setNotificationEnableSlot.cpp
index 6be51fc49fc256ca08586ab7d42b58511f02d7d7..b85cdbe0706bafa9b2e5dd996c1879e3ec6fb1a2 100644
--- a/services/ans/src/slot_manager/setNotificationEnableSlot.cpp
+++ b/services/ans/src/slot_manager/setNotificationEnableSlot.cpp
@@ -35,7 +35,7 @@
 #include "smart_reminder_center.h"
 #endif
 
-#include "../advanced_notification_inline.cpp"
+#include "advanced_notification_inline.cpp"
 #include "notification_extension_wrapper.h"
 #include "notification_analytics_util.h"
 #include "event_report.h"
diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn
index 98b6024e1298acfb6f78d15b1891763394cfcb54..715eb0b8b081f680d119bdddbca284781b8a0fde 100644
--- a/services/ans/test/unittest/BUILD.gn
+++ b/services/ans/test/unittest/BUILD.gn
@@ -54,8 +54,6 @@ ohos_unittest("ans_unit_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -94,6 +92,8 @@ ohos_unittest("ans_unit_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
+    "googletest:gmock_main",
   ]
 
   if (device_usage) {
@@ -146,8 +146,6 @@ ohos_unittest("notification_preferences_database_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -181,6 +179,8 @@ ohos_unittest("notification_preferences_database_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
+    "googletest:gmock_main",
   ]
 
   if (device_usage) {
@@ -235,8 +235,6 @@ ohos_unittest("notification_subscriber_manager_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -270,6 +268,8 @@ ohos_unittest("notification_subscriber_manager_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
+    "googletest:gmock_main",
   ]
 
   if (device_usage) {
@@ -335,7 +335,6 @@ ohos_unittest("notification_service_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -370,6 +369,7 @@ ohos_unittest("notification_service_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (device_usage) {
@@ -432,7 +432,6 @@ ohos_unittest("notification_publish_service_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -469,6 +468,7 @@ ohos_unittest("notification_publish_service_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (device_usage) {
@@ -529,7 +529,6 @@ ohos_unittest("notification_service_publish_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -564,6 +563,7 @@ ohos_unittest("notification_service_publish_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (device_usage) {
@@ -617,7 +617,6 @@ ohos_unittest("notification_preferences_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -653,6 +652,7 @@ ohos_unittest("notification_preferences_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (device_usage) {
@@ -746,7 +746,6 @@ ohos_unittest("bundle_manager_helper_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -772,6 +771,7 @@ ohos_unittest("bundle_manager_helper_branch_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -800,7 +800,6 @@ ohos_unittest("notification_dialog_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -828,6 +827,7 @@ ohos_unittest("notification_dialog_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -864,7 +864,6 @@ ohos_unittest("notification_subscriber_manager_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (distributed_notification_supported) {
@@ -897,6 +896,7 @@ ohos_unittest("notification_subscriber_manager_branch_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -1005,8 +1005,6 @@ ohos_unittest("notification_preferences_database_branch_test") {
 
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
-    "//third_party/googletest:gtest_main",
-    "//third_party/libxml2:libxml2",
   ]
 
   external_deps = [
@@ -1033,6 +1031,8 @@ ohos_unittest("notification_preferences_database_branch_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "libxml2:libxml2",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -1056,7 +1056,6 @@ ohos_unittest("push_callback_stub_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1082,6 +1081,7 @@ ohos_unittest("push_callback_stub_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -1111,7 +1111,6 @@ ohos_unittest("notification_rdb_data_mgr_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1137,6 +1136,7 @@ ohos_unittest("notification_rdb_data_mgr_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
   ]
 
   if (player_framework) {
@@ -1164,8 +1164,6 @@ ohos_unittest("notification_config_parse_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/googletest:gtest_main",
-    "//third_party/libxml2:libxml2",
   ]
 
   external_deps = [
@@ -1191,6 +1189,8 @@ ohos_unittest("notification_config_parse_test") {
     "safwk:system_ability_fwk",
     "samgr:samgr_proxy",
     "time_service:time_client",
+    "googletest:gtest_main",
+    "libxml2:libxml2",
   ]
 
   if (player_framework) {
diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn
index 2a8670fa1e11440ba5ba7fca9f82ee104432942c..b9182c51c63e0354ef13988a86b676873b0532da 100644
--- a/services/distributed/test/unittest/BUILD.gn
+++ b/services/distributed/test/unittest/BUILD.gn
@@ -70,7 +70,6 @@ ohos_unittest("ans_distributed_unit_test") {
 
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -88,6 +87,7 @@ ohos_unittest("ans_distributed_unit_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -116,7 +116,6 @@ ohos_unittest("distributed_preferences_database_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -133,6 +132,7 @@ ohos_unittest("distributed_preferences_database_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -162,7 +162,6 @@ ohos_unittest("distributed_screen_status_manager_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -179,6 +178,7 @@ ohos_unittest("distributed_screen_status_manager_branch_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -208,7 +208,6 @@ ohos_unittest("distributed_database_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -225,6 +224,7 @@ ohos_unittest("distributed_database_branch_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -248,7 +248,6 @@ ohos_unittest("distributed_preferences_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -265,6 +264,7 @@ ohos_unittest("distributed_preferences_branch_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -285,7 +285,6 @@ ohos_unittest("distributed_device_callback_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -302,6 +301,7 @@ ohos_unittest("distributed_device_callback_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -322,7 +322,6 @@ ohos_unittest("distributed_database_callback_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -338,6 +337,7 @@ ohos_unittest("distributed_database_callback_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -358,7 +358,6 @@ ohos_unittest("distributed_flow_control_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -374,6 +373,7 @@ ohos_unittest("distributed_flow_control_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
@@ -397,7 +397,6 @@ ohos_unittest("distributed_notification_manager_branch_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/distributed:libans_distributed",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -415,6 +414,7 @@ ohos_unittest("distributed_notification_manager_branch_test") {
     "image_framework:image_native",
     "ipc:ipc_core",
     "kv_store:distributeddata_inner",
+    "googletest:gtest_main",
   ]
 
   subsystem_name = "${subsystem_name}"
diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn
index 54cf07a3e3ae94f4525d1dfd3906949ebbb65e12..53738ae4014b0871ecd6f702be5501b76992c017 100644
--- a/services/test/moduletest/BUILD.gn
+++ b/services/test/moduletest/BUILD.gn
@@ -14,7 +14,6 @@
 import("//base/notification/distributed_notification_service/notification.gni")
 import("//build/ohos.gni")
 import("//build/test.gni")
-import("//foundation/ability/ability_runtime/ability_runtime.gni")
 
 module_output_path =
     "${component_name}/distributed_notification_service/moduletest"
diff --git a/test/bechmarktest/BUILD.gn b/test/bechmarktest/BUILD.gn
index 8c70f9303876f2acacc5c3a6fd962ae221b5ffaf..8c9821ea2ace5606d477eb427fc66188bc62a807 100644
--- a/test/bechmarktest/BUILD.gn
+++ b/test/bechmarktest/BUILD.gn
@@ -9,7 +9,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//build/ohos.gni")
 
diff --git a/test/bechmarktest/notification_publish_test/BUILD.gn b/test/bechmarktest/notification_publish_test/BUILD.gn
index 7bdf0fc180117af939d20e8f4a2a95c3f5c544ee..42102c44e34287443183a9660186c61822f3d760 100644
--- a/test/bechmarktest/notification_publish_test/BUILD.gn
+++ b/test/bechmarktest/notification_publish_test/BUILD.gn
@@ -28,8 +28,6 @@ ohos_benchmarktest("Benchmark_Publish_Test") {
 
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
-    "//third_party/benchmark:benchmark",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -39,6 +37,8 @@ ohos_benchmarktest("Benchmark_Publish_Test") {
     "c_utils:utils",
     "image_framework:image_native",
     "relational_store:native_rdb",
+    "googletest:gtest_main",
+    "benchmark:benchmark",
   ]
   subsystem_name = "${subsystem_name}"
   part_name = "${component_name}"
diff --git a/test/bechmarktest/notification_services_test/BUILD.gn b/test/bechmarktest/notification_services_test/BUILD.gn
index d6d5d43054cf6afaa09d272e12db89db3ad33046..cfa6fa8f621b8c7780ff14e45860de36058c2706 100644
--- a/test/bechmarktest/notification_services_test/BUILD.gn
+++ b/test/bechmarktest/notification_services_test/BUILD.gn
@@ -22,9 +22,6 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") {
   include_dirs = [
     "include",
     "mock/include",
-    "${access_token_path}/interfaces/innerkits/token_setproc/include",
-    "${access_token_path}/interfaces/innerkits/nativetoken/include",
-    "${access_token_path}/interfaces/innerkits/accesstoken/include",
     "${services_path}/ans/include",
   ]
 
@@ -37,8 +34,6 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:libans",
-    "//third_party/benchmark:benchmark",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -55,6 +50,8 @@ ohos_benchmarktest("Benchmark_Notification_Servece_Test") {
     "image_framework:image_native",
     "kv_store:distributeddata_inner",
     "relational_store:native_rdb",
+    "googletest:gtest_main",
+    "benchmark:benchmark",
   ]
   subsystem_name = "${subsystem_name}"
   part_name = "${component_name}"
diff --git a/test/fuzztest/fuzz_common_base/BUILD.gn b/test/fuzztest/fuzz_common_base/BUILD.gn
index 6bba7888b51470cf3a0aff8c398c7b8ebb4f6034..a57779d0ccd4d3b16862a01fd4883b3790d8b18a 100644
--- a/test/fuzztest/fuzz_common_base/BUILD.gn
+++ b/test/fuzztest/fuzz_common_base/BUILD.gn
@@ -26,11 +26,14 @@ static_library("fuzz_common_base") {
     "-Wno-unused-variable",
     "-fno-omit-frame-pointer",
   ]
-  public_deps = [ "${commonlibrary_utils_path}/base:utils" ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
   ]
+
+  public_external_deps = [
+    "c_utils:utils",
+  ]
 }
diff --git a/tools/test/unittest/dump/BUILD.gn b/tools/test/unittest/dump/BUILD.gn
index c9315d57b80d2731f7d0eabb47c9294cc999ddc8..21e1764f5951446c04cbc978715a7927f532df80 100644
--- a/tools/test/unittest/dump/BUILD.gn
+++ b/tools/test/unittest/dump/BUILD.gn
@@ -19,7 +19,6 @@ module_output_path =
 
 config("tools_dump_config_mock") {
   include_dirs = [
-    "//third_party/googletest/googlemock/include",
     "${tools_path}/test/mock",
     "${component_path}/services/ans/include",
   ]
@@ -62,8 +61,6 @@ ohos_unittest("notification_shell_command_dump_test") {
   deps = [
     "${frameworks_module_ans_path}:ans_innerkits",
     "${services_path}/ans:ans_service_sources",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -78,6 +75,8 @@ ohos_unittest("notification_shell_command_dump_test") {
     "hilog:libhilog",
     "ipc:ipc_core",
     "relational_store:native_rdb",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
   ]
 }