diff --git a/etc/para/BUILD.gn b/etc/para/BUILD.gn
index 4036662e4e986b8f29b4d8e25c9d626515063fec..56c8810dc4d7c63ddb75c1303911bbf412264a3c 100644
--- a/etc/para/BUILD.gn
+++ b/etc/para/BUILD.gn
@@ -16,12 +16,14 @@ import("//build/ohos.gni")
 
 ohos_prebuilt_etc("inputmethod.para") {
   source = "//base/inputmethod/imf/etc/para/inputmethod.para"
+  subsystem_name = "inputmethod"
   part_name = "imf"
   module_install_dir = "etc/param"
 }
 
 ohos_prebuilt_etc("inputmethod.para.dac") {
   source = "//base/inputmethod/imf/etc/para/inputmethod.para.dac"
+  subsystem_name = "inputmethod"
   part_name = "imf"
   module_install_dir = "etc/param"
 }
diff --git a/frameworks/js/napi/common/BUILD.gn b/frameworks/js/napi/common/BUILD.gn
index 0852c67d26f419b8d36b0c5d2ca0c08db97e1914..5c997a9f73e0bfe365a35763dc914de3ea3e3b80 100644
--- a/frameworks/js/napi/common/BUILD.gn
+++ b/frameworks/js/napi/common/BUILD.gn
@@ -55,7 +55,9 @@ ohos_static_library("inputmethod_js_common") {
   public_configs = [ ":inputmethod_js_common_public_config" ]
   deps = [ "${inputmethod_path}/common:inputmethod_common" ]
   external_deps = [
+    "c_utils:utilsbase",
     "eventhandler:libeventhandler",
+    "hilog:libhilog",
     "napi:ace_napi",
   ]
   subsystem_name = "inputmethod"
diff --git a/frameworks/js/napi/inputmethod_extension_ability/BUILD.gn b/frameworks/js/napi/inputmethod_extension_ability/BUILD.gn
index 8daa5abc4431ad37b85f660d191fe665d316f5b5..38466ac018614e56c68a83aa13afb54ee67f1aee 100644
--- a/frameworks/js/napi/inputmethod_extension_ability/BUILD.gn
+++ b/frameworks/js/napi/inputmethod_extension_ability/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
 
 es2abc_gen_abc("gen_inputmethod_extension_ability_abc") {
diff --git a/frameworks/js/napi/inputmethod_extension_context/BUILD.gn b/frameworks/js/napi/inputmethod_extension_context/BUILD.gn
index d8e851af3292c4629c527cb2a569d091cdb98a40..3099b4e7e0a26824e9f0625804a5ccbc10d0b2c5 100644
--- a/frameworks/js/napi/inputmethod_extension_context/BUILD.gn
+++ b/frameworks/js/napi/inputmethod_extension_context/BUILD.gn
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 
 import("//build/ohos.gni")
 
diff --git a/frameworks/js/napi/inputmethodlist/BUILD.gn b/frameworks/js/napi/inputmethodlist/BUILD.gn
index 1fe0462fabdb561432b9b572ae9c6368016848f5..416fd1c054d31888293f579fe5e2c54b791b3b91 100644
--- a/frameworks/js/napi/inputmethodlist/BUILD.gn
+++ b/frameworks/js/napi/inputmethodlist/BUILD.gn
@@ -11,9 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//arkcompiler/ets_frontend/es2panda/es2abc_config.gni")
+import("//build/config/components/ets_frontend/es2abc_config.gni")
 import("//build/ohos.gni")
-import("//foundation/arkui/ace_engine/ace_config.gni")
 
 es2abc_gen_abc("gen_inputmethodlist_abc") {
   src_js = rebase_path("inputmethodlist.js")
diff --git a/frameworks/native/inputmethod_controller/include/input_data_channel_service_impl.h b/frameworks/native/inputmethod_controller/include/input_data_channel_service_impl.h
index 66ca83644fb83baeefc3096f42151bc3a39cf36c..33598686fefc5293731c0855edac4773ecb892ef 100644
--- a/frameworks/native/inputmethod_controller/include/input_data_channel_service_impl.h
+++ b/frameworks/native/inputmethod_controller/include/input_data_channel_service_impl.h
@@ -16,8 +16,6 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_IMPL_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_IMPL_H
 
-#include "system_ability.h"
-
 #include "iinput_data_channel.h"
 #include "input_data_channel_stub.h"
 #include "iremote_object.h"
diff --git a/interfaces/inner_api/inputmethod_ability/BUILD.gn b/interfaces/inner_api/inputmethod_ability/BUILD.gn
index 5c4e7262ad78292ed8367b780b80abf0ca821442..381cf4190b93410be441fb686c4cbcd4e9ca772d 100644
--- a/interfaces/inner_api/inputmethod_ability/BUILD.gn
+++ b/interfaces/inner_api/inputmethod_ability/BUILD.gn
@@ -340,7 +340,9 @@ ohos_shared_library("inputmethod_ability") {
     "ability_base:configuration",
     "ability_base:want",
     "ability_runtime:ability_context_native",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "eventhandler:libeventhandler",
@@ -462,7 +464,9 @@ ohos_static_library("inputmethod_ability_static") {
     "ability_base:configuration",
     "ability_base:want",
     "ability_runtime:ability_context_native",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "eventhandler:libeventhandler",
diff --git a/seccomp_policy/BUILD.gn b/seccomp_policy/BUILD.gn
index 94d6cf511b9b14ff93f8a0b82577367177afab0e..1f0cf8a6eb257023383e3b959a6aa9782763dddb 100644
--- a/seccomp_policy/BUILD.gn
+++ b/seccomp_policy/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 import("//base/inputmethod/imf/inputmethod.gni")
 import(
-    "${startup_init_path}/services/modules/seccomp/scripts/seccomp_policy_fixer.gni")
+    "//build/config/components/init/seccomp/scripts/seccomp_policy_fixer.gni")
 
 ohos_prebuilt_seccomp("imf_ext_secure_filter") {
   sources = [ "imf_ext_secure_mode.seccomp.policy" ]
diff --git a/services/BUILD.gn b/services/BUILD.gn
index 3d88d98c59386226bc05c798c2a276580a74f693..9226d4521c8c8866ffd89ffd83e6f73256f40d10 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -108,6 +108,7 @@ ohos_shared_library("inputmethod_service") {
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
@@ -213,6 +214,7 @@ ohos_static_library("inputmethod_service_static") {
     "access_token:libtokenid_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "config_policy:configpolicy_util",
diff --git a/services/adapter/settings_data_provider/BUILD.gn b/services/adapter/settings_data_provider/BUILD.gn
index e4bf3920c4430dd19f5693024f6fc7119a38c278..1212166e403e25c086466a4d02d2d6f357c4c90d 100644
--- a/services/adapter/settings_data_provider/BUILD.gn
+++ b/services/adapter/settings_data_provider/BUILD.gn
@@ -47,7 +47,9 @@ ohos_static_library("settings_data_static") {
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/enableimedataparse_fuzzer/BUILD.gn b/test/fuzztest/enableimedataparse_fuzzer/BUILD.gn
index 14daf3ed89ad6455c3995a96df1a23dc463928d5..cc4399772b31f963c66561efa858b7f44af4195e 100644
--- a/test/fuzztest/enableimedataparse_fuzzer/BUILD.gn
+++ b/test/fuzztest/enableimedataparse_fuzzer/BUILD.gn
@@ -53,7 +53,9 @@ ohos_fuzztest("EnableImeDataParseFuzzTest") {
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/imfhisyseventreport_fuzzer/BUILD.gn b/test/fuzztest/imfhisyseventreport_fuzzer/BUILD.gn
index 52e41653726ead7162e3eb3a6f58aebf5689ba49..f9379c1319fd37e9ddffdf25a88be1caabbefe65 100644
--- a/test/fuzztest/imfhisyseventreport_fuzzer/BUILD.gn
+++ b/test/fuzztest/imfhisyseventreport_fuzzer/BUILD.gn
@@ -58,6 +58,7 @@ ohos_fuzztest("ImfHisyseventReportFuzzTest") {
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
     "input:libmmi-client",
+    "ipc:ipc_core",
   ]
 }
 
diff --git a/test/fuzztest/inputmethodability_fuzzer/BUILD.gn b/test/fuzztest/inputmethodability_fuzzer/BUILD.gn
index 75995ac996e7c5777c677336a74e91d7edba34e5..6d7ecaf20c2b690c855e8520b1caa72625aef302 100644
--- a/test/fuzztest/inputmethodability_fuzzer/BUILD.gn
+++ b/test/fuzztest/inputmethodability_fuzzer/BUILD.gn
@@ -46,6 +46,7 @@ ohos_fuzztest("InputMethodAbilityFuzzTest") {
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "c_utils:utils",
     "hilog:libhilog",
     "input:libmmi-client",
diff --git a/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn b/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn
index 0a94cc191654c06fa820fd52a30a72f946460708..627f878640af67b1b187ceeff8cdd38fd35fb7e9 100644
--- a/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn
+++ b/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("InputmethodSystemAbilityFuzzTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/perusersession_fuzzer/BUILD.gn b/test/fuzztest/perusersession_fuzzer/BUILD.gn
index 581e59283708db74242465126a11a870da98fff7..88dd2db506357843b5efe3278dadb3bcb01bdcd7 100644
--- a/test/fuzztest/perusersession_fuzzer/BUILD.gn
+++ b/test/fuzztest/perusersession_fuzzer/BUILD.gn
@@ -52,6 +52,8 @@ ohos_fuzztest("PerUserSessionFuzzTest") {
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/securitymodeparser_fuzzer/BUILD.gn b/test/fuzztest/securitymodeparser_fuzzer/BUILD.gn
index 03498c4f2e4bd2dc0f801f44d4cac1b076053ddc..c68e00ac5178462ea4aa00df76b3000c918321d0 100644
--- a/test/fuzztest/securitymodeparser_fuzzer/BUILD.gn
+++ b/test/fuzztest/securitymodeparser_fuzzer/BUILD.gn
@@ -53,6 +53,7 @@ ohos_fuzztest("SecurityModeParserFuzzTest") {
   external_deps = [
     "ability_runtime:ability_manager",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/settingsdatautils_fuzzer/BUILD.gn b/test/fuzztest/settingsdatautils_fuzzer/BUILD.gn
index dc81f7b4af09df07a18c99e53457d63187689726..7bcec5ddbfb651d5f4a46c17214c4712740d05c6 100644
--- a/test/fuzztest/settingsdatautils_fuzzer/BUILD.gn
+++ b/test/fuzztest/settingsdatautils_fuzzer/BUILD.gn
@@ -54,7 +54,9 @@ ohos_fuzztest("SettingsDataUtilsFuzzTest") {
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn b/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn
index 8ad0648c8746d32dedc133cb9d445fa540b272d6..d3416f02fa149339b40742a4b7309b11e4e56755 100644
--- a/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn
+++ b/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn
@@ -55,6 +55,7 @@ ohos_fuzztest("SystemAbilityStubFuzzTest") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/fuzztest/systemabilitystubfuzztest/BUILD.gn b/test/fuzztest/systemabilitystubfuzztest/BUILD.gn
index 41fc226772b96554fa293dfca36e3d86d321c5d8..39982899a8a5698209b51ee99d3c0e45941ae730 100644
--- a/test/fuzztest/systemabilitystubfuzztest/BUILD.gn
+++ b/test/fuzztest/systemabilitystubfuzztest/BUILD.gn
@@ -70,6 +70,7 @@ common_external_deps = [
   "ability_runtime:ability_manager",
   "access_token:libaccesstoken_sdk",
   "bundle_framework:appexecfwk_core",
+  "cJSON:cjson",
   "data_share:datashare_common",
   "data_share:datashare_consumer",
   "hilog:libhilog",
diff --git a/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn b/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn
index 30e195577e347175576fe6413a930f7149292cfc..f81466092368b2dd71d0d843e8b1a5c1f18ffd56 100644
--- a/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn
+++ b/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn
@@ -57,6 +57,7 @@ ohos_static_library("imf_sa_stub_fuzztest_common_static") {
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
diff --git a/test/unittest/cpp_test/BUILD.gn b/test/unittest/cpp_test/BUILD.gn
index a2d179a81667b65e86cd58e386b1488ebd30cc5d..c7e0416f84dfb42ad3331624a8336a180367d86b 100644
--- a/test/unittest/cpp_test/BUILD.gn
+++ b/test/unittest/cpp_test/BUILD.gn
@@ -64,20 +64,22 @@ ohos_unittest("InputMethodControllerTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -125,19 +127,21 @@ ohos_unittest("InputMethodAttachTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "napi:ace_napi",
@@ -189,19 +193,21 @@ ohos_unittest("InputMethodAbilityTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -241,7 +247,6 @@ ohos_unittest("InputMethodServiceTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -249,7 +254,9 @@ ohos_unittest("InputMethodServiceTest") {
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
+    "cJSON:cjson",
     "c_utils:utils",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -297,19 +304,21 @@ ohos_unittest("InputMethodDfxTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
@@ -357,20 +366,22 @@ ohos_unittest("InputMethodPanelTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "common_event_service:cesfwk_innerkits",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -426,7 +437,9 @@ ohos_unittest("InputMethodPanelAdjustTest") {
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
@@ -477,15 +490,17 @@ ohos_unittest("InputMethodSwitchTest") {
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "safwk:system_ability_fwk",
@@ -534,16 +549,18 @@ ohos_unittest("ITypesUtilTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "bundle_framework:appexecfwk_base",
     "c_utils:utils",
+    "googletest:gtest_main",
     "hilog:libhilog",
+    "image_framework:image_native",
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
@@ -593,17 +610,19 @@ ohos_unittest("InputMethodPrivateMemberTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
@@ -652,19 +671,21 @@ ohos_unittest("InputMethodEditorTest") {
     "${inputmethod_path}/services/json:imf_json_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -709,15 +730,17 @@ ohos_unittest("NewImeSwitchTest") {
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "safwk:system_ability_fwk",
@@ -754,7 +777,6 @@ ohos_unittest("IdentityCheckerTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -763,9 +785,11 @@ ohos_unittest("IdentityCheckerTest") {
     "ability_runtime:ability_manager",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -807,8 +831,6 @@ ohos_unittest("TextListenerInnerApiTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -819,6 +841,8 @@ ohos_unittest("TextListenerInnerApiTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -887,6 +911,7 @@ ohos_unittest("ImeProxyAgentImeTest") {
     "input:libmmi-client",
     "ipc:ipc_single",
     "napi:ace_napi",
+    "samgr:samgr_proxy",
     "window_manager:libdm",
   ]
 
@@ -930,16 +955,17 @@ ohos_unittest("ImeProxyTest") {
     "${inputmethod_path}/test/unittest/resource/bundle_dependencies/editorBox:editorBox",
     "${inputmethod_path}/test/unittest/resource/bundle_dependencies/extImfBundle:extImf",
     "${inputmethod_path}/test/unittest/resource/ohos_test:copy_ohos_test",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
+    "googletest:gtest_main",
     "graphic_2d:librender_service_client",
     "graphic_2d:window_animation",
     "hilog:libhilog",
@@ -983,19 +1009,18 @@ ohos_unittest("EnableImeDataParseTest") {
     "src/enable_ime_data_parse_test.cpp",
   ]
 
-  deps = [
-    "${inputmethod_path}/services/json:imf_json_static",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
-  ]
+  deps = [ "${inputmethod_path}/services/json:imf_json_static" ]
 
   external_deps = [
     "ability_base:zuri",
     "ability_runtime:dataobs_manager",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_single",
     "samgr:samgr_proxy",
@@ -1048,9 +1073,12 @@ ohos_unittest("SecurityModeParseTest") {
     "ability_runtime:dataobs_manager",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
@@ -1082,13 +1110,13 @@ ohos_unittest("TaskManagerTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_ability:inputmethod_ability",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
   ]
 }
@@ -1114,7 +1142,6 @@ ohos_unittest("ImeFreezeManagerTest") {
   deps = [
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1122,10 +1149,12 @@ ohos_unittest("ImeFreezeManagerTest") {
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_core",
@@ -1157,14 +1186,15 @@ ohos_unittest("JsonOperateTest") {
     "${inputmethod_path}/services:inputmethod_service_static",
     "${inputmethod_path}/services/adapter/settings_data_provider:settings_data_static",
     "${inputmethod_path}/services/json:imf_json_static",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "data_share:datashare_common",
     "data_share:datashare_consumer",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1190,8 +1220,6 @@ ohos_unittest("VirtualListenerTest") {
     "${inputmethod_path}/interfaces/inner_api/inputmethod_controller:inputmethod_client_static",
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
-    "//third_party/googletest:gmock",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1202,6 +1230,8 @@ ohos_unittest("VirtualListenerTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gmock",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1240,7 +1270,6 @@ ohos_unittest("ImeSystemChannelTest") {
     "${inputmethod_path}/services:inputmethod_service",
     "${inputmethod_path}/test/common:inputmethod_test_common",
     "${inputmethod_path}/test/unittest/cpp_test/common:inputmethod_tdd_util",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
@@ -1251,6 +1280,7 @@ ohos_unittest("ImeSystemChannelTest") {
     "bundle_framework:appexecfwk_core",
     "c_utils:utils",
     "eventhandler:libeventhandler",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "input:libmmi-client",
     "ipc:ipc_single",
@@ -1311,6 +1341,7 @@ ohos_unittest("ImeControllerCpaiTest") {
 
   external_deps = [
     "googletest:gtest_main",
+    "hilog:libhilog",
     "input:libmmi-client",
   ]
 }
@@ -1387,8 +1418,10 @@ ohos_unittest("InputMethodMessageHandlerTest") {
     "ability_base:want",
     "ability_runtime:ability_context_native",
     "ability_runtime:ability_manager",
+    "ability_runtime:runtime",
     "access_token:libaccesstoken_sdk",
     "bundle_framework:appexecfwk_core",
+    "cJSON:cjson",
     "c_utils:utils",
     "config_policy:configpolicy_util",
     "data_share:datashare_common",
@@ -1467,6 +1500,7 @@ ohos_unittest("ImfHisysEventReporterTest") {
     "hisysevent:libhisysevent",
     "hisysevent:libhisyseventmanager",
     "input:libmmi-client",
+    "ipc:ipc_core",
   ]
 }
 
diff --git a/test/unittest/cpp_test/common/BUILD.gn b/test/unittest/cpp_test/common/BUILD.gn
index 44d6204cd277827c22b9e9425294164ca1c866ae..0c4bd0b144e2fdc8e59f50c9a77c4e52234ba135 100644
--- a/test/unittest/cpp_test/common/BUILD.gn
+++ b/test/unittest/cpp_test/common/BUILD.gn
@@ -29,7 +29,6 @@ config("inputmethod_tdd_util_public_config") {
   visibility = [ "./*" ]
   include_dirs = [
     "include",
-    "${bundllemanager_path}/interfaces/inner_api/appexecfwk_core/include/bundlemgr",
     "${inputmethod_path}/services/adapter/settings_data_provider/common/include",
   ]
 }
@@ -59,6 +58,7 @@ ohos_static_library("inputmethod_tdd_util") {
     "access_token:libaccesstoken_sdk",
     "access_token:libnativetoken",
     "access_token:libtoken_setproc",
+    "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
     "cJSON:cjson",
     "data_share:datashare_common",
diff --git a/test/unittest/cpp_test/common/include/tdd_util.h b/test/unittest/cpp_test/common/include/tdd_util.h
index e67525217eb57bbc69b027ffbd9781838a16fa12..4ce1cb8011f8c966bff81b17eaa4780442b99999 100644
--- a/test/unittest/cpp_test/common/include/tdd_util.h
+++ b/test/unittest/cpp_test/common/include/tdd_util.h
@@ -20,7 +20,7 @@
 
 #include "block_data.h"
 #include "bundle_mgr_interface.h"
-#include "foundation/window/window_manager/interfaces/innerkits/wm/window.h"
+#include "window.h"
 #include "window_manager.h"
 #include "window_option.h"
 #include "wm_common.h"