diff --git a/BUILD.gn b/BUILD.gn
index bb6d9542a3b0dd2179fb919712f959f4c92897c9..ca903ec0d188bafba5b0a03228bcd2fa570bb106 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -108,12 +108,10 @@ config("ace_config") {
 
   if (use_mingw_win) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   if (use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   ldflags = []
diff --git a/adapter/preview/build/config_windows.gni b/adapter/preview/build/config_windows.gni
index 84554ef1ef4a4dabeb2a70e750bdb36df0cd7e50..1028362621e20c59874e3e1f7877f8c7e51930ec 100644
--- a/adapter/preview/build/config_windows.gni
+++ b/adapter/preview/build/config_windows.gni
@@ -17,7 +17,6 @@ import("preview_common.gni")
 # windows platform defines and configs
 defines += [
   "WINDOWS_PLATFORM",
-  "_USE_MATH_DEFINES",
   "NOGDI",
   "U_CHARSET_IS_UTF8=1",
   "SK_BUILD_FOR_WIN",
diff --git a/advanced_ui_component/BUILD.gn b/advanced_ui_component/BUILD.gn
index ccd5aaa9de89e71559b07006550044c76e050f79..41bac6478372dd7e4b074cf7d4226cc35c629086 100644
--- a/advanced_ui_component/BUILD.gn
+++ b/advanced_ui_component/BUILD.gn
@@ -27,12 +27,10 @@ config("ace_napi_config") {
   defines = []
   if (use_mingw_win) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   if (use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   if (is_mac) {
diff --git a/component_ext/arc_alphabet_indexer/BUILD.gn b/component_ext/arc_alphabet_indexer/BUILD.gn
index 1fb27fe76faaea462696f3258d1e045ff7bb18b3..6886a3161655ca3013fff3b43443be02a3a59c53 100644
--- a/component_ext/arc_alphabet_indexer/BUILD.gn
+++ b/component_ext/arc_alphabet_indexer/BUILD.gn
@@ -87,7 +87,6 @@ ohos_shared_library("arcalphabetindexer") {
 
   if (use_mingw_win || use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   relative_install_dir = "module/arkui"
diff --git a/component_ext/arc_list/BUILD.gn b/component_ext/arc_list/BUILD.gn
index b5ed2e549d6f359dcf3fc3365c587d8ac18ce590..f668d402bbd6ce515b028d8e9c98499c8aac5f77 100755
--- a/component_ext/arc_list/BUILD.gn
+++ b/component_ext/arc_list/BUILD.gn
@@ -88,7 +88,6 @@ ohos_shared_library("arclist") {
 
   if (use_mingw_win || use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   relative_install_dir = "module/arkui"
diff --git a/component_ext/arc_scroll_bar/BUILD.gn b/component_ext/arc_scroll_bar/BUILD.gn
index fe68fa1085db2d4ca8bf2f789945cf22a2d63d9a..c86c09afe49c1d9fc5d844aab2e26069b049eefa 100644
--- a/component_ext/arc_scroll_bar/BUILD.gn
+++ b/component_ext/arc_scroll_bar/BUILD.gn
@@ -83,7 +83,6 @@ ohos_shared_library("arcscrollbar") {
 
   if (use_mingw_win || use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   relative_install_dir = "module/arkui"
diff --git a/component_ext/arc_swiper/BUILD.gn b/component_ext/arc_swiper/BUILD.gn
index e07e260578ae0140514ed3fa1f959a4167ba2ace..4b4f1acefdd7af3e4a982e477a7353e23ca8ccae 100644
--- a/component_ext/arc_swiper/BUILD.gn
+++ b/component_ext/arc_swiper/BUILD.gn
@@ -86,8 +86,6 @@ ohos_shared_library("arcswiper") {
     "-Os",
   ]
 
-  defines += [ "_USE_MATH_DEFINES" ]
-
   relative_install_dir = "module/arkui"
   subsystem_name = ace_engine_subsystem
   part_name = ace_engine_part
diff --git a/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h b/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h
index 8a8b445d1295d3018707e030a1ae3548d59c2cb8..db227bf86fdb33e3ef432398eef6c214a1737118 100644
--- a/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h
+++ b/interfaces/inner_api/ace_kit/src/view/draw/modifier_adapter.h
@@ -18,10 +18,6 @@
 
 #include <memory>
 
-#ifdef _USE_MATH_DEFINES
-#undef _USE_MATH_DEFINES
-#endif
-
 #if defined(MODIFIER_NG)
 #include "render_service_client/core/modifier_ng/custom/rs_content_style_modifier.h"
 #else
diff --git a/interfaces/napi/kits/BUILD.gn b/interfaces/napi/kits/BUILD.gn
index a03d0b17f789f955edbaf9b0debe79eb9519c031..78375a7140a1cf7f68dc783bc1a3355a2d583147 100644
--- a/interfaces/napi/kits/BUILD.gn
+++ b/interfaces/napi/kits/BUILD.gn
@@ -29,12 +29,10 @@ config("ace_napi_config") {
   defines = []
   if (use_mingw_win) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   if (use_linux) {
     cflags_cc += [ "-std=c++17" ]
-    defines += [ "_USE_MATH_DEFINES" ]
   }
 
   if (use_hilog) {
diff --git a/test/mock/interfaces/mock_content_modifier.cpp b/test/mock/interfaces/mock_content_modifier.cpp
index 96346d27b318b34285b364a431f46474cb36bdfb..3887621e21af2af28e898b4470c16f1b11e8d961 100644
--- a/test/mock/interfaces/mock_content_modifier.cpp
+++ b/test/mock/interfaces/mock_content_modifier.cpp
@@ -29,6 +29,7 @@ void ContentModifier::InitAdapter() {}
 
 const std::shared_ptr<ContentModifierAdapter>& ContentModifier::GetRSModifier() const
 {
-    return nullptr;
+    static std::shared_ptr<ContentModifierAdapter> adapter;
+    return adapter;
 }
 } // namespace OHOS::Ace::Kit