diff --git a/camera/hal/camera.gni b/camera/hal/camera.gni
index df003b68078f503f8da010125d91bfb48d6137df..c2436fda0c47a3b5dd749ae8f85333326f27d89a 100755
--- a/camera/hal/camera.gni
+++ b/camera/hal/camera.gni
@@ -27,7 +27,8 @@ if (defined(ohos_lite)) {
     import(
         "//device/soc/hisilicon/common/hal/media/camera/hi3516dv300/linux_standard/camera/product.gni")
   } else {
-    import("//device/${product_company}/${device_name}/camera/product.gni")
+    import(
+        "//device/board/${product_company}/${device_name}/camera/product.gni")
   }
 }
 
diff --git a/display/hal/BUILD.gn b/display/hal/BUILD.gn
index 876d6bdbe24b706495aba64ee2a3c99d6fd10801..cbb17b2026b7323563d148b376caf813a47317fa 100644
--- a/display/hal/BUILD.gn
+++ b/display/hal/BUILD.gn
@@ -35,7 +35,7 @@ if (defined(ohos_lite)) {
   if (device_company == "hisilicon") {
     device_hal = "soc/${device_company}/common/hal"
   } else if (product_name != "ohos-arm64") {
-    device_hal = "${device_company}/hardware"
+    device_hal = "soc/${device_company}/hardware"
   }
 
   config("display_hdi_public_config") {
diff --git a/usb/gadget/function/acm/BUILD.gn b/usb/gadget/function/acm/BUILD.gn
index 6f259592a4ffcc90b46214e2035ff1f573d5f716..6c19cadb24262e2f2b737fcacaa153aa5ca95356 100755
--- a/usb/gadget/function/acm/BUILD.gn
+++ b/usb/gadget/function/acm/BUILD.gn
@@ -21,10 +21,11 @@ group("usbfn_cdcacm") {
 ohos_shared_library("libusbfn_cdcacm") {
   default_config_path =
       "//device/soc/$device_company/common/hal/usb/$device_name/include"
-  if (device_company == "hihope") {
-    default_config_path = "//device/$device_company/$device_name/usb/include"
+  if (product_company == "hihope") {
+    default_config_path =
+        "//device/board/$product_company/$device_name/usb/include"
   } else if (device_company == "openharmony") {
-    default_config_path = "//device/hihope/rk3568/usb/include"
+    default_config_path = "//device/board/hihope/rk3568/usb/include"
   }
 
   include_dirs = [
diff --git a/usb/gadget/function/ecm/BUILD.gn b/usb/gadget/function/ecm/BUILD.gn
index 9ab3d42aeb27c6a3b18b9df9e5307bb0a3327755..9f78b7b830002d8ea94c8debddbba6a034921aa7 100755
--- a/usb/gadget/function/ecm/BUILD.gn
+++ b/usb/gadget/function/ecm/BUILD.gn
@@ -21,10 +21,11 @@ group("usbfn_cdcecm") {
 ohos_shared_library("libusbfn_cdcecm") {
   default_config_path =
       "//device/soc/$device_company/common/hal/usb/$device_name/include"
-  if (device_company == "hihope") {
-    default_config_path = "//device/$device_company/$device_name/usb/include"
+  if (product_company == "hihope") {
+    default_config_path =
+        "//device/board/$product_company/$device_name/usb/include"
   } else if (device_company == "openharmony") {
-    default_config_path = "//device/hihope/rk3568/usb/include"
+    default_config_path = "//device/board/hihope/rk3568/usb/include"
   }
 
   include_dirs = [
diff --git a/usb/gadget/function/master/BUILD.gn b/usb/gadget/function/master/BUILD.gn
index 64347a82f959bb999495baf261c0bd5209d5aeaf..537b687220034610f710e321508af95334ed55d5 100755
--- a/usb/gadget/function/master/BUILD.gn
+++ b/usb/gadget/function/master/BUILD.gn
@@ -21,10 +21,11 @@ group("usbfn_master") {
 ohos_shared_library("libusbfn_master") {
   default_config_path =
       "//device/soc/$device_company/common/hal/usb/$device_name/include"
-  if (device_company == "hihope") {
-    default_config_path = "//device/$device_company/$device_name/usb/include"
+  if (product_company == "hihope") {
+    default_config_path =
+        "//device/board/$product_company/$device_name/usb/include"
   } else if (device_company == "openharmony") {
-    default_config_path = "//device/hihope/rk3568/usb/include"
+    default_config_path = "//device/board/hihope/rk3568/usb/include"
   }
 
   include_dirs = [
diff --git a/usb/hal/service/BUILD.gn b/usb/hal/service/BUILD.gn
index ee087180c69c493307b80242d4c2198489b479bb..5d8fe9a3719e02b76a984fd4d497926a39b99eda 100644
--- a/usb/hal/service/BUILD.gn
+++ b/usb/hal/service/BUILD.gn
@@ -21,10 +21,11 @@ config("usbd_private_config") {
 config("usbd_public_config") {
   default_config_path =
       "//device/soc/$device_company/common/hal/usb/$device_name/include"
-  if (device_company == "hihope") {
-    default_config_path = "//device/$device_company/$device_name/usb/include"
+  if (product_company == "hihope") {
+    default_config_path =
+        "//device/board/$product_company/$device_name/usb/include"
   } else if (device_company == "openharmony") {
-    default_config_path = "//device/hihope/rk3568/usb/include"
+    default_config_path = "//device/board/hihope/rk3568/usb/include"
   }
 
   include_dirs = [