diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
index 5cbfdcfb7b998309810608748ac9df5f51ebcfe2..ef76f884509f77aefa1281342c3b9c778dc680cd 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp
@@ -16,10 +16,10 @@
 #include "camera_ability_slice.h"
 #include <algorithm>
 #include <meta_data.h>
-#include <color.h>
 #include <window/window.h>
 
 #include "ability_manager.h"
+#include "gfx_utils/color.h"
 #include "ui_config.h"
 #include "securec.h"
 
diff --git a/gallery/src/gallery_ability_slice.cpp b/gallery/src/gallery_ability_slice.cpp
index 5fadc47a213bf318ea811f611bc788f9b238490b..f1a0699c4a540dfb0e878640a60014f441889328 100755
--- a/gallery/src/gallery_ability_slice.cpp
+++ b/gallery/src/gallery_ability_slice.cpp
@@ -18,7 +18,7 @@
 #include "ability_manager.h"
 #include "picture_ability_slice.h"
 
-#include "file.h"
+#include "gfx_utils/file.h"
 #include "securec.h"
 
 namespace OHOS {
diff --git a/gallery/src/picture_ability_slice.cpp b/gallery/src/picture_ability_slice.cpp
index 63e26e1dd00079f0274506d6e79f332a2b1aa68d..3a74bdb3103a4494bd09d4c8f4d943ad2179f373 100755
--- a/gallery/src/picture_ability_slice.cpp
+++ b/gallery/src/picture_ability_slice.cpp
@@ -15,8 +15,8 @@
 
 #include "picture_ability_slice.h"
 #include "ability_env.h"
-#include "file.h"
 #include "gallery_config.h"
+#include "gfx_utils/file.h"
 #include "securec.h"
 
 namespace OHOS {
diff --git a/gallery/src/player_ability_slice.cpp b/gallery/src/player_ability_slice.cpp
index 4e943b628bcf9ca68890c4bdaeff32e15c246833..9418734c5dd99ea1b3014c1cb6ae76f883843ed8 100755
--- a/gallery/src/player_ability_slice.cpp
+++ b/gallery/src/player_ability_slice.cpp
@@ -20,7 +20,7 @@
 #include "ability_env.h"
 #include "ability_manager.h"
 #include "components/ui_image_view.h"
-#include "file.h"
+#include "gfx_utils/file.h"
 
 using OHOS::Media::Player;
 using OHOS::Media::Source;
diff --git a/launcher/launcher/src/main/cpp/main_ability_slice.h b/launcher/launcher/src/main/cpp/main_ability_slice.h
index c34caac866c766fb35f58fb8df0d8932b4da6a92..e7adda8a1b44d8b651f6dbbf9c30a000db3bdd0c 100755
--- a/launcher/launcher/src/main/cpp/main_ability_slice.h
+++ b/launcher/launcher/src/main/cpp/main_ability_slice.h
@@ -24,9 +24,9 @@
 #include <components/ui_label.h>
 #include <components/ui_label_button.h>
 #include <components/ui_swipe_view.h>
-#include <list.h>
 
 #include "event_listener.h"
+#include "gfx_utils/list.h"
 #include "swipe_view.h"
 #include "ui_config.h"
 
diff --git a/launcher/launcher/src/main/cpp/view_group_page.h b/launcher/launcher/src/main/cpp/view_group_page.h
index 1a9bcc3254bcb049dc20da657b424b8e2fd7ef1b..b4d29d53d5cbdac82090fdced68b19357c987fa3 100755
--- a/launcher/launcher/src/main/cpp/view_group_page.h
+++ b/launcher/launcher/src/main/cpp/view_group_page.h
@@ -19,7 +19,7 @@
 #include <components/ui_label.h>
 #include <components/ui_label_button.h>
 #include <components/ui_view_group.h>
-#include <list.h>
+#include "gfx_utils/list.h"
 
 #include "ui_config.h"
 #include "app_info.h"
diff --git a/setting/setting/src/main/cpp/app_ability_slice.cpp b/setting/setting/src/main/cpp/app_ability_slice.cpp
index 36d87780a737da807058ca8aee6c20353188926e..e5873edb7b5c2232a87240674964b21f51eb6388 100755
--- a/setting/setting/src/main/cpp/app_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/app_ability_slice.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "app_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(AppAbilitySlice)
diff --git a/setting/setting/src/main/cpp/app_ability_slice.h b/setting/setting/src/main/cpp/app_ability_slice.h
index e657a334b4ac9802bbf10ac79085d7b2ea31703a..075ba45b8aea7a86e04e0032cdfd8568a3361e4b 100755
--- a/setting/setting/src/main/cpp/app_ability_slice.h
+++ b/setting/setting/src/main/cpp/app_ability_slice.h
@@ -29,7 +29,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "setting_utils.h"
 #include "want.h"
diff --git a/setting/setting/src/main/cpp/app_info_ability_slice.cpp b/setting/setting/src/main/cpp/app_info_ability_slice.cpp
index 45f5096a0aac066f4e9bdf0e15f80311f1323ca5..16c34add051ec984945d073ba1a88b6f547fa763 100755
--- a/setting/setting/src/main/cpp/app_info_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/app_info_ability_slice.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "app_info_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(AppInfoAbilitySlice)
diff --git a/setting/setting/src/main/cpp/app_info_ability_slice.h b/setting/setting/src/main/cpp/app_info_ability_slice.h
index dd8567a4e36820cc85698771182bd4ea1c13ba07..b1a6e80a79fc5bddbb412e267d6b28178281646f 100755
--- a/setting/setting/src/main/cpp/app_info_ability_slice.h
+++ b/setting/setting/src/main/cpp/app_info_ability_slice.h
@@ -29,7 +29,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "setting_utils.h"
 #include "want.h"
diff --git a/setting/setting/src/main/cpp/main_ability_slice.cpp b/setting/setting/src/main/cpp/main_ability_slice.cpp
index 0f80f35be678dc7d805e1fbdfb223b1bead4d836..f7962ee0ebbea39ca88b03bd4d0188c58df672b9 100755
--- a/setting/setting/src/main/cpp/main_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/main_ability_slice.cpp
@@ -23,7 +23,7 @@
 #include "module_info.h"
 #include "element_name.h"
 #include "wpa_work.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 #include <cstdint>
 #include <ctime>
 
diff --git a/setting/setting/src/main/cpp/main_ability_slice.h b/setting/setting/src/main/cpp/main_ability_slice.h
index 3af36af42541064fc5467efd8bd1587c14b0a1ef..9538da4de949a3a03125f8f9a654a9c7ce855b44 100755
--- a/setting/setting/src/main/cpp/main_ability_slice.h
+++ b/setting/setting/src/main/cpp/main_ability_slice.h
@@ -17,27 +17,27 @@
 #define OHOS_MAIN_ABILITY_SLICE_H
 
 #include <cstdio>
+
+#include "ability_info.h"
 #include "ability_loader.h"
-#include "event_listener.h"
-#include "list.h"
+#include "ability_manager.h"
+#include "ability_slice.h"
+#include "bundle_manager.h"
 #include "components/ui_image_view.h"
-#include "components/ui_scroll_view.h"
-#include "components/ui_label_button.h"
 #include "components/ui_label.h"
+#include "components/ui_label_button.h"
 #include "components/ui_list.h"
+#include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
-#include "bundle_manager.h"
-#include "ability_slice.h"
-#include "module_info.h"
-#include "ability_info.h"
 #include "element_name.h"
-#include "want.h"
-#include "ability_manager.h"
+#include "event_listener.h"
+#include "gfx_utils/list.h"
+#include "module_info.h"
 #include "parameter.h"
+#include "pthread.h"
 #include "setting_utils.h"
+#include "want.h"
 #include "wpa_work.h"
-#include "pthread.h"
-
 
 namespace OHOS {
 class MainAbilitySlice : public AbilitySlice {
diff --git a/setting/setting/src/main/cpp/setting_about_ability_slice.cpp b/setting/setting/src/main/cpp/setting_about_ability_slice.cpp
index cd8be1a65ea7d0981f17135cd33e73554411a0c5..4f6499e6d2406680e1a083152c4218e032f41323 100755
--- a/setting/setting/src/main/cpp/setting_about_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/setting_about_ability_slice.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "setting_about_ability_slice.h"
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingAboutAbilitySlice)
diff --git a/setting/setting/src/main/cpp/setting_about_ability_slice.h b/setting/setting/src/main/cpp/setting_about_ability_slice.h
index 921512b6d2b660e850331ff7ea6c4dd7453f4ffb..54d70c97eae814de6e824c5245d311e3b2c257d4 100755
--- a/setting/setting/src/main/cpp/setting_about_ability_slice.h
+++ b/setting/setting/src/main/cpp/setting_about_ability_slice.h
@@ -28,7 +28,7 @@
 #include "components/ui_toggle_button.h"
 #include "element_name.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "module_info.h"
 #include "parameter.h"
 #include "setting_utils.h"
diff --git a/setting/setting/src/main/cpp/setting_display_ability_slice.cpp b/setting/setting/src/main/cpp/setting_display_ability_slice.cpp
index e89ace0f3a66d53c7a653e9face64348a52558a6..77b83a13ef69baac1cdd142f6c25a0721d201be0 100755
--- a/setting/setting/src/main/cpp/setting_display_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/setting_display_ability_slice.cpp
@@ -16,7 +16,7 @@
 #include "setting_display_ability_slice.h"
 #include <iostream>
 #include <securec.h>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingDisplayAbilitySlice)
diff --git a/setting/setting/src/main/cpp/setting_display_ability_slice.h b/setting/setting/src/main/cpp/setting_display_ability_slice.h
index e351b2f2b628cee727723a53be2641c96fbcd0b7..0642257b1f4010c5bda22a5cc53c3bef50fcc421 100755
--- a/setting/setting/src/main/cpp/setting_display_ability_slice.h
+++ b/setting/setting/src/main/cpp/setting_display_ability_slice.h
@@ -21,7 +21,6 @@
 #include <cstring>
 #include <iproxy_client.h>
 
-#include "samgr_lite.h"
 #include "ability_loader.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
@@ -29,8 +28,9 @@
 #include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "parameter.h"
+#include "samgr_lite.h"
 #include "setting_utils.h"
 
 namespace OHOS {
diff --git a/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp b/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp
index c194f4472cf78490980a17946cf45c5f127ea8c0..19622d2fce9fedd5e935bc8182b355b4bd66fa59 100755
--- a/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/setting_wifi_ability_slice.cpp
@@ -16,7 +16,7 @@
 #include "setting_wifi_ability_slice.h"
 #include <iostream>
 #include <thread>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingWifiAbilitySlice)
diff --git a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h
index dad9dddda78ba4c034b15a09588d5151f3b37b9d..577292c1e4a34051fe0324f1add7e5a4a37c7925 100755
--- a/setting/setting/src/main/cpp/setting_wifi_ability_slice.h
+++ b/setting/setting/src/main/cpp/setting_wifi_ability_slice.h
@@ -21,18 +21,18 @@
 #include <cstring>
 
 #include "ability_loader.h"
+#include "common/task.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
 #include "components/ui_list.h"
 #include "components/ui_scroll_view.h"
 #include "components/ui_toggle_button.h"
 #include "event_listener.h"
-#include "list.h"
+#include "gfx_utils/list.h"
 #include "parameter.h"
 #include "pthread.h"
 #include "setting_utils.h"
 #include "wpa_work.h"
-#include "common/task.h"
 
 namespace OHOS {
 class TestBtnOnStateChangeListener : public OHOS::UICheckBox::OnChangeListener, public OHOS::UIView::OnClickListener {
diff --git a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp
index 109aa92ed6c97fc3657d771bc49ccd1784200977..4b8ecba114280089a3c92abeed1986bbfc4858fa 100755
--- a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp
+++ b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.cpp
@@ -14,7 +14,7 @@
  */
 
 #include <setting_wifi_input_password_ability_slice.h>
-#include "style.h"
+#include "gfx_utils/style.h"
 
 namespace OHOS {
 REGISTER_AS(SettingWifiInputPasswordAbilitySlice)
diff --git a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h
index 0493e057a79daa248854a887ff6e8d21255bec6e..03f86e371b2a6f9cb0b8b96ca3a92f44c93f728b 100755
--- a/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h
+++ b/setting/setting/src/main/cpp/setting_wifi_input_password_ability_slice.h
@@ -15,8 +15,10 @@
 
 #ifndef OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H
 #define OHOS_SETTING_WIFI_INPUT_PASSWORD_ABILITY_SLICE_H
-#include "components/ui_checkbox.h"
+
 #include "ability_loader.h"
+#include "common/task.h"
+#include "components/ui_checkbox.h"
 #include "components/ui_image_view.h"
 #include "components/ui_label.h"
 #include "components/ui_label_button.h"
@@ -26,9 +28,8 @@
 #include "event_listener.h"
 #include "parameter.h"
 #include "setting_utils.h"
-#include "wpa_work.h"
-#include "common/task.h"
 #include "setting_wifi_input_password_ability_slice.h"
+#include "wpa_work.h"
 
 namespace OHOS {
 class SettingWifiInputPasswordAbilitySlice : public AbilitySlice {