diff --git a/adapter/ohos/capability/BUILD.gn b/adapter/ohos/capability/BUILD.gn
index 5d24628c84ce293f388f7a0dd0b6a3627b6a7f2a..e7d8c88ae744affc9b541673cba0145fe27d8e9a 100644
--- a/adapter/ohos/capability/BUILD.gn
+++ b/adapter/ohos/capability/BUILD.gn
@@ -45,7 +45,7 @@ template("ace_capability_ohos_source_set") {
     ]
     include_dirs = []
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     external_deps = [
       "ability_base:want",
       "common_event_service:cesfwk_innerkits",
diff --git a/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn b/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn
index 99b774161e256e0d6721df1b4f5e7560ad65e3b8..c895e2256b674fa4318fdd88292cde139807e3e2 100644
--- a/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn
+++ b/adapter/ohos/entrance/pa_engine/engine/jsi/BUILD.gn
@@ -49,7 +49,7 @@ template("js_pa_engine_ark") {
     configs = [ "$ace_root:ace_config" ]
 
     include_dirs = [ "$ace_root/adapter/ohos/entrance/pa_engine/engine/common" ]
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     external_deps = [
       "ability_base:want",
       "ability_base:zuri",
diff --git a/adapter/preview/entrance/BUILD.gn b/adapter/preview/entrance/BUILD.gn
index aa6073b77525a40f4be1d6556199e64060570f23..e62a6b8b8e2a46446beaab6481f154bdcd83b456 100644
--- a/adapter/preview/entrance/BUILD.gn
+++ b/adapter/preview/entrance/BUILD.gn
@@ -72,7 +72,6 @@ ohos_source_set("preview_entrance_source") {
 
     deps = [
       "$ace_napi:ace_napi",
-      "$ace_root/frameworks/core/components/theme:build_theme_code",
       "$ace_root/interfaces/inner_api/ace:ace_uicontent",
     ]
     external_deps = []
diff --git a/adapter/preview/inspector/BUILD.gn b/adapter/preview/inspector/BUILD.gn
index abdca4661a631d74c7cc6c14321fb532cb0587f7..ba2b73f1c9d470ba1cb97dfa2ac36324610165ed 100644
--- a/adapter/preview/inspector/BUILD.gn
+++ b/adapter/preview/inspector/BUILD.gn
@@ -35,7 +35,5 @@ ohos_source_set("preview_inspector_source") {
       "inspector_client.cpp",
       "js_inspector_manager.cpp",
     ]
-
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
   }
 }
diff --git a/frameworks/base/BUILD.gn b/frameworks/base/BUILD.gn
index 1b1a8d9269a18af92770ed36a640de3502b40169..471ee4c58dfab027bc6184945fea030d13179513 100644
--- a/frameworks/base/BUILD.gn
+++ b/frameworks/base/BUILD.gn
@@ -29,7 +29,6 @@ template("ace_base_source_set") {
     part_name = ace_engine_part
     defines += invoker.defines
     deps = [
-      "$ace_root/frameworks/core/components/theme:build_theme_code",
       "base64:ace_base_base64_$platform",
       "i18n:ace_base_i18n_$platform",
       "resource:ace_resource",
diff --git a/frameworks/bridge/card_frontend/BUILD.gn b/frameworks/bridge/card_frontend/BUILD.gn
index 27924aa3871b669fcfc965c301873ea008a5785f..11da0dbaa0fd5ac3e2f279bd2ef7052169095a73 100644
--- a/frameworks/bridge/card_frontend/BUILD.gn
+++ b/frameworks/bridge/card_frontend/BUILD.gn
@@ -34,7 +34,7 @@ template("card_frontend") {
       "js_card_parser.cpp",
     ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/bridge/common/BUILD.gn b/frameworks/bridge/common/BUILD.gn
index 694fcc2d60ab1d2b9e72d0afc242e40be58b0def..b6eddff8902c67544653fa1fca149ec89caf4900 100644
--- a/frameworks/bridge/common/BUILD.gn
+++ b/frameworks/bridge/common/BUILD.gn
@@ -167,7 +167,7 @@ template("bridge_common") {
       ]
     }
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
@@ -209,7 +209,7 @@ template("bridge_common_ng") {
       "utils/utils.cpp",
     ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/bridge/common/accessibility/BUILD.gn b/frameworks/bridge/common/accessibility/BUILD.gn
index 6bc39da17052e5f6bb1998cd351adac2777b847d..2f46842fe06c80f14c93abeb9ea63db84226be1f 100644
--- a/frameworks/bridge/common/accessibility/BUILD.gn
+++ b/frameworks/bridge/common/accessibility/BUILD.gn
@@ -28,10 +28,7 @@ template("bridge_accessibility") {
 
     sources = [ "accessibility_node_manager.cpp" ]
 
-    deps = [
-      "$ace_root/frameworks/core/accessibility/js_inspector:js_inspector_$platform",
-      "$ace_root/frameworks/core/components/theme:build_theme_code",
-    ]
+    deps = [ "$ace_root/frameworks/core/accessibility/js_inspector:js_inspector_$platform" ]
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/bridge/declarative_frontend/BUILD.gn b/frameworks/bridge/declarative_frontend/BUILD.gn
index 7c40634ebb92fd2daf2cfb9688d6526fa584af0f..e534814ed12ce15f950edf193a48b663982cd136 100644
--- a/frameworks/bridge/declarative_frontend/BUILD.gn
+++ b/frameworks/bridge/declarative_frontend/BUILD.gn
@@ -59,7 +59,7 @@ template("declarative_frontend") {
       ]
     }
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (is_arkui_x) {
       deps += [
         "//arkcompiler/ets_runtime:libark_jsruntime_static",
diff --git a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn
index 92d296228eece33a10dcece5d5c6643336b50225..27bf587301cd937970366c5b02dc75a10ece3833 100644
--- a/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn
+++ b/frameworks/bridge/declarative_frontend/engine/jsi/BUILD.gn
@@ -332,10 +332,7 @@ template("declarative_js_engine_ark") {
       sources += [ "nativeModule/arkts_native_qrcode_bridge.cpp" ]
     }
 
-    deps = [
-      "$ace_root/frameworks/core/components/theme:build_theme_code",
-      "${ace_root}/frameworks/core/interfaces/native:ace_core_interfaces_native_node_$platform",
-    ]
+    deps = [ "${ace_root}/frameworks/core/interfaces/native:ace_core_interfaces_native_node_$platform" ]
     if (is_arkui_x) {
       deps += [ "//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/drawing:drawing_napi_impl" ]
     }
@@ -443,7 +440,7 @@ template("declarative_js_engine_ark") {
         "jsi_animator_model_ng_impl.cpp",
         "jsi_view_register_impl.cpp",
       ]
-      deps += [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+      deps += []
     }
 
     # add for cross_platfrom_build temporarily, shall be removed after external_deps is supported
diff --git a/frameworks/bridge/js_frontend/BUILD.gn b/frameworks/bridge/js_frontend/BUILD.gn
index 2c6f8bc5b976c0fd748e6e58ff942eb8e29060d0..f0e1c89caaea7d39606cb2aff7830e92c6a0bd93 100644
--- a/frameworks/bridge/js_frontend/BUILD.gn
+++ b/frameworks/bridge/js_frontend/BUILD.gn
@@ -40,7 +40,7 @@ template("js_frontend") {
       sources += [ "engine/common/js_engine_loader.cpp" ]
     }
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn b/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn
index 38b04158beaf83235d6a8469848e513bf93fec21..6233343cd80c576ae96bd47b5468fa8f3a0566a3 100644
--- a/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn
+++ b/frameworks/bridge/js_frontend/engine/jsi/BUILD.gn
@@ -89,7 +89,7 @@ template("js_engine_ark") {
     }
 
     external_deps = []
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/bridge/plugin_frontend/BUILD.gn b/frameworks/bridge/plugin_frontend/BUILD.gn
index f8766d8cc69c5031b7326d2cf4955ff9b11327f8..2d5e28da6477b1b334acfa4a57cde6fcc54a14cc 100644
--- a/frameworks/bridge/plugin_frontend/BUILD.gn
+++ b/frameworks/bridge/plugin_frontend/BUILD.gn
@@ -28,7 +28,7 @@ template("plugin_frontend") {
       "plugin_frontend_delegate.cpp",
     ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (use_hilog) {
       external_deps = [ "hilog:libhilog" ]
     }
diff --git a/frameworks/core/animation/test/unittest/framework/BUILD.gn b/frameworks/core/animation/test/unittest/framework/BUILD.gn
index 44033252b3992aa5b7c518d868a5b61e7de3bc05..0ae868737a5a8b7561d50b08086f580dc62a4b15 100644
--- a/frameworks/core/animation/test/unittest/framework/BUILD.gn
+++ b/frameworks/core/animation/test/unittest/framework/BUILD.gn
@@ -174,7 +174,6 @@ ohos_unittest("AnimationTest") {
     "$ace_root/frameworks/core/components/transform/render_transform.cpp",
     "$ace_root/frameworks/core/pipeline/base/render_node.cpp",
     "$ace_root/test/mock/core/common/mock_ace_application_info.cpp",
-    "$root_out_dir/arkui/framework/core/components/theme/theme_constants_default.cpp",
 
     # mock
     "$ace_root/adapter/ohos/osal/log_wrapper.cpp",
@@ -196,25 +195,12 @@ ohos_unittest("AnimationTest") {
     "$ace_root/test/mock/core/common/mock_resource_adapter.cpp",
   ]
 
-  # add sources only needed by wearable like watch.
-  if (is_wearable_product) {
-    sources += [ "$root_out_dir/arkui/framework/core/components/theme/theme_constants_watch.cpp" ]
-  }
-
-  # add sources needed by phone and TV. wearable like watch do not need them
-  if (!is_wearable_product) {
-    sources += [
-      # theme
-      "$root_out_dir/arkui/framework/core/components/theme/theme_constants_tv.cpp",
-    ]
-  }
-
   configs = [
     "$ace_root:ace_test_config",
     ":config_animation_test",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   external_deps += [
     "googletest:gmock_main",
     "googletest:gtest_main",
diff --git a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn
index a7491b3459c4cb0494739623e9d84b2f39533c16..b4145cc8520161f593e218f16bc629a00d51a521 100644
--- a/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn
+++ b/frameworks/core/animation/test/unittest/spring_chain/BUILD.gn
@@ -177,7 +177,6 @@ ohos_unittest("SpringChainTest") {
     "$ace_root/frameworks/core/components/transform/render_transform.cpp",
     "$ace_root/frameworks/core/pipeline/base/render_node.cpp",
     "$ace_root/test/mock/core/common/mock_ace_application_info.cpp",
-    "$root_out_dir/arkui/framework/core/components/theme/theme_constants_default.cpp",
 
     #mock
     "$ace_root/adapter/ohos/osal/log_wrapper.cpp",
@@ -199,25 +198,12 @@ ohos_unittest("SpringChainTest") {
     "$ace_root/test/mock/core/common/mock_resource_adapter.cpp",
   ]
 
-  # add sources only needed by wearable like watch.
-  if (is_wearable_product) {
-    sources += [ "$root_out_dir/arkui/framework/core/components/theme/theme_constants_watch.cpp" ]
-  }
-
-  # add sources needed by phone and TV. wearable like watch do not need them
-  if (!is_wearable_product) {
-    sources += [
-      # theme
-      "$root_out_dir/arkui/framework/core/components/theme/theme_constants_tv.cpp",
-    ]
-  }
-
   configs = [
     "$ace_root:ace_test_config",
     ":config_animation_test",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
 
   if (!is_ohos_standard_system) {
     external_deps = [
diff --git a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn
index af49e96de4713469dfe64b7d4344f64b4cbfc186..71ff1b98890ca20e57a83575ed0c63f31610d710 100644
--- a/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn
+++ b/frameworks/core/animation/test/unittest/svg_animate/BUILD.gn
@@ -177,7 +177,7 @@ ohos_unittest("SvgAnimateTest") {
     "$ace_root/frameworks/core/components/transform/render_transform.cpp",
     "$ace_root/frameworks/core/pipeline/base/render_node.cpp",
     "$ace_root/test/mock/core/common/mock_ace_application_info.cpp",
-    "$root_out_dir/arkui/framework/core/components/theme/theme_constants_default.cpp",
+
 
     # mock
     "$ace_root/adapter/ohos/osal/log_wrapper.cpp",
@@ -199,25 +199,12 @@ ohos_unittest("SvgAnimateTest") {
     "$ace_root/test/mock/core/common/mock_resource_adapter.cpp",
   ]
 
-  # add sources only needed by wearable like watch.
-  if (is_wearable_product) {
-    sources += [ "$root_out_dir/arkui/framework/core/components/theme/theme_constants_watch.cpp" ]
-  }
-
-  # add sources needed by phone and TV. wearable like watch do not need them
-  if (!is_wearable_product) {
-    sources += [
-      # theme
-      "$root_out_dir/arkui/framework/core/components/theme/theme_constants_tv.cpp",
-    ]
-  }
-
   configs = [
     "$ace_root:ace_test_config",
     ":config_animation_test",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
 
   if (!is_ohos_standard_system) {
     external_deps = [
diff --git a/frameworks/core/common/agingadapation/aging_adapation_dialog_theme.h b/frameworks/core/common/agingadapation/aging_adapation_dialog_theme.h
index 109c1911154b0f73308a4d4a34406d366a249699..f7f4920b1834e3553f6303071447cbede079b022 100644
--- a/frameworks/core/common/agingadapation/aging_adapation_dialog_theme.h
+++ b/frameworks/core/common/agingadapation/aging_adapation_dialog_theme.h
@@ -26,7 +26,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/badge/badge_theme.h b/frameworks/core/components/badge/badge_theme.h
index 53a86aeef35230b61d27806948bc250a1094199c..d9e3772ca474607686e00d8ee69e792c309f0c65 100644
--- a/frameworks/core/components/badge/badge_theme.h
+++ b/frameworks/core/components/badge/badge_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/button/button_theme.h b/frameworks/core/components/button/button_theme.h
index 8c1f2e5f417e8974f92a3ab67c762f14c4295f02..7684783603a2503722ef259fffc9430af49e6fd0 100644
--- a/frameworks/core/components/button/button_theme.h
+++ b/frameworks/core/components/button/button_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/calendar/calendar_theme.h b/frameworks/core/components/calendar/calendar_theme.h
index 1afa17de9d3e640a268b15ee74ae7d8564c7a9bb..e9b37736f3e72a1152177aca9f7dd5c1c826a3d4 100644
--- a/frameworks/core/components/calendar/calendar_theme.h
+++ b/frameworks/core/components/calendar/calendar_theme.h
@@ -21,7 +21,6 @@
 #include "core/components/common/properties/decoration.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 namespace {
diff --git a/frameworks/core/components/camera/camera_theme.h b/frameworks/core/components/camera/camera_theme.h
index 766876b6a047e2c802e7e6f8655d2450a1fe6660..02e21bd5f092dc6a755f73d3b0bd136a914a1c0b 100644
--- a/frameworks/core/components/camera/camera_theme.h
+++ b/frameworks/core/components/camera/camera_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/checkable/checkable_theme.h b/frameworks/core/components/checkable/checkable_theme.h
index 1d26618eaee37e1c0fcedaef02cb0c9ebac17a7b..dd3dfda945abcd2e69817554bcc88a19e7385d73 100644
--- a/frameworks/core/components/checkable/checkable_theme.h
+++ b/frameworks/core/components/checkable/checkable_theme.h
@@ -20,7 +20,6 @@
 #include "core/common/container.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 constexpr Color DEFAULT_UNCHECK_BORDER_COLOR = Color(0x4B181819);
diff --git a/frameworks/core/components/clock/clock_theme.h b/frameworks/core/components/clock/clock_theme.h
index 836c893db71c26057aca26a6736430f246973157..264d12936c310fd459613d62ebe03695d3a207fd 100644
--- a/frameworks/core/components/clock/clock_theme.h
+++ b/frameworks/core/components/clock/clock_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/close_icon/close_icon_theme.h b/frameworks/core/components/close_icon/close_icon_theme.h
index 5ef8f33a05669a5afc0e392f9a80b7d58215065d..27fd8d9bfcfa27afe93b86eb84e32d1683b30887 100644
--- a/frameworks/core/components/close_icon/close_icon_theme.h
+++ b/frameworks/core/components/close_icon/close_icon_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 namespace {
diff --git a/frameworks/core/components/components.gni b/frameworks/core/components/components.gni
index b7b9fbf06829ce913693a56ea321e5a4931ee385..fb1e063defd50f60611788496c2440d0bb6a76e7 100644
--- a/frameworks/core/components/components.gni
+++ b/frameworks/core/components/components.gni
@@ -59,7 +59,7 @@ template("build_component") {
       }
       deps = []
       deps += extra_deps
-      deps += [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+      deps += []
 
       if (defined(invoker.public_configs)) {
         public_configs = []
diff --git a/frameworks/core/components/counter/counter_theme.h b/frameworks/core/components/counter/counter_theme.h
index 249efe8876b38a44bfb43868951ef3c12b9187d4..c9a0b265b427feb813cea8d2867497617508befa 100644
--- a/frameworks/core/components/counter/counter_theme.h
+++ b/frameworks/core/components/counter/counter_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/border_property.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/data_panel/data_panel_theme.h b/frameworks/core/components/data_panel/data_panel_theme.h
index 4cc9f588a014cb44920a5b84fea83ebbd69138de..666b969e16516e4b6ad04e364b00fa1c42351e71 100644
--- a/frameworks/core/components/data_panel/data_panel_theme.h
+++ b/frameworks/core/components/data_panel/data_panel_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/dialog/dialog_theme.h b/frameworks/core/components/dialog/dialog_theme.h
index 8a1936ba58a6eb3d81156b88240c3a359a6ef89a..dc77aadbafb5485a6a80ee846e1816abe5b41446 100644
--- a/frameworks/core/components/dialog/dialog_theme.h
+++ b/frameworks/core/components/dialog/dialog_theme.h
@@ -29,7 +29,6 @@
 #include "core/components/dialog/dialog_properties.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 namespace {
diff --git a/frameworks/core/components/divider/divider_theme.h b/frameworks/core/components/divider/divider_theme.h
index c00c715ced7ee41fc38dec94c88203cb1d2f2c62..669e6403524f30f6d1564dda1a0b5ceb9d2e077c 100644
--- a/frameworks/core/components/divider/divider_theme.h
+++ b/frameworks/core/components/divider/divider_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/focus_animation/focus_animation_theme.h b/frameworks/core/components/focus_animation/focus_animation_theme.h
index 1aa0b4c08d2a6529001bcc927a44eb62651ef2e0..9d0737d2f8265d824d6a1aec2a02201dce347eea 100644
--- a/frameworks/core/components/focus_animation/focus_animation_theme.h
+++ b/frameworks/core/components/focus_animation/focus_animation_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/hyperlink/hyperlink_theme.h b/frameworks/core/components/hyperlink/hyperlink_theme.h
index b25b564e5b2588213c12a63b874fb322292d3a82..ba3749a19a68c3f77f06df081ffc9c698b5fc684 100644
--- a/frameworks/core/components/hyperlink/hyperlink_theme.h
+++ b/frameworks/core/components/hyperlink/hyperlink_theme.h
@@ -19,7 +19,6 @@
 #include "base/utils/string_utils.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 #include "frameworks/bridge/common/utils/utils.h"
 
diff --git a/frameworks/core/components/indexer/indexer_theme.h b/frameworks/core/components/indexer/indexer_theme.h
index 0709d134669d0e111bee0f9f2dbc9debb43f0830..df0c27be90a32141312f7328797268d6386f78a2 100644
--- a/frameworks/core/components/indexer/indexer_theme.h
+++ b/frameworks/core/components/indexer/indexer_theme.h
@@ -27,7 +27,6 @@
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_attributes.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_style.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/list/arc_list_item_theme.h b/frameworks/core/components/list/arc_list_item_theme.h
index 39311de6f5c7585eadced67f03bcd46834a86377..e5da42b82ed52072f60ce6dc71cacc7074e3b63a 100755
--- a/frameworks/core/components/list/arc_list_item_theme.h
+++ b/frameworks/core/components/list/arc_list_item_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/border_property.h"
 #include "core/components_ng/property/measure_property.h"
 
diff --git a/frameworks/core/components/list/arc_list_theme.h b/frameworks/core/components/list/arc_list_theme.h
index ddcc98998c497ca98e9c2f2ffb1ec86348c97966..cf91f2f996bb0d7142d91c5063ca44e31da87a38 100755
--- a/frameworks/core/components/list/arc_list_theme.h
+++ b/frameworks/core/components/list/arc_list_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/list/list_item_theme.h b/frameworks/core/components/list/list_item_theme.h
index dc8617427197adccff3a7690b8033e0db5629804..66c4801b3cd75e75fda7d742b93a467ff7878f01 100644
--- a/frameworks/core/components/list/list_item_theme.h
+++ b/frameworks/core/components/list/list_item_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/border_property.h"
 #include "core/components_ng/property/measure_property.h"
 
diff --git a/frameworks/core/components/list/list_theme.h b/frameworks/core/components/list/list_theme.h
index 14eb911cde01dddfb63614c9ea9cbc9895ca7f45..ce26f0cdbe4c297ea5b29f904ba1b3045825390f 100644
--- a/frameworks/core/components/list/list_theme.h
+++ b/frameworks/core/components/list/list_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/marquee/marquee_theme.h b/frameworks/core/components/marquee/marquee_theme.h
index cc169dbfc3aa582d3a96f2beb653786976794ab5..d143c96f8163a42c12c59c11d37554efe3fd294d 100644
--- a/frameworks/core/components/marquee/marquee_theme.h
+++ b/frameworks/core/components/marquee/marquee_theme.h
@@ -21,7 +21,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 namespace {
diff --git a/frameworks/core/components/picker/picker_theme.h b/frameworks/core/components/picker/picker_theme.h
index d96338d6314a34685a3df2076a314e125e29e83e..43a5f79b704e6aba4b90061c3896abffe04b8c95 100644
--- a/frameworks/core/components/picker/picker_theme.h
+++ b/frameworks/core/components/picker/picker_theme.h
@@ -27,7 +27,6 @@
 #include "core/components/picker/picker_data.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #ifdef SUPPORT_DIGITAL_CROWN
 #include "core/event/crown_event.h"
 #endif
diff --git a/frameworks/core/components/popup/popup_theme.h b/frameworks/core/components/popup/popup_theme.h
index 4605999844e8a4cac5e070295c74df5dd243f333..7f29247fa3552c7cdde85fa30b7f3b65b8de1275 100644
--- a/frameworks/core/components/popup/popup_theme.h
+++ b/frameworks/core/components/popup/popup_theme.h
@@ -23,7 +23,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/common/properties/decoration.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/progress/progress_theme.h b/frameworks/core/components/progress/progress_theme.h
index 6a55a79afc9724bb2306cf401aaff4d037262957..1c1b70ba8da11fe4574402282689bc288d9b6709 100644
--- a/frameworks/core/components/progress/progress_theme.h
+++ b/frameworks/core/components/progress/progress_theme.h
@@ -21,7 +21,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/qrcode/qrcode_theme.h b/frameworks/core/components/qrcode/qrcode_theme.h
index 4e7afb0cc41fe3071bbf30a6f929a02a9c23e407..061228a399587d08358d18f7364186d365af2377 100644
--- a/frameworks/core/components/qrcode/qrcode_theme.h
+++ b/frameworks/core/components/qrcode/qrcode_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 #include "core/pipeline/pipeline_base.h"
 
diff --git a/frameworks/core/components/refresh/refresh_theme.h b/frameworks/core/components/refresh/refresh_theme.h
index daa58ad9129724304ed7ee9125b63717dc237eff..5c584362fbea24828eee699b1753cba8f7fd8703 100644
--- a/frameworks/core/components/refresh/refresh_theme.h
+++ b/frameworks/core/components/refresh/refresh_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 namespace {
diff --git a/frameworks/core/components/scroll/scroll_bar_theme.h b/frameworks/core/components/scroll/scroll_bar_theme.h
index a2ed29aadad3370b8d3135b0fb158f213e579e53..ad1d6fabdff43bcd012b89de229fe93541403195 100644
--- a/frameworks/core/components/scroll/scroll_bar_theme.h
+++ b/frameworks/core/components/scroll/scroll_bar_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/scroll_bar.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/search/search_theme.h b/frameworks/core/components/search/search_theme.h
index 6c03f31fb27133f4c47922f8be8d19b584420f9d..fa7339c7741cb55d5cc89cba67adc6e15509aa1c 100644
--- a/frameworks/core/components/search/search_theme.h
+++ b/frameworks/core/components/search/search_theme.h
@@ -23,7 +23,6 @@
 #include "core/components/common/properties/radius.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/pattern/search/search_model.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/select/select_theme.h b/frameworks/core/components/select/select_theme.h
index 9dc320c16ea1f1f76de9ba6c042b5a1f4be13451..a42d2ec687aa5080fe3359fea468efdbf020a621 100644
--- a/frameworks/core/components/select/select_theme.h
+++ b/frameworks/core/components/select/select_theme.h
@@ -23,7 +23,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/calc_length.h"
 #include "core/components_ng/property/border_property.h"
 
diff --git a/frameworks/core/components/semi_modal/semi_modal_theme.h b/frameworks/core/components/semi_modal/semi_modal_theme.h
index d295bf5f0fe0fe7e12fecc53b89e62d632a2add0..b68d553122ee3fff7ecda9341d6d243bce5c31e0 100644
--- a/frameworks/core/components/semi_modal/semi_modal_theme.h
+++ b/frameworks/core/components/semi_modal/semi_modal_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/slider/slider_theme.h b/frameworks/core/components/slider/slider_theme.h
index e42fe8c2b2637b44cf2ab92b48c25dd030868a84..3d7372df6ac19497c4ed8fa123a823b431e2fae6 100644
--- a/frameworks/core/components/slider/slider_theme.h
+++ b/frameworks/core/components/slider/slider_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/stepper/stepper_theme.h b/frameworks/core/components/stepper/stepper_theme.h
index 8ad3b109629df71165edfc24fe879e777db06b59..fb62ef5b71aee98d9e6c0f160fc985b1a3628d4c 100644
--- a/frameworks/core/components/stepper/stepper_theme.h
+++ b/frameworks/core/components/stepper/stepper_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/swiper/swiper_indicator_theme.h b/frameworks/core/components/swiper/swiper_indicator_theme.h
index 43a944371022878a9d6c79e75f72c736ddef66e9..eb0f5d721f9a1d4f9d6d06858909e70cc324ffc4 100644
--- a/frameworks/core/components/swiper/swiper_indicator_theme.h
+++ b/frameworks/core/components/swiper/swiper_indicator_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/gradient_property.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/tab_bar/tab_theme.h b/frameworks/core/components/tab_bar/tab_theme.h
index d2038ce0f02e9c89698c6138bb7a59613b440825..adce630ac3d9f5c68bcdf0e7a2ea82077bc068bc 100644
--- a/frameworks/core/components/tab_bar/tab_theme.h
+++ b/frameworks/core/components/tab_bar/tab_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/text_field/textfield_theme.h b/frameworks/core/components/text_field/textfield_theme.h
index caee81cfe273e2d1a0e73a1e4a487a396933b972..b703be0cdf0a1963be44fbd7233df0be1ff7fc05 100644
--- a/frameworks/core/components/text_field/textfield_theme.h
+++ b/frameworks/core/components/text_field/textfield_theme.h
@@ -24,7 +24,6 @@
 #include "core/components/swiper/render_swiper.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/pattern/text_field/text_field_model.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/text_overlay/text_overlay_theme.h b/frameworks/core/components/text_overlay/text_overlay_theme.h
index fd5b5d49f5be698f2f5a4ccb161135609d40b990..b5dd9a2d6c4233ba5a450a3b297e7f6f6bdeb59c 100644
--- a/frameworks/core/components/text_overlay/text_overlay_theme.h
+++ b/frameworks/core/components/text_overlay/text_overlay_theme.h
@@ -26,7 +26,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/theme/advanced_pattern_theme.h b/frameworks/core/components/theme/advanced_pattern_theme.h
index 342435fc0e9d211b9d6f906912193a3fe653aade..642fb114bda6f8f7c2e974a1e4e5ba525a443d4f 100644
--- a/frameworks/core/components/theme/advanced_pattern_theme.h
+++ b/frameworks/core/components/theme/advanced_pattern_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 /**
diff --git a/frameworks/core/components/theme/card_theme.h b/frameworks/core/components/theme/card_theme.h
index 2ee24bc7b191e74d8164f2fe91339c59eed814e9..973250d175beed4350c4cc87570d4bede25c9ece 100644
--- a/frameworks/core/components/theme/card_theme.h
+++ b/frameworks/core/components/theme/card_theme.h
@@ -19,7 +19,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 
 namespace OHOS::Ace {
diff --git a/frameworks/core/components/theme/icon_theme.h b/frameworks/core/components/theme/icon_theme.h
index 9b86294349b26c1dd2f555c9682b57de50eb8ec1..da22cb7415db4c3f641c9f62dc3b489f67a96505 100644
--- a/frameworks/core/components/theme/icon_theme.h
+++ b/frameworks/core/components/theme/icon_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 /**
diff --git a/frameworks/core/components/theme/theme_manager_impl.cpp b/frameworks/core/components/theme/theme_manager_impl.cpp
index 0a28469716a1ce216f6213accfe909456aa3fbb0..d1b8dba87eca71fa7901b31d0870784d6f9a2fa4 100644
--- a/frameworks/core/components/theme/theme_manager_impl.cpp
+++ b/frameworks/core/components/theme/theme_manager_impl.cpp
@@ -62,6 +62,7 @@
 #include "core/components/theme/card_theme.h"
 #include "core/components/theme/icon_theme.h"
 #include "core/components/theme/shadow_theme.h"
+#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/toast/toast_theme.h"
 #include "core/components/toggle/toggle_theme.h"
 #include "core/components/tool_bar/tool_bar_theme.h"
diff --git a/frameworks/core/components/toast/toast_theme.h b/frameworks/core/components/toast/toast_theme.h
index 8e146b5b6d7a73e0299e2aa6c077693888e2ccc8..3a815ea3388bdc98a9eab7168d45682914d35088 100644
--- a/frameworks/core/components/toast/toast_theme.h
+++ b/frameworks/core/components/toast/toast_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/toggle/toggle_theme.h b/frameworks/core/components/toggle/toggle_theme.h
index 31d47f75d443443317506dfced597c905f0f7bcd..e60f2b4dc989ad291b031208463fb5249e1a5a55 100644
--- a/frameworks/core/components/toggle/toggle_theme.h
+++ b/frameworks/core/components/toggle/toggle_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components/tool_bar/tool_bar_theme.h b/frameworks/core/components/tool_bar/tool_bar_theme.h
index 040f3f687d66f04bd757cc6a52d493fa345dc375..68f5ca0219f57c5bb1efb44a0d111ef8d3f874a0 100644
--- a/frameworks/core/components/tool_bar/tool_bar_theme.h
+++ b/frameworks/core/components/tool_bar/tool_bar_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 #include "frameworks/bridge/common/utils/utils.h"
 
diff --git a/frameworks/core/components/video/video_theme.h b/frameworks/core/components/video/video_theme.h
index d1aa2eb5029494efd6c713d7bfede52a6da92ddc..d2df49a6f14ff0ec3efd71c46fe030ba7e48bcb0 100644
--- a/frameworks/core/components/video/video_theme.h
+++ b/frameworks/core/components/video/video_theme.h
@@ -22,7 +22,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace {
 
diff --git a/frameworks/core/components_ng/components.gni b/frameworks/core/components_ng/components.gni
index cc40fb7dfb9435a07bf094543d179cc7cd166dd3..9fe33763504a8a67112c9331005eff5f2060625c 100644
--- a/frameworks/core/components_ng/components.gni
+++ b/frameworks/core/components_ng/components.gni
@@ -71,7 +71,7 @@ template("build_component_ng") {
 
       deps = []
       deps += extra_deps
-      deps += [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+      deps += []
       if (defined(invoker.public_configs)) {
         public_configs = []
         public_configs += invoker.public_configs
diff --git a/frameworks/core/components_ng/pattern/container_modal/container_modal_theme.h b/frameworks/core/components_ng/pattern/container_modal/container_modal_theme.h
index 9a64083c81186fe8ecb95d36bea30bff2bb0c221..64272c0f77ec5d2f37d540d03a11c9d8a887b9e7 100644
--- a/frameworks/core/components_ng/pattern/container_modal/container_modal_theme.h
+++ b/frameworks/core/components_ng/pattern/container_modal/container_modal_theme.h
@@ -25,7 +25,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/pattern/container_modal/container_modal_view.h"
 
 namespace OHOS::Ace::NG {
diff --git a/frameworks/core/components_ng/pattern/form/form_theme.h b/frameworks/core/components_ng/pattern/form/form_theme.h
index 744cef7196803a7f3d8a6af811f3a0e76c8202e7..9a16a2428043c4fd1dc83c6e030a76aa0633f2ab 100755
--- a/frameworks/core/components_ng/pattern/form/form_theme.h
+++ b/frameworks/core/components_ng/pattern/form/form_theme.h
@@ -21,7 +21,6 @@
 #include "core/components/common/properties/text_style.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 /**
diff --git a/frameworks/core/components_ng/pattern/gauge/gauge_theme.h b/frameworks/core/components_ng/pattern/gauge/gauge_theme.h
index 7968f387720a8fd0591060785d7196017a5201ca..8b2958cf1ce43b303597fc54035f762ee30dfa4a 100644
--- a/frameworks/core/components_ng/pattern/gauge/gauge_theme.h
+++ b/frameworks/core/components_ng/pattern/gauge/gauge_theme.h
@@ -19,7 +19,6 @@
 #include "base/i18n/localization.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 namespace {
diff --git a/frameworks/core/components_ng/pattern/grid/grid_item_theme.h b/frameworks/core/components_ng/pattern/grid/grid_item_theme.h
index 8834b176110ee9cf2b74b6bc93f7d785028f7773..18e02c28861dcb1d7f748d621bfc9e45a613754b 100644
--- a/frameworks/core/components_ng/pattern/grid/grid_item_theme.h
+++ b/frameworks/core/components_ng/pattern/grid/grid_item_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components_ng/property/border_property.h"
 
 namespace OHOS::Ace::NG {
diff --git a/frameworks/core/components_ng/pattern/linear_indicator/linear_indicator_theme.h b/frameworks/core/components_ng/pattern/linear_indicator/linear_indicator_theme.h
index e145c0991620901e55e1358bde8da2e11da87b85..c677ad277a0766eb2a20d74797b64a66e99d24ec 100644
--- a/frameworks/core/components_ng/pattern/linear_indicator/linear_indicator_theme.h
+++ b/frameworks/core/components_ng/pattern/linear_indicator/linear_indicator_theme.h
@@ -21,7 +21,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 
diff --git a/frameworks/core/components_ng/pattern/refresh/refresh_theme_ng.h b/frameworks/core/components_ng/pattern/refresh/refresh_theme_ng.h
index 9c421991b24411b0f16d7278d91d69111d0c33b4..8b0c5ea50e14766a468c3344c6c6bd20c058fe08 100644
--- a/frameworks/core/components_ng/pattern/refresh/refresh_theme_ng.h
+++ b/frameworks/core/components_ng/pattern/refresh/refresh_theme_ng.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 
diff --git a/frameworks/core/components_ng/pattern/scrollable/scrollable_theme.h b/frameworks/core/components_ng/pattern/scrollable/scrollable_theme.h
index bb9de12aed35e12276e10149556e0db5a9342692..44d15ad2dcfd36ab8629b4ad6aea4e820e4c6654 100644
--- a/frameworks/core/components_ng/pattern/scrollable/scrollable_theme.h
+++ b/frameworks/core/components_ng/pattern/scrollable/scrollable_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 
diff --git a/frameworks/core/components_ng/pattern/swiper/swiper_theme.h b/frameworks/core/components_ng/pattern/swiper/swiper_theme.h
index 1039749f16cb9ec08addf76913d0dbf9216357bd..2c9998b3c22d68f66ecbce20ddfd0bbd042aba63 100644
--- a/frameworks/core/components_ng/pattern/swiper/swiper_theme.h
+++ b/frameworks/core/components_ng/pattern/swiper/swiper_theme.h
@@ -18,7 +18,6 @@
 
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 
 namespace OHOS::Ace::NG {
 namespace {
diff --git a/frameworks/core/components_v2/pattern_lock/pattern_lock_theme.h b/frameworks/core/components_v2/pattern_lock/pattern_lock_theme.h
index 5059584b9c9f51b81ba79d5d631570092a99be46..cb0344c582febb6ce68bbab67a72ffc3628fd3c5 100644
--- a/frameworks/core/components_v2/pattern_lock/pattern_lock_theme.h
+++ b/frameworks/core/components_v2/pattern_lock/pattern_lock_theme.h
@@ -20,7 +20,6 @@
 #include "core/components/common/properties/color.h"
 #include "core/components/theme/theme.h"
 #include "core/components/theme/theme_constants.h"
-#include "core/components/theme/theme_constants_defines.h"
 #include "core/components/theme/theme_manager.h"
 namespace OHOS::Ace::V2 {
 class PatternLockTheme : public virtual Theme {
diff --git a/frameworks/core/interfaces/native/BUILD.gn b/frameworks/core/interfaces/native/BUILD.gn
index df438cd071bc363bfc0d6c78fc065ce235c32833..a6c7c8b6127f2cc809d408262e122c9d50d84fe0 100644
--- a/frameworks/core/interfaces/native/BUILD.gn
+++ b/frameworks/core/interfaces/native/BUILD.gn
@@ -151,7 +151,7 @@ template("ace_core_interfaces_native_node") {
       "ani/web_ani_modifier.cpp",
     ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     if (defined(config.web_components_support) &&
         config.web_components_support) {
       sources += [ "node/web_modifier.cpp" ]
diff --git a/frameworks/core/interfaces/native/common/BUILD.gn b/frameworks/core/interfaces/native/common/BUILD.gn
index 7f8ec8631a614084ec220e30ee61f567611ac72e..f5582f424bca33683b615c5083da567776eedd3e 100644
--- a/frameworks/core/interfaces/native/common/BUILD.gn
+++ b/frameworks/core/interfaces/native/common/BUILD.gn
@@ -74,7 +74,7 @@ template("ace_core_interfaces_native") {
     if (!ace_engine_feature_wearable) {
       sources += rebased_wearable_sources
     }
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
 
     if (defined(config.model_component_support) &&
         config.model_component_support) {
diff --git a/frameworks/core/pipeline/BUILD.gn b/frameworks/core/pipeline/BUILD.gn
index 86c9f4396255be8bfcc5f693c04cdbf276edb066..557a53b4ea6af00100b70c89c4ed3d77277b1097 100644
--- a/frameworks/core/pipeline/BUILD.gn
+++ b/frameworks/core/pipeline/BUILD.gn
@@ -61,7 +61,7 @@ template("ace_core_pipeline_source_set") {
 
     configs = [ "$ace_root:ace_config" ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     external_deps = []
     if (use_hilog) {
       external_deps += [ "hilog:libhilog" ]
diff --git a/frameworks/core/pipeline_ng/BUILD.gn b/frameworks/core/pipeline_ng/BUILD.gn
index 50ebeb47b8d1a7ff60a8aa857a97dd730fbd13f2..1b7eac559bef04e28fd96a737063876ea50f1c41 100644
--- a/frameworks/core/pipeline_ng/BUILD.gn
+++ b/frameworks/core/pipeline_ng/BUILD.gn
@@ -43,7 +43,7 @@ template("ace_core_pipeline_ng_source_set") {
 
     configs = [ "$ace_root:ace_config" ]
 
-    deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+    deps = []
     external_deps = []
     if (use_hilog) {
       external_deps += [ "hilog:libhilog" ]
diff --git a/interfaces/inner_api/ace_kit/BUILD.gn b/interfaces/inner_api/ace_kit/BUILD.gn
index b42860c5461b90ce2cd065a88c41a45fdf04bdeb..dd235f8a2031b702731eacf089a6c3e646c6b43c 100644
--- a/interfaces/inner_api/ace_kit/BUILD.gn
+++ b/interfaces/inner_api/ace_kit/BUILD.gn
@@ -70,7 +70,7 @@ ohos_source_set("ace_kit") {
     "$ace_root/interfaces/inner_api/ace_kit/src",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   external_deps = [ "hilog:libhilog" ]
 
   if (is_arkui_x) {
diff --git a/interfaces/inner_api/xcomponent_controller/BUILD.gn b/interfaces/inner_api/xcomponent_controller/BUILD.gn
index 98107513a497a9dce28ca9a4bc2442ec42eb1518..0f42972ecad3cae686d6d4ff4cee737e701a9815 100644
--- a/interfaces/inner_api/xcomponent_controller/BUILD.gn
+++ b/interfaces/inner_api/xcomponent_controller/BUILD.gn
@@ -48,7 +48,6 @@ ohos_shared_library("ace_xcomponent_controller") {
   public_configs = [ ":xcomponent_controller_config" ]
 
   deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/interfaces/inner_api/ace:ace_forward_compatibility",
     "$ace_root/interfaces/inner_api/ace:ace_uicontent",
   ]
diff --git a/test/benchmark/components/BUILD.gn b/test/benchmark/components/BUILD.gn
index f4957b4fc86fed40e0d69f96ba395e4d699243b5..c1dc23293f26e8cbde0cacde6c61603c70915e89 100644
--- a/test/benchmark/components/BUILD.gn
+++ b/test/benchmark/components/BUILD.gn
@@ -23,7 +23,6 @@ ohos_benchmarktest("ace_components") {
   ]
 
   deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn
index d261f36312ab3fd5671cfda46a0e1ecf10da7c8d..f0c099f94cbcde4a80b0ed6e9e9c332204dc8b9a 100644
--- a/test/unittest/BUILD.gn
+++ b/test/unittest/BUILD.gn
@@ -234,7 +234,7 @@ ohos_source_set("ace_components_base") {
   if (ace_engine_feature_enable_static_instructive_code) {
     source += [ "$ace_root/frameworks/core/components_ng/base/interop/view_stack_processor_interop.cpp" ]
   }
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   external_deps = [ "cJSON:cjson" ]
   if (current_os == "ohos") {
@@ -281,7 +281,7 @@ ohos_source_set("ace_components_event") {
     "$ace_root/frameworks/core/gestures/gesture_referee.cpp",
   ]
   configs = [ ":ace_unittest_config" ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
   }
@@ -315,7 +315,7 @@ ohos_source_set("ace_components_gestures") {
     "$ace_root/frameworks/core/components_ng/gestures/swipe_gesture.cpp",
     "$ace_root/frameworks/core/components_ng/gestures/tap_gesture.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -336,7 +336,7 @@ ohos_source_set("ace_components_layout") {
     "$ace_root/frameworks/core/components_ng/layout/layout_wrapper_builder.cpp",
     "$ace_root/frameworks/core/components_ng/layout/layout_wrapper_node.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -363,7 +363,7 @@ ohos_source_set("ace_components_property") {
     "$ace_root/frameworks/core/components_ng/property/safe_area_insets.cpp",
     "$ace_root/frameworks/core/components_ng/property/templates_parser.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -419,7 +419,7 @@ ohos_source_set("ace_components_manager") {
     "$ace_root/frameworks/core/components_ng/manager/shared_overlay/shared_transition_effect.cpp",
     "$ace_root/frameworks/core/components_ng/manager/toolbar/toolbar_manager.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -450,7 +450,7 @@ ohos_source_set("ace_components_syntax") {
     "$ace_root/frameworks/core/components_ng/syntax/repeat_virtual_scroll_node.cpp",
     "$ace_root/frameworks/core/components_ng/syntax/with_theme_node.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -493,7 +493,7 @@ ohos_source_set("ace_components_render") {
     "$ace_root/frameworks/core/components_ng/render/render_property.cpp",
     "$ace_root/frameworks/core/components_ng/render/shape_painter.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -535,7 +535,7 @@ ohos_source_set("ace_base") {
     "$ace_root/frameworks/base/utils/utils.cpp",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   external_deps = [
     "bounds_checking_function:libsec_static",
     "cJSON:cjson_static",
@@ -574,7 +574,7 @@ ohos_source_set("ace_core_animation") {
     "$ace_root/test/mock/core/animation/mock_animator.cpp",
     "$ace_root/test/mock/core/animation/mock_scheduler.cpp",
   ]
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   configs = [ ":ace_unittest_config" ]
   if (current_os == "ohos") {
     external_deps = [ "c_utils:utils" ]
@@ -654,7 +654,7 @@ ohos_source_set("ace_core_extra") {
     "$ace_root/test/mock/core/common/mock_icon_theme.cpp",
   ]
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   external_deps = [
     "googletest:gmock",
     "googletest:gtest_main",
@@ -776,10 +776,7 @@ ohos_source_set("ace_components_mock") {
     "$ace_root/test/unittest/core/pattern/text/mock/mock_text_layout_adapter.cpp",
     "$ace_root/test/unittest/core/pipeline/mock_input_method_manager.cpp",
   ]
-  deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
-    "$ace_root/test/unittest:ace_unittest_log",
-  ]
+  deps = [ "$ace_root/test/unittest:ace_unittest_log" ]
   external_deps = [
     "napi:ace_napi",
     "skia:skia_canvaskit",
@@ -1516,7 +1513,7 @@ ohos_source_set("ace_components_pattern") {
     ]
   }
 
-  deps = [ "$ace_root/frameworks/core/components/theme:build_theme_code" ]
+  deps = []
   external_deps = [
     "bounds_checking_function:libsec_static",
     "icu:shared_icui18n",
diff --git a/test/unittest/ace_unittest.gni b/test/unittest/ace_unittest.gni
index 662a40acc0d293e7c491e5aefc16bfff9a94a8e7..9dbe5cd4de7152c3c28b7021e7aaa135dddb0ff3 100644
--- a/test/unittest/ace_unittest.gni
+++ b/test/unittest/ace_unittest.gni
@@ -99,7 +99,6 @@ template("ace_unittest") {
 
       deps = ace_unittest_deps
       deps += [
-        "$ace_root/frameworks/core/components/theme:build_theme_code",
         "$ace_root/test/unittest:ace_base",
         "$ace_root/test/unittest:ace_components_base",
         "$ace_root/test/unittest:ace_components_event",
@@ -179,7 +178,6 @@ template("ace_unittest") {
       include_dirs += include_dir
       deps = ace_unittest_deps
       deps += [
-        "$ace_root/frameworks/core/components/theme:build_theme_code",
         "$ace_root/test/unittest:ace_base",
         "$ace_root/test/unittest:ace_components_base",
         "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/adapter/ohos/entrance/BUILD.gn b/test/unittest/adapter/ohos/entrance/BUILD.gn
index 615d55d258fce64a8db58f1dbbcfab811091bc88..f71262f85ce148e9ea4e3404926dffdfd74f1de7 100644
--- a/test/unittest/adapter/ohos/entrance/BUILD.gn
+++ b/test/unittest/adapter/ohos/entrance/BUILD.gn
@@ -113,10 +113,7 @@ ohos_source_set("ace_layout_inspector_mock") {
     "$ace_root/test/unittest/core/pattern/text/mock/mock_text_layout_adapter.cpp",
     "$ace_root/test/unittest/core/pipeline/mock_input_method_manager.cpp",
   ]
-  deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
-    "$ace_root/test/unittest:ace_unittest_log",
-  ]
+  deps = [ "$ace_root/test/unittest:ace_unittest_log" ]
   external_deps = [
     "googletest:gmock",
     "googletest:gtest_main",
diff --git a/test/unittest/core/image/BUILD.gn b/test/unittest/core/image/BUILD.gn
index 29436352d3d838d205eea0209aad41110acfed79..9e41308396947ab01c67a19fc5432b396008dc14 100644
--- a/test/unittest/core/image/BUILD.gn
+++ b/test/unittest/core/image/BUILD.gn
@@ -97,7 +97,6 @@ ohos_unittest("image_provider_test_ng") {
   ]
 
   deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/core/pattern/plugin/BUILD.gn b/test/unittest/core/pattern/plugin/BUILD.gn
index 2dd02475df60e8247f76c3fde7ed3d6f7a0e71c3..2a8359aaca64d409d0e7b080b88890a34273babc 100644
--- a/test/unittest/core/pattern/plugin/BUILD.gn
+++ b/test/unittest/core/pattern/plugin/BUILD.gn
@@ -176,7 +176,6 @@ if (defined(enable_plugin_pattern_test_ng)) {
       "$ability_runtime_inner_api_path/ability_manager:ability_manager",
       "$ability_runtime_services_path/abilitymgr:abilityms",
       "$ace_root/frameworks/base:ace_memory_monitor_ohos",
-      "$ace_root/frameworks/core/components/theme:build_theme_code",
       "$ace_root/interfaces/inner_api/ui_service_manager:ui_service_mgr",
       "$ace_root/test/unittest:ace_engine_unittest_flutter_deps",
       "$ace_root/test/unittest:ace_unittest_log",
diff --git a/test/unittest/core/pattern/security_component/BUILD.gn b/test/unittest/core/pattern/security_component/BUILD.gn
index 2ca039df9368cd760ecdffb7358bb60721faf7ac..17393f1342189bfc17304c98a31209c770f17a1d 100644
--- a/test/unittest/core/pattern/security_component/BUILD.gn
+++ b/test/unittest/core/pattern/security_component/BUILD.gn
@@ -24,7 +24,6 @@ ohos_unittest("security_component_test_ng") {
   ]
 
   deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/core/pattern/web/BUILD.gn b/test/unittest/core/pattern/web/BUILD.gn
index 8aaca1a3a7493b003fcb2f41c981861c8a4cb214..6b136747c2ed7a229c7ab48d2cf59263ff6b1810 100755
--- a/test/unittest/core/pattern/web/BUILD.gn
+++ b/test/unittest/core/pattern/web/BUILD.gn
@@ -80,7 +80,6 @@ ohos_unittest("web_pattern_unit_test_ohos") {
 
   deps = [
     "$ace_root/frameworks/core/components/custom_paint:ace_core_components_custom_paint_ohos",
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
@@ -192,7 +191,6 @@ ohos_unittest("web_accessibility_event_report_unit_test_ohos") {
 
   deps = [
     "$ace_root/frameworks/core/components/custom_paint:ace_core_components_custom_paint_ohos",
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/core/pattern/web/ani/BUILD.gn b/test/unittest/core/pattern/web/ani/BUILD.gn
index 7cf3afda5cf64c9e5983758428c9acac884f7d31..f585491bbd3aea358e12ac74b92e383434845963 100755
--- a/test/unittest/core/pattern/web/ani/BUILD.gn
+++ b/test/unittest/core/pattern/web/ani/BUILD.gn
@@ -670,7 +670,6 @@ ohos_unittest("web_pattern_static_unit_test_ohos") {
 
   deps = [
     "$ace_root/frameworks/core/components/custom_paint:ace_core_components_custom_paint_ohos",
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/interfaces/BUILD.gn b/test/unittest/interfaces/BUILD.gn
index 093ed091fe843c7ae16e24d5e7532a2c758c37bd..89e017afff6eb12608edf1362465e36a7a2f8d2e 100644
--- a/test/unittest/interfaces/BUILD.gn
+++ b/test/unittest/interfaces/BUILD.gn
@@ -103,7 +103,6 @@ ohos_unittest("ui_event_test") {
   configs = [ "$ace_root/test/unittest:ace_unittest_config" ]
   include_dirs = [ "${ace_root}/interfaces/inner_api/ace" ]
   deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
     "$ace_root/test/unittest:ace_base",
     "$ace_root/test/unittest:ace_components_base",
     "$ace_root/test/unittest:ace_components_event",
diff --git a/test/unittest/interfaces/ace_kit/BUILD.gn b/test/unittest/interfaces/ace_kit/BUILD.gn
index 5afc996586634428cb2e43eaa20c9e90000ec0b4..80e5b8c15ee30e0abf7548aa13ec1b4f90da8f33 100644
--- a/test/unittest/interfaces/ace_kit/BUILD.gn
+++ b/test/unittest/interfaces/ace_kit/BUILD.gn
@@ -117,10 +117,7 @@ ohos_source_set("ace_kit_mock") {
     "$ace_root/test/unittest/core/pattern/text/mock/mock_text_layout_adapter.cpp",
     "$ace_root/test/unittest/core/pipeline/mock_input_method_manager.cpp",
   ]
-  deps = [
-    "$ace_root/frameworks/core/components/theme:build_theme_code",
-    "$ace_root/test/unittest:ace_unittest_log",
-  ]
+  deps = [ "$ace_root/test/unittest:ace_unittest_log" ]
   external_deps = [
     "googletest:gmock",
     "googletest:gtest_main",