diff --git a/frameworks/cj/ffi/BUILD.gn b/frameworks/cj/ffi/BUILD.gn
index 1bfd132281..6a877424cd 100644
--- a/frameworks/cj/ffi/BUILD.gn
+++ b/frameworks/cj/ffi/BUILD.gn
@@ -49,6 +49,7 @@ ohos_shared_library("cj_ability_ffi") {
 
   deps = [
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
+    "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_native_path}/ability/native:auto_startup_callback",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_native_path}/appkit:app_context_utils",
diff --git a/frameworks/cj/ffi/app/recovery/BUILD.gn b/frameworks/cj/ffi/app/recovery/BUILD.gn
index e571e6c218..fbec4448db 100644
--- a/frameworks/cj/ffi/app/recovery/BUILD.gn
+++ b/frameworks/cj/ffi/app/recovery/BUILD.gn
@@ -37,9 +37,11 @@ ohos_shared_library("cj_app_recovery_ffi") {
   ]
 
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/runtime:runtime",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/ability/native:uiabilitykit_native",
     "${ability_runtime_native_path}/appkit:appkit_native",
diff --git a/frameworks/cj/ffi/ark_interop_helper/BUILD.gn b/frameworks/cj/ffi/ark_interop_helper/BUILD.gn
index e37631b1bd..b90e77bffe 100644
--- a/frameworks/cj/ffi/ark_interop_helper/BUILD.gn
+++ b/frameworks/cj/ffi/ark_interop_helper/BUILD.gn
@@ -35,7 +35,7 @@ ohos_shared_library("ark_interop_helper_ffi") {
     debug = false
   }
 
-  deps = []
+  deps = [ "${ability_runtime_napi_path}/inner/napi_common:napi_common" ]
 
   if (build_ohos_sdk) {
     defines += [ "PREVIEW" ]
diff --git a/frameworks/js/napi/featureAbility/BUILD.gn b/frameworks/js/napi/featureAbility/BUILD.gn
index 7023b33af6..8b164cf022 100644
--- a/frameworks/js/napi/featureAbility/BUILD.gn
+++ b/frameworks/js/napi/featureAbility/BUILD.gn
@@ -56,9 +56,6 @@ ohos_shared_library("featureability") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${windowmanager_path}/interfaces/kits/napi/window_runtime/window_napi",
-    ]
     external_deps += [ "window_manager:window_native_kit" ]
     defines = [
       "SUPPORT_GRAPHICS",
diff --git a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn
index 9d132e6e9e..c34b9327c9 100644
--- a/frameworks/js/napi/inner/napi_ability_common/BUILD.gn
+++ b/frameworks/js/napi/inner/napi_ability_common/BUILD.gn
@@ -35,6 +35,7 @@ ohos_shared_library("napi_ability_common") {
   ]
 
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
diff --git a/frameworks/native/ability/BUILD.gn b/frameworks/native/ability/BUILD.gn
index 8c5f2fc7e2..7262ced0e9 100644
--- a/frameworks/native/ability/BUILD.gn
+++ b/frameworks/native/ability/BUILD.gn
@@ -66,6 +66,7 @@ ohos_shared_library("ability_context_native") {
   ]
 
   deps = [
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
diff --git a/frameworks/native/ability/native/BUILD.gn b/frameworks/native/ability/native/BUILD.gn
index 56aa32965a..d622cf52fa 100644
--- a/frameworks/native/ability/native/BUILD.gn
+++ b/frameworks/native/ability/native/BUILD.gn
@@ -94,11 +94,6 @@ config("ability_public_config") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${windowmanager_path}/interfaces/kits/napi/window_runtime/window_stage_napi",
-      "${windowmanager_path}/interfaces/innerkits/wm",
-      "${windowmanager_path}/interfaces/innerkits/dm",
-    ]
     defines = [ "SUPPORT_GRAPHICS" ]
   }
 }
