diff --git a/adapter/uhdf2/hdi/test/BUILD.gn b/adapter/uhdf2/hdi/test/BUILD.gn
index fcd96a10100164e21c01a1635bcfb210b3ddfd32..90c7514e87c3d274f152457e02083c9dd8073c7e 100644
--- a/adapter/uhdf2/hdi/test/BUILD.gn
+++ b/adapter/uhdf2/hdi/test/BUILD.gn
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("./../../../../adapter/uhdf2/uhdf.gni")
+import("//drivers/hdf_core/adapter/uhdf2/uhdf.gni")
 
 module_output_path = "hdf_core/srvmgr"
 
@@ -26,8 +26,6 @@ ohos_unittest("HdiServiceManagerTest") {
     "$hdf_uhdf_path/hdi:libhdi",
     "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   include_dirs = [
@@ -42,6 +40,8 @@ ohos_unittest("HdiServiceManagerTest") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_single",
   ]
@@ -62,12 +62,12 @@ ohos_unittest("HdiServiceManagerTestCC") {
   deps = [
     "$hdf_uhdf_path/hdi:libhdi",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_single",
     "samgr:samgr_proxy",
diff --git a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
index 97543818be90cb4626aec623cb8d2e6042766622..ef817cec7da18a951367f31887148e15b6052e54 100644
--- a/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
+++ b/adapter/uhdf2/hdi/test/smq_test/BUILD.gn
@@ -24,8 +24,6 @@ ohos_unittest("HdiSmqTest") {
     "$hdf_uhdf_path/hdi:libhdi",
     "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   include_dirs = [
@@ -39,6 +37,8 @@ ohos_unittest("HdiSmqTest") {
 
   external_deps = [
     "c_utils:utils",
+    "googletest:gmock_main",
+    "googletest:gtest_main",
     "hilog:libhilog",
     "ipc:ipc_single",
   ]
diff --git a/adapter/uhdf2/host/test/BUILD.gn b/adapter/uhdf2/host/test/BUILD.gn
index 4295296c756be738f6ee01bfb75a9c1e2dc91672..279a46b8fb29c139ee2e0756ae3e7e9f6424059c 100644
--- a/adapter/uhdf2/host/test/BUILD.gn
+++ b/adapter/uhdf2/host/test/BUILD.gn
@@ -27,7 +27,6 @@ ohos_unittest("DevMgrTest") {
   ]
 
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
     "$hdf_framework_path/include/osal",
     "$hdf_framework_path/include/utils",
     "$hdf_framework_path/utils/include",
@@ -41,8 +40,6 @@ ohos_unittest("DevMgrTest") {
   deps = [
     "$hdf_uhdf_path/hdi:libhdi",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (with_sample) {
@@ -58,6 +55,11 @@ ohos_unittest("DevMgrTest") {
   } else {
     external_deps = [ "hilog:libhilog" ]
   }
+
+  external_deps += [
+    "googletest:gmock_main",
+    "googletest:gtest_main",
+  ]
 }
 
 ohos_unittest("DevHostTest") {
@@ -80,8 +82,6 @@ ohos_unittest("DevHostTest") {
     "$hdf_uhdf_path/host:libhdf_host",
     "$hdf_uhdf_path/ipc:libhdf_ipc_adapter",
     "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
   ]
 
   if (is_standard_system) {
@@ -92,6 +92,11 @@ ohos_unittest("DevHostTest") {
   } else {
     external_deps = [ "hilog:libhilog" ]
   }
+
+  external_deps += [
+    "googletest:gmock_main",
+    "googletest:gtest_main",
+  ]
 }
 
 ###########################end###########################
diff --git a/adapter/uhdf2/osal/test/BUILD.gn b/adapter/uhdf2/osal/test/BUILD.gn
index ea8f5e3f74843b652d177f736de59c98120950b9..bb2bbb0c602dad73af4236bad75142b8c0abefe6 100644
--- a/adapter/uhdf2/osal/test/BUILD.gn
+++ b/adapter/uhdf2/osal/test/BUILD.gn
@@ -24,18 +24,13 @@ ohos_unittest("OsalTest") {
   sources = [ "unittest/common/osal_slist_test.cpp" ]
 
   include_dirs = [
-    "//commonlibrary/c_utils/base/include",
     "$hdf_framework_path/include/osal",
     "$hdf_framework_path/include/utils",
     "$hdf_framework_path/utils/include",
     "unittest/common/",
   ]
 
-  deps = [
-    "$hdf_uhdf_path/utils:libhdf_utils",
-    "//third_party/googletest:gmock_main",
-    "//third_party/googletest:gtest_main",
-  ]
+  deps = [ "$hdf_uhdf_path/utils:libhdf_utils" ]
 
   if (is_standard_system) {
     external_deps = [
@@ -45,6 +40,11 @@ ohos_unittest("OsalTest") {
   } else {
     external_deps = [ "hilog:libhilog" ]
   }
+
+  external_deps += [
+    "googletest:gmock_main",
+    "googletest:gtest_main",
+  ]
 }
 
 ###########################end###########################
diff --git a/framework/model/network/wifi/core/module/wifi_base.c b/framework/model/network/wifi/core/module/wifi_base.c
index 42007fec61ab7c2c5d45a1dfe1e06b7c12eaa153..b0f722a19a494ce1a36b74b5c830627a29fc4881 100644
--- a/framework/model/network/wifi/core/module/wifi_base.c
+++ b/framework/model/network/wifi/core/module/wifi_base.c
@@ -6,7 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 #include "wifi_base.h"
-#include "../hdf_wifi_core.h"
+#include "hdf_wifi_core.h"
 #include "eapol.h"
 #include "hdf_wifi_event.h"
 #include "hdf_wlan_chipdriver_manager.h"
diff --git a/framework/model/network/wifi/platform/src/message/message_dispatcher.h b/framework/model/network/wifi/platform/include/message/message_dispatcher.h
similarity index 100%
rename from framework/model/network/wifi/platform/src/message/message_dispatcher.h
rename to framework/model/network/wifi/platform/include/message/message_dispatcher.h
diff --git a/framework/model/network/wifi/platform/src/message/message_router_inner.h b/framework/model/network/wifi/platform/include/message/message_router_inner.h
similarity index 100%
rename from framework/model/network/wifi/platform/src/message/message_router_inner.h
rename to framework/model/network/wifi/platform/include/message/message_router_inner.h
diff --git a/framework/model/network/wifi/platform/src/message/shared_obj.h b/framework/model/network/wifi/platform/include/message/shared_obj.h
similarity index 100%
rename from framework/model/network/wifi/platform/src/message/shared_obj.h
rename to framework/model/network/wifi/platform/include/message/shared_obj.h
diff --git a/framework/model/network/wifi/platform/src/message/nodes/local_node.c b/framework/model/network/wifi/platform/src/message/nodes/local_node.c
index 6cdfba889c3e0a1d56708879d13961b62032c1e8..4e7bc89ca666c443f2c6a01f87a04167145b582c 100644
--- a/framework/model/network/wifi/platform/src/message/nodes/local_node.c
+++ b/framework/model/network/wifi/platform/src/message/nodes/local_node.c
@@ -10,7 +10,7 @@
 #include "hdf_log.h"
 #include "hdf_wlan_priority_queue.h"
 #include "message/message_types.h"
-#include "../message_router_inner.h"
+#include "message_router_inner.h"
 #include "sidecar.h"
 
 #ifdef USERSPACE_CLIENT_SUPPORT
diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn
index be553cff9844fa2cca6b5adf0281946b955104a3..783482a06e48386a51e67b74a1ea2255d1e24c65 100644
--- a/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/loaddevice_fuzzer/BUILD.gn
@@ -22,7 +22,6 @@ ohos_fuzztest("LoadDeviceFuzzTest") {
     "$hdf_adapter_path/uhdf2/include/hdi",
     "$hdf_adapter_path/uhdf2/osal/include",
     "$hdf_framework_path/include/utils",
-    "//commonlibrary/c_utils/base/include",
   ]
   sources = [ "loaddevice_fuzzer.cpp" ]
 
diff --git a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn
index e57cfae64c07ea763e0365cd9125d12ac33c2bca..db59e986a0940dd30d0feaa4a263b0c1c36a457f 100644
--- a/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/devmgr_cpp_fuzzer/unloaddevice_fuzzer/BUILD.gn
@@ -22,7 +22,6 @@ ohos_fuzztest("UnloadDeviceFuzzTest") {
     "$hdf_adapter_path/uhdf2/include/hdi",
     "$hdf_adapter_path/uhdf2/osal/include",
     "$hdf_framework_path/include/utils",
-    "//commonlibrary/c_utils/base/include",
   ]
   sources = [ "unloaddevice_fuzzer.cpp" ]
 
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn
index b3c9bdb597f66af4a8867939ef40a3333eb3e551..93d2b9c2dc987ac0c520d1593c6c6ac8c9c3470a 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer/BUILD.gn
@@ -18,7 +18,6 @@ ohos_fuzztest("IoserviceBindFuzzTest") {
 
   include_dirs = [
     "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicebind_fuzzer.h",
-    "//commonlibrary/c_utils/base/include",
   ]
   sources = [ "ioservicebind_fuzzer.cpp" ]
   deps = [ "../../../../../adapter/uhdf2/utils:libhdf_utils" ]
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn
index 1e741368da5f8c198c928ca98c46d5de54dac1b7..afcf1bde0628b30a7b1b6f7b04ebd05a786e5cad 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer/BUILD.gn
@@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceGroupListenFuzzTest") {
 
   fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer"
 
-  include_dirs = [
-    "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer.h",
-    "//commonlibrary/c_utils/base/include",
-  ]
+  include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicegrouplisten_fuzzer.h" ]
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn
index 0ab7cdccc8d488fbfcff3c3d16592a554e8ecff3..d4705a1886f09919d4428d60a58ccf2dfeefaddb 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer/BUILD.gn
@@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceListenFuzzTest") {
 
   fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer"
 
-  include_dirs = [
-    "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer.h",
-    "//commonlibrary/c_utils/base/include",
-  ]
+  include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioservicelisten_fuzzer.h" ]
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
diff --git a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn
index 6698c9823523cbab79de3a921bd07164f17696f7..3d732c3bc955b191f96ed2a8a2444dab6c560e4a 100644
--- a/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer/BUILD.gn
@@ -15,10 +15,7 @@ ohos_fuzztest("IoserviceRemoveFuzzTest") {
 
   fuzz_config_file = "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer"
 
-  include_dirs = [
-    "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer.h",
-    "//commonlibrary/c_utils/base/include",
-  ]
+  include_dirs = [ "$hdf_framework_path/test/fuzztest/ioservice_fuzzer/ioserviceremove_fuzzer.h" ]
   if (is_standard_system) {
     external_deps = [
       "c_utils:utils",
diff --git a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn
index 049d1827631b275e50e17d4a2ac5a6bf27aebfbd..007088e3bef86745abdeec9d761b6060deee02ed 100644
--- a/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn
+++ b/framework/test/fuzztest/servmgr_cpp_fuzzer/unregisterservicestatuslistener_fuzzer/BUILD.gn
@@ -21,7 +21,6 @@ ohos_fuzztest("UnregisterServiceStatusListenerFuzzTest") {
     "$hdf_adapter_path/uhdf2/include/hdi",
     "$hdf_adapter_path/uhdf2/osal/include",
     "$hdf_framework_path/include/utils",
-    "//commonlibrary/c_utils/base/include",
   ]
   sources = [ "unregisterservicestatuslistener_fuzzer.cpp" ]