@@ -314,7 +309,9 @@ ohos_shared_library("abilitykit_native") {
     ":configuration_helper",
     ":continuation_ipc",
     ":extension_blocklist_config",
+    ":extensionkit_native",
     ":ui_service_extension_connection",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
@@ -324,6 +321,7 @@ ohos_shared_library("abilitykit_native") {
     "${ability_runtime_innerkits_path}/napi_base_context:napi_base_context",
     "${ability_runtime_innerkits_path}/runtime:runtime",
     "${ability_runtime_innerkits_path}/wantagent:wantagent_innerkits",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:ability_business_error",
     "${ability_runtime_native_path}/appkit:app_context",
@@ -411,7 +409,6 @@ ohos_shared_library("abilitykit_native") {
   }
 
   public_deps = [
-    ":abilitykit_utils",
     ":extensionkit_native",
     "${ability_runtime_napi_path}/inner/napi_common:napi_common",
   ]
@@ -456,10 +453,6 @@ config("extensionkit_public_config") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${windowmanager_path}/interfaces/innerkits/wm",
-      "${windowmanager_path}/utils/include",
-    ]
     defines = [ "SUPPORT_GRAPHICS" ]
   }
 }
@@ -489,6 +482,7 @@ ohos_shared_library("extensionkit_native") {
   public_configs = [ ":extensionkit_public_config" ]
 
   deps = [
+    ":abilitykit_utils",
     ":configuration_helper",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -662,10 +656,6 @@ config("uiability_config") {
   ]
 
   if (ability_runtime_graphics) {
-    include_dirs += [
-      "${windowmanager_path}/interfaces/innerkits/wm",
-      "${windowmanager_path}/utils/include",
-    ]
     defines = [
       "SUPPORT_GRAPHICS",
       "SUPPORT_SCREEN",
@@ -699,12 +689,15 @@ ohos_shared_library("uiabilitykit_native") {
     ":abilitykit_native",
     ":configuration_helper",
     ":continuation_ipc",
+    ":extensionkit_native",
     ":ui_extension",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
     "${ability_runtime_innerkits_path}/ability_manager:process_options",
     "${ability_runtime_innerkits_path}/runtime:runtime",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/ability/native:insight_intent_executor",
     "${ability_runtime_native_path}/appkit:app_context",
@@ -800,9 +793,11 @@ ohos_shared_library("ability_thread") {
     ":abilitykit_native",
     ":extensionkit_native",
     ":uiabilitykit_native",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/dataobs_manager:dataobs_manager",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/ability:ability_context_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_path}/utils/global/freeze:freeze_util",
@@ -862,6 +857,7 @@ ohos_shared_library("form_extension") {
 
     deps = [
       ":abilitykit_native",
+      ":extensionkit_native",
       "${ability_runtime_innerkits_path}/runtime:runtime",
       "${ability_runtime_napi_path}/inner/napi_common:napi_common",
       "${ability_runtime_native_path}/ability:ability_context_native",
@@ -907,7 +903,10 @@ ohos_shared_library("form_extension_module") {
   configs = [ ":ability_config" ]
   public_configs = [ ":ability_public_config" ]
 
-  deps = [ ":form_extension" ]
+  deps = [
+    ":form_extension",
+    "${ability_runtime_innerkits_path}/runtime:runtime",
+  ]
 
   external_deps = [
     "ability_base:configuration",
@@ -953,6 +952,8 @@ ohos_shared_library("service_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/runtime:runtime",
@@ -1073,7 +1074,9 @@ ohos_shared_library("ui_service_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_service_extension_connection",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/ability_manager:process_options",
@@ -1240,6 +1243,7 @@ ohos_shared_library("continuation_ipc") {
 
   deps = [
     ":abilitykit_utils",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
   ]
@@ -1267,8 +1271,6 @@ ohos_shared_library("continuation_ipc") {
     defines += [ "BGTASKMGR_CONTINUOUS_TASK_ENABLE" ]
   }
 
-  public_deps = []
-
   innerapi_tags = [ "platformsdk_indirect" ]
   subsystem_name = "ability"
   part_name = "ability_runtime"
@@ -1285,7 +1287,10 @@ ohos_shared_library("data_ability_helper") {
   configs = [ ":ability_config" ]
   public_configs = [ ":ability_public_config" ]
 
-  deps = [ ":abilitykit_native" ]
+  deps = [
+    ":abilitykit_native",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
+  ]
 
   external_deps = [
     "ability_base:zuri",
@@ -1330,7 +1335,10 @@ ohos_shared_library("service_extension_module") {
   configs = [ ":ability_config" ]
   public_configs = [ ":ability_public_config" ]
 
-  deps = [ ":service_extension" ]
+  deps = [
+    ":service_extension",
+    "${ability_runtime_innerkits_path}/runtime:runtime",
+  ]
 
   external_deps = [
     "ability_base:configuration",
@@ -1478,8 +1486,6 @@ config("ui_extension_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/ability/native/insight_intent_executor",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/ui_extension_ability",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/ui_extension_base",
-    "${windowmanager_path}/interfaces/kits/napi/embeddable_window_stage",
-    "${windowmanager_path}/interfaces/kits/napi/extension_window",
   ]
 }
 
@@ -1501,6 +1507,7 @@ ohos_shared_library("ui_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_service_extension_connection",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1683,6 +1690,7 @@ ohos_shared_library("share_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1732,6 +1740,7 @@ ohos_shared_library("cj_share_extension") {
   deps = [
     ":abilitykit_native",
     ":cj_ui_extension",
+    ":extensionkit_native",
     ":share_extension",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
@@ -1784,6 +1793,7 @@ ohos_shared_library("action_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -1834,6 +1844,7 @@ ohos_shared_library("cj_action_extension") {
     ":abilitykit_native",
     ":action_extension",
     ":cj_ui_extension",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2049,6 +2060,7 @@ ohos_shared_library("embedded_ui_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2102,6 +2114,7 @@ ohos_shared_library("cj_embedded_ui_extension") {
     ":abilitykit_native",
     ":cj_ui_extension",
     ":embedded_ui_extension",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
@@ -2195,6 +2208,7 @@ ohos_shared_library("auto_fill_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":insight_intent_executor",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
@@ -2315,6 +2329,7 @@ ohos_shared_library("photo_editor_extension") {
 
   deps = [
     ":abilitykit_native",
+    ":extensionkit_native",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/runtime:runtime",
@@ -2373,6 +2388,7 @@ ohos_shared_library("cj_photo_editor_extension") {
     ":abilitykit_native",
     ":cj_extensionkit_native",
     ":cj_ui_extension",
+    ":extensionkit_native",
     ":photo_editor_extension",
     ":ui_extension",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
diff --git a/frameworks/native/appkit/BUILD.gn b/frameworks/native/appkit/BUILD.gn
index 4f9daaa22d..d4211c6432 100644
--- a/frameworks/native/appkit/BUILD.gn
+++ b/frameworks/native/appkit/BUILD.gn
@@ -94,10 +94,6 @@ ohos_shared_library("appkit_native") {
     "${ability_runtime_utils_path}/global/constant",
   ]
 
-  if (ability_runtime_graphics) {
-    include_dirs += [ "${graphic_path}/frameworks/opengl_wrapper/src/EGL" ]
-  }
-
   configs = [
     ":appkit_config",
     ":appkit_exception_config",
@@ -159,9 +155,11 @@ ohos_shared_library("appkit_native") {
     "${ability_runtime_innerkits_path}/app_manager:app_manager",
     "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper",
     "${ability_runtime_innerkits_path}/runtime:runtime",
+    "${ability_runtime_napi_path}/inner/napi_common:napi_common",
     "${ability_runtime_native_path}/ability/native:ability_thread",
     "${ability_runtime_native_path}/ability/native:abilitykit_native",
     "${ability_runtime_native_path}/ability/native:configuration_helper",
+    "${ability_runtime_native_path}/ability/native:extensionkit_native",
     "${ability_runtime_native_path}/ability/native:uiabilitykit_native",
     "${ability_runtime_native_path}/appkit:app_context",
     "${ability_runtime_native_path}/appkit:app_context_utils",
diff --git a/interfaces/inner_api/ability_manager/BUILD.gn b/interfaces/inner_api/ability_manager/BUILD.gn
index 3d739343b5..b97a39669b 100644
--- a/interfaces/inner_api/ability_manager/BUILD.gn
+++ b/interfaces/inner_api/ability_manager/BUILD.gn
@@ -33,7 +33,6 @@ config("ability_manager_public_config") {
     "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/kits",
     "${ability_runtime_path}/interfaces/kits/native/ability/native/continuation/distributed",
-    "${bundlefwk_inner_api_path}/appexecfwk_base/include",
     "${ability_runtime_innerkits_path}/ability_manager/include",
     "${ability_runtime_innerkits_path}/app_manager/include/appmgr",
     "${ability_runtime_path}/interfaces/kits/native/appkit/app",
@@ -397,7 +396,6 @@ ohos_shared_library("ability_connect_callback_stub") {
   defines += [ "AMS_LOG_DOMAIN = 0xD001300" ]
   include_dirs = [
     "include/",
-    "${ability_base_kits_path}/want/include",
     "${ability_runtime_services_path}/abilitymgr/include/utils",
     "${ability_runtime_services_path}/abilitymgr/include",
     "${ability_runtime_services_path}/common/include",
diff --git a/js_environment/test/unittest/uncaught_exception_callback_test/uncaught_exception_callback_test.cpp b/js_environment/test/unittest/uncaught_exception_callback_test/uncaught_exception_callback_test.cpp
index 4231ab8db3..2480902880 100644
--- a/js_environment/test/unittest/uncaught_exception_callback_test/uncaught_exception_callback_test.cpp
+++ b/js_environment/test/unittest/uncaught_exception_callback_test/uncaught_exception_callback_test.cpp
@@ -15,7 +15,6 @@
 
 #include <gtest/gtest.h>
 
-#include "js_environment.h"
 #include "js_runtime.h"
 #include "uncaught_exception_callback.h"
 
diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn
index bd3e546fb1..96a1d1f0b4 100644
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@@ -123,6 +123,7 @@ ohos_shared_library("abilityms") {
   ]
   deps = [
     ":wantagent_manager",
+    "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub",
     "${ability_runtime_innerkits_path}/ability_manager:ability_manager",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_options",
     "${ability_runtime_innerkits_path}/ability_manager:ability_start_setting",
diff --git a/test/moduletest/ability_delegator_test/BUILD.gn b/test/moduletest/ability_delegator_test/BUILD.gn
index 47aa08b283..24eb51d557 100644
--- a/test/moduletest/ability_delegator_test/BUILD.gn
+++ b/test/moduletest/ability_delegator_test/BUILD.gn
@@ -74,10 +74,12 @@ ohos_moduletest("ability_delegator_args_moduletest") {
 
   external_deps = [
     "ability_base:want",
+    "c_utils:utils",
     "googletest:gmock",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
+    "ipc:ipc_core",
   ]
 }
 
diff --git a/test/moduletest/ability_test/BUILD.gn b/test/moduletest/ability_test/BUILD.gn
index 1d31436fde..2a9255eb44 100644
--- a/test/moduletest/ability_test/BUILD.gn
+++ b/test/moduletest/ability_test/BUILD.gn
@@ -73,6 +73,7 @@ ohos_moduletest("ability_moduletest") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
@@ -134,6 +135,7 @@ ohos_moduletest("ability_conetxt_test") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
@@ -222,6 +224,7 @@ ohos_moduletest("data_ability_operation_moduletest") {
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
diff --git a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
index 09dc1e2f51..63ca7cb762 100644
--- a/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
+++ b/test/moduletest/common/ams/specified_ability_service_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_moduletest("specified_ability_service_test") {
     "common_event_service:cesfwk_core",
     "common_event_service:cesfwk_innerkits",
     "dsoftbus:softbus_client",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/moduletest/mission_dump_test/BUILD.gn b/test/moduletest/mission_dump_test/BUILD.gn
index 7c77e1026e..737ef32323 100644
--- a/test/moduletest/mission_dump_test/BUILD.gn
+++ b/test/moduletest/mission_dump_test/BUILD.gn
@@ -56,6 +56,7 @@ ohos_moduletest("mission_dump_test") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "dsoftbus:softbus_client",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/frameworks_kits_ability_native_test/ability_runtime_test.cpp b/test/unittest/frameworks_kits_ability_native_test/ability_runtime_test.cpp
index e77a07bedd..8e3752e86a 100644
--- a/test/unittest/frameworks_kits_ability_native_test/ability_runtime_test.cpp
+++ b/test/unittest/frameworks_kits_ability_native_test/ability_runtime_test.cpp
@@ -16,8 +16,6 @@
 #include <gtest/gtest.h>
 #define private public
 #define protected public
-#include "iremote_object.h"
-#include "iservice_registry.h"
 #include "js_runtime.h"
 #include "mock_runtime.h"
 #include "runtime.h"
diff --git a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
index b06b2ada08..13c62d509b 100644
--- a/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
+++ b/test/unittest/frameworks_kits_appkit_native_test/ability_delegator/BUILD.gn
@@ -77,10 +77,12 @@ ohos_unittest("ability_delegator_args_unittest") {
 
   external_deps = [
     "ability_base:want",
+    "c_utils:utils",
     "googletest:gmock",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
+    "ipc:ipc_core",
   ]
 }
 
diff --git a/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn b/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn
index 35048d3f45..864e5bf39f 100644
--- a/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn
+++ b/test/unittest/prepare_terminate_callback_proxy_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("prepare_terminate_callback_proxy_test") {
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/resident_process_manager_test/BUILD.gn b/test/unittest/resident_process_manager_test/BUILD.gn
index fe2c19403a..b5c88694f2 100755
--- a/test/unittest/resident_process_manager_test/BUILD.gn
+++ b/test/unittest/resident_process_manager_test/BUILD.gn
@@ -53,6 +53,7 @@ ohos_unittest("resident_process_manager_test") {
     "access_token:libaccesstoken_sdk",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/startup_util_test/BUILD.gn b/test/unittest/startup_util_test/BUILD.gn
index 4f2dda579a..134a44c978 100644
--- a/test/unittest/startup_util_test/BUILD.gn
+++ b/test/unittest/startup_util_test/BUILD.gn
@@ -30,8 +30,10 @@ ohos_unittest("startup_util_test") {
   external_deps = [
     "ability_base:want",
     "bundle_framework:appexecfwk_base",
+    "c_utils:utils",
     "googletest:gmock_main",
     "googletest:gtest_main",
+    "ipc:ipc_core",
   ]
 }
 
diff --git a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
index d17ca2614d..3fb37b00c8 100644
--- a/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
+++ b/test/unittest/ui_extension/extension_record_manager_second_test/BUILD.gn
@@ -89,6 +89,7 @@ ohos_unittest("extension_record_manager_second_test") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
index 23bf4b911c..763635e476 100755
--- a/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
+++ b/test/unittest/ui_extension/extension_record_manager_test/BUILD.gn
@@ -82,6 +82,7 @@ ohos_unittest("extension_record_manager_test") {
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/ui_service_extension_test/BUILD.gn b/test/unittest/ui_service_extension_test/BUILD.gn
index f82e0fee1f..2f1da616f0 100644
--- a/test/unittest/ui_service_extension_test/BUILD.gn
+++ b/test/unittest/ui_service_extension_test/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("ui_service_extension_test") {
     "ability_runtime:runtime",
     "ace_engine:ace_uicontent",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "googletest:gmock_main",
     "googletest:gtest_main",
     "hilog:libhilog",
diff --git a/test/unittest/ui_service_host_proxy_test/BUILD.gn b/test/unittest/ui_service_host_proxy_test/BUILD.gn
index 433a9561de..0534f07dd8 100644
--- a/test/unittest/ui_service_host_proxy_test/BUILD.gn
+++ b/test/unittest/ui_service_host_proxy_test/BUILD.gn
@@ -60,6 +60,7 @@ ohos_unittest("ui_service_host_proxy_test") {
     "ability_runtime:runtime",
     "ace_engine:ace_uicontent",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/ui_service_proxy_test/BUILD.gn b/test/unittest/ui_service_proxy_test/BUILD.gn
index 3bcd68e731..7215e3de9c 100644
--- a/test/unittest/ui_service_proxy_test/BUILD.gn
+++ b/test/unittest/ui_service_proxy_test/BUILD.gn
@@ -60,6 +60,7 @@ ohos_unittest("ui_service_proxy_test") {
     "ability_runtime:runtime",
     "ace_engine:ace_uicontent",
     "c_utils:utils",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/test/unittest/unlock_screen_test/BUILD.gn b/test/unittest/unlock_screen_test/BUILD.gn
index 94cd92d31a..0fd4f34aea 100644
--- a/test/unittest/unlock_screen_test/BUILD.gn
+++ b/test/unittest/unlock_screen_test/BUILD.gn
@@ -45,6 +45,7 @@ ohos_unittest("unlock_screen_test") {
   external_deps = [
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
+    "eventhandler:libeventhandler",
     "ffrt:libffrt",
     "googletest:gmock_main",
     "googletest:gtest_main",