删除冗余头文件

Signed-off-by: kangchongtao <kangchongtao@huawei.com>

adapter/ohos/capability/environment/environment_impl.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "adapter/ohos/capability/environment/environment_impl.h"
-#include "core/common/ace_application_info.h"
 
 namespace OHOS::Ace {
 EnvironmentImpl::EnvironmentImpl(const RefPtr<TaskExecutor>& taskExecutor) : Environment(taskExecutor) {}

adapter/ohos/capability/html/html_to_span.cpp

@@ -15,11 +15,6 @@
 
 #include "html_to_span.h"
 
-#include <iterator>
-#include <ostream>
-#include <string>
-#include <utility>
-
 #include "base/geometry/dimension.h"
 #include "base/image/file_uri_helper.h"
 #include "base/image/image_source.h"

adapter/ohos/capability/html/span_to_html.cpp

@@ -15,14 +15,10 @@
 
 #include "span_to_html.h"
 
-#include <cstdint>
-#include <string>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "base/image/file_uri_helper.h"
 #include "base/image/image_packer.h"
-#include "base/utils/macros.h"
 
 namespace OHOS::Ace {
 const constexpr char* CONVERT_PNG_FORMAT = "image/png";

adapter/ohos/capability/interaction/interaction_impl.cpp

@@ -14,9 +14,6 @@
  */
 
 #include "interaction_impl.h"
-#include "drag_data.h"
-#include "core/common/interaction/interaction_data.h"
-#include "core/gestures/gesture_info.h"
 
 #include "interaction_manager.h"
 #include "start_drag_listener_impl.h"

adapter/ohos/capability/preference/storage_impl.cpp

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#include "base/utils/utils.h"
 #include "storage_impl.h"
 
 namespace OHOS::Ace {

adapter/ohos/capability/time/time_event_proxy_ohos.cpp

@@ -18,7 +18,6 @@
 #include "common_event_support.h"
 
 #include "frameworks/core/common/container.h"
-#include "frameworks/core/common/container_scope.h"
 
 namespace OHOS::Ace {
 std::unique_ptr<TimeEventProxy> TimeEventProxy::instance_;

adapter/ohos/capability/udmf/udmf_impl.cpp

@@ -15,7 +15,6 @@
 
 #include "udmf_impl.h"
 
-#include <memory>
 #include <unordered_map>
 #include <variant>
 

adapter/ohos/capability/window_connection/window_extension_connection_ohos.cpp

@@ -14,20 +14,9 @@
  */
 #include "window_extension_connection_ohos.h"
 
-#include <functional>
-#include <memory>
-
-#include "base/utils/utils.h"
-#include "common/rs_color.h"
-#include "element_name.h"
 #include "render_service_client/core/ui/rs_surface_node.h"
 
-#include "base/memory/ace_type.h"
-#include "base/memory/referenced.h"
 #include "core/common/ace_engine.h"
-#include "core/common/container.h"
-#include "core/common/container_scope.h"
-#include "frameworks/base/json/json_util.h"
 #include "frameworks/core/components_v2/ability_component/render_ability_component.h"
 
 #ifdef OS_ACCOUNT_EXISTS

adapter/ohos/capability/window_connection/window_extension_connection_proxy.cpp

@@ -16,8 +16,6 @@
 
 #include "window_extension_connection_ohos.h"
 
-#include "base/memory/ace_type.h"
-
 namespace OHOS::Ace {
 RefPtr<WindowExtensionConnectionAdapter> WindowExtensionConnectionProxy::CreateAdapter()
 {

adapter/ohos/capability/window_connection_ng/window_extension_connection_ohos_ng.cpp

@@ -14,10 +14,6 @@
  */
 #include "window_extension_connection_ohos_ng.h"
 
-#include <functional>
-#include <memory>
-
-#include "common/rs_color.h"
 #include "element_name.h"
 #include "render_service_client/core/ui/rs_surface_node.h"
 

adapter/ohos/capability/window_connection_ng/window_extension_connection_proxy_ng.cpp

@@ -16,8 +16,6 @@
 
 #include "window_extension_connection_ohos_ng.h"
 
-#include "base/memory/ace_type.h"
-
 namespace OHOS::Ace {
 RefPtr<WindowExtensionConnectionAdapterNG> WindowExtensionConnectionProxyNG::CreateAdapter()
 {

adapter/ohos/capability/xcollie/xcollieInterface_impl.cpp

@@ -14,7 +14,7 @@
  */
 
 #include "xcollieInterface_impl.h"
-#include <cstdint>
+
 #include "xcollie/xcollie.h"
 
 namespace OHOS::Ace {

adapter/ohos/entrance/ace_ability.cpp

@@ -15,7 +15,6 @@
 
 #include "adapter/ohos/entrance/ace_ability.h"
 
-#include <regex>
 #include <ui/rs_surface_node.h>
 
 #include "ability_process.h"

adapter/ohos/entrance/ace_application_info.cpp

@@ -15,21 +15,8 @@
 
 #include "adapter/ohos/entrance/ace_application_info.h"
 
-#include <dirent.h>
-#include <iostream>
-#include <sys/stat.h>
-
-#include "contrib/minizip/unzip.h"
-#include "ohos/init_data.h"
-#include "unicode/locid.h"
-
 #include "base/i18n/localization.h"
-#include "base/log/ace_trace.h"
-#include "base/log/log.h"
 #include "base/resource/ace_res_config.h"
-#include "base/resource/ace_res_data_struct.h"
-#include "base/utils/utils.h"
-#include "core/common/ace_engine.h"
 
 namespace OHOS::Ace::Platform {
 AceApplicationInfoImpl::AceApplicationInfoImpl() {}

adapter/ohos/entrance/ace_container.cpp

@@ -85,12 +85,6 @@
 #include "core/components_ng/pattern/text_field/text_field_pattern.h"
 #include "core/components_ng/render/adapter/form_render_window.h"
 #include "core/components_ng/render/adapter/rosen_window.h"
-#include "core/event/axis_event.h"
-#include "core/event/mouse_event.h"
-#include "core/event/touch_event.h"
-#include "core/pipeline/pipeline_base.h"
-#include "core/pipeline/pipeline_context.h"
-#include "core/pipeline_ng/pipeline_context.h"
 
 #if defined(ENABLE_ROSEN_BACKEND) and !defined(UPLOAD_GPU_DISABLED)
 #include "adapter/ohos/entrance/ace_rosen_sync_task.h"

adapter/ohos/entrance/ace_data_ability.cpp

@@ -15,18 +15,8 @@
 
 #include "adapter/ohos/entrance/ace_data_ability.h"
 
-#include "res_config.h"
-#include "resource_manager.h"
-#include "session_info.h"
-
-#include "adapter/ohos/entrance/pa_container.h"
 #include "adapter/ohos/entrance/pa_engine/pa_backend.h"
-#include "adapter/ohos/entrance/platform_event_callback.h"
-#include "adapter/ohos/entrance/utils.h"
-#include "base/log/log.h"
-#include "base/utils/utils.h"
 #include "core/common/ace_engine.h"
-#include "core/common/backend.h"
 
 namespace OHOS {
 namespace Ace {

adapter/ohos/entrance/ace_extra_input_data.cpp

@@ -15,8 +15,6 @@
 
 #include "ace_extra_input_data.h"
 
-#include <memory>
-
 #include "pointer_event.h"
 
 #define CHECK_FALSE_RETURN CHECK_NULL_RETURN

adapter/ohos/entrance/ace_form_ability.cpp

@@ -16,17 +16,8 @@
 #include "adapter/ohos/entrance/ace_form_ability.h"
 
 #include "form_provider_client.h"
-#include "res_config.h"
-#include "resource_manager.h"
-#include "session_info.h"
 
-#include "adapter/ohos/entrance/pa_container.h"
 #include "adapter/ohos/entrance/pa_engine/pa_backend.h"
-#include "adapter/ohos/entrance/platform_event_callback.h"
-#include "adapter/ohos/entrance/utils.h"
-#include "base/log/log.h"
-#include "base/utils/utils.h"
-#include "core/common/backend.h"
 
 namespace OHOS::Ace {
 using namespace OHOS::AAFwk;

adapter/ohos/entrance/ace_new_pipe_judgement.cpp

@@ -15,12 +15,8 @@
 
 #include "adapter/ohos/entrance/ace_new_pipe_judgement.h"
 
-#include <algorithm>
 #include <fstream>
-#include <list>
 
-#include "base/log/log.h"
-#include "base/utils/system_properties.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/entrance/ace_service_ability.cpp

@@ -15,18 +15,7 @@
 
 #include "adapter/ohos/entrance/ace_service_ability.h"
 
-#include "res_config.h"
-#include "resource_manager.h"
-#include "session_info.h"
-
-#include "adapter/ohos/entrance/pa_container.h"
-#include "adapter/ohos/entrance/pa_engine/pa_backend.h"
-#include "adapter/ohos/entrance/platform_event_callback.h"
-#include "adapter/ohos/entrance/utils.h"
-#include "base/log/log.h"
-#include "base/utils/utils.h"
 #include "core/common/ace_engine.h"
-#include "core/common/backend.h"
 
 namespace OHOS {
 namespace Ace {

adapter/ohos/entrance/ace_view_ohos.cpp

@@ -15,26 +15,9 @@
 
 #include "adapter/ohos/entrance/ace_view_ohos.h"
 
-#include <memory>
-
-#include "input_manager.h"
-
 #include "adapter/ohos/entrance/ace_container.h"
 #include "adapter/ohos/entrance/mmi_event_convertor.h"
-#include "base/log/ace_trace.h"
 #include "base/log/dump_log.h"
-#include "base/log/event_report.h"
-#include "base/log/log.h"
-#include "base/utils/macros.h"
-#include "base/utils/system_properties.h"
-#include "base/utils/utils.h"
-#include "core/common/ace_engine.h"
-#include "core/components/theme/theme_manager.h"
-#include "core/event/axis_event.h"
-#include "core/event/key_event.h"
-#include "core/event/mouse_event.h"
-#include "core/event/pointer_event.h"
-#include "core/event/touch_event.h"
 
 namespace OHOS::Ace::Platform {
 namespace {

adapter/ohos/entrance/capability_registry.cpp

@@ -18,7 +18,6 @@
 #include "adapter/ohos/capability/clipboard/clipboard_impl.h"
 #include "adapter/ohos/capability/environment/environment_proxy_impl.h"
 #include "adapter/ohos/capability/preference/storage_impl.h"
-#include "core/common/clipboard/clipboard_proxy.h"
 #include "core/common/environment/environment_proxy.h"
 #include "core/common/storage/storage_proxy.h"
 

adapter/ohos/entrance/data_ability_helper_standard.cpp

@@ -12,18 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "core/pipeline/pipeline_context.h"
+
+#include "adapter/ohos/entrance/data_ability_helper_standard.h"
+
 #if !defined(PREVIEW)
 #include <dlfcn.h>
 #endif
 
 #include "data_ability_helper.h"
-#include "datashare_helper.h"
 
-#include "adapter/ohos/entrance/data_ability_helper_standard.h"
 #include "base/log/ace_trace.h"
 #include "base/utils/string_utils.h"
-#include "base/utils/utils.h"
 
 namespace OHOS::Ace {
 const std::string MEDIA_SERVER_HEAD = "datashare:///media";

adapter/ohos/entrance/file_asset_provider_impl.cpp

@@ -15,13 +15,9 @@
 
 #include "adapter/ohos/entrance/file_asset_provider_impl.h"
 
-#include <cstring>
 #include <dirent.h>
-#include <limits>
-#include <mutex>
-#include <sys/types.h>
+
 #include "base/log/ace_trace.h"
-#include "base/log/log.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/entrance/form_module_preloader.cpp

@@ -15,12 +15,7 @@
 
 #include "form_module_preloader.h"
 
-#include <mutex>
-#include <unordered_map>
-
 #include "adapter/ohos/entrance/utils.h"
-#include "base/log/log.h"
-#include "base/json/json_util.h"
 #include "frameworks/bridge/declarative_frontend/engine/jsi/jsi_declarative_engine.h"
 
 

adapter/ohos/entrance/form_utils_impl.cpp

@@ -22,8 +22,6 @@
 #include "adapter/ohos/osal/want_wrap_ohos.h"
 #include "base/utils/utils.h"
 #include "core/common/container_scope.h"
-#include "core/common/form_manager.h"
-#include "frameworks/base/json/json_util.h"
 
 
 namespace OHOS::Ace {

adapter/ohos/entrance/hap_asset_provider_impl.cpp

@@ -16,7 +16,6 @@
 #include "adapter/ohos/entrance/hap_asset_provider_impl.h"
 
 #include "base/log/ace_trace.h"
-#include "base/log/log.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/entrance/mmi_event_convertor.cpp

@@ -15,18 +15,10 @@
 
 #include "adapter/ohos/entrance/mmi_event_convertor.h"
 
-#include <memory>
-
 #include "input_manager.h"
-#include "pointer_event.h"
 
 #include "adapter/ohos/entrance/ace_container.h"
 #include "adapter/ohos/entrance/ace_extra_input_data.h"
-#include "base/utils/time_util.h"
-#include "base/utils/utils.h"
-#include "core/event/ace_events.h"
-#include "core/event/key_event.h"
-#include "core/pipeline/pipeline_base.h"
 
 namespace OHOS::Ace::Platform {
 namespace {

adapter/ohos/entrance/navigation_controller_helper.cpp

@@ -15,8 +15,6 @@
 
 #include "navigation_controller_helper.h"
 
-#include "base/log/log_wrapper.h"
-#include "core/common/ace_engine.h"
 #include "ui_content_impl.h"
 
 namespace OHOS {

adapter/ohos/entrance/pa_container.cpp

@@ -15,7 +15,6 @@
 
 #include "adapter/ohos/entrance/pa_container.h"
 
-#include "adapter/ohos/entrance/ace_application_info.h"
 #include "adapter/ohos/entrance/file_asset_provider_impl.h"
 #include "adapter/ohos/entrance/hap_asset_provider_impl.h"
 #include "adapter/ohos/entrance/pa_engine/engine/common/js_backend_engine_loader.h"
@@ -29,8 +28,6 @@
 #include "core/common/ace_engine.h"
 #include "core/common/asset_manager_impl.h"
 #include "core/common/platform_window.h"
-#include "core/common/text_field_manager.h"
-#include "core/common/window.h"
 
 namespace OHOS::Ace::Platform {
 namespace {

adapter/ohos/entrance/pa_engine/engine/common/js_backend_engine_loader.cpp

@@ -17,12 +17,6 @@
 
 #include <dlfcn.h>
 
-#include "base/log/log.h"
-#include "base/utils/singleton.h"
-#include "base/utils/system_properties.h"
-#include "base/utils/utils.h"
-#include "core/common/ace_application_info.h"
-
 namespace OHOS::Ace {
 namespace {
 

adapter/ohos/entrance/pa_engine/engine/common/js_backend_timer_module.cpp

@@ -15,12 +15,7 @@
 
 #include "js_backend_timer_module.h"
 
-#include <atomic>
-#include <string>
-#include <vector>
-
 #include "base/log/log.h"
-#include "js_runtime.h"
 #include "js_runtime_utils.h"
 
 #ifdef SUPPORT_GRAPHICS

adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine.cpp

@@ -15,24 +15,10 @@
 
 #include "adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine.h"
 
-#include <dlfcn.h>
-
-#include "form_provider_info.h"
-#include "hisysevent.h"
 #include "js_backend_timer_module.h"
 #include "js_environment.h"
-#include "napi/native_node_api.h"
 #include "napi_common_ability.h"
-#include "napi_common_want.h"
-#include "napi_remote_object.h"
-#include "native_engine/impl/ark/ark_native_engine.h"
 
-#include "base/log/ace_trace.h"
-#include "base/log/event_report.h"
-#include "base/log/exception_handler.h"
-#include "base/log/log.h"
-#include "base/utils/utils.h"
-#include "frameworks/bridge/js_frontend/engine/common/runtime_constants.h"
 #include "frameworks/bridge/js_frontend/engine/jsi/ark_js_value.h"
 #include "frameworks/bridge/js_frontend/engine/jsi/jsi_base_utils.h"
 

adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine_loader.cpp

@@ -16,7 +16,6 @@
 #include "adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine_loader.h"
 
 #include "adapter/ohos/entrance/pa_engine/engine/jsi/jsi_pa_engine.h"
-#include "base/utils/macros.h"
 
 namespace OHOS::Ace {
 

adapter/ohos/entrance/pa_engine/pa_backend.cpp

@@ -15,13 +15,9 @@
 
 #include "adapter/ohos/entrance/pa_engine/pa_backend.h"
 
-#include "napi_remote_object.h"
-
 #include "ability.h"
 #include "adapter/ohos/entrance/pa_engine/engine/common/js_backend_engine_loader.h"
-#include "base/log/dump_log.h"
 #include "base/log/event_report.h"
-#include "base/utils/utils.h"
 #include "frameworks/bridge/common/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/entrance/timepicker/timepicker_haptic_impl.cpp

@@ -14,12 +14,6 @@
  */
 
 #include "adapter/ohos/entrance/timepicker/timepicker_haptic_impl.h"
-#include "adapter/ohos/entrance/timepicker/timepicker_haptic_stub.h"
-
-#include <cmath>
-#include <condition_variable>
-#include <mutex>
-#include <thread>
 
 namespace OHOS::Ace::NG {
 

adapter/ohos/entrance/ui_content_impl.cpp

@@ -100,9 +100,6 @@
 #ifdef NG_BUILD
 #include "frameworks/bridge/declarative_frontend/ng/declarative_frontend_ng.h"
 #endif
-#include "pipeline/rs_node_map.h"
-#include "transaction/rs_transaction_data.h"
-#include "ui/rs_node.h"
 
 #include "core/components_ng/render/adapter/rosen_render_context.h"
 #include "screen_session_manager_client.h"

adapter/ohos/entrance/ui_event_impl.cpp

@@ -16,17 +16,9 @@
 #include "adapter/ohos/entrance/ui_event_impl.h"
 
 #include <dlfcn.h>
-#include <mutex>
-#include <string>
-#include <unordered_map>
 
-#include "interfaces/inner_api/ace/ui_event_observer.h"
-
-#include "base/log/log.h"
-#include "base/thread/background_task_executor.h"
 #include "core/common/container.h"
 #include "core/common/recorder/event_controller.h"
-#include "core/common/recorder/event_recorder.h"
 #include "core/common/recorder/node_data_cache.h"
 #include "core/components_ng/base/inspector.h"
 

adapter/ohos/entrance/ui_session/ui_content_stub_impl.cpp

@@ -17,7 +17,6 @@
 
 #include "interfaces/inner_api/ui_session/ui_session_manager.h"
 
-#include "adapter/ohos/entrance/ui_session/include/ui_service_hilog.h"
 namespace OHOS::Ace {
 
 int32_t UIContentServiceStubImpl::GetInspectorTree(const std::function<void(std::string, int32_t, bool)>& eventCallback)

adapter/ohos/entrance/ui_session/ui_report_proxy.cpp

@@ -15,7 +15,6 @@
 
 #include "interfaces/inner_api/ui_session/ui_report_proxy.h"
 
-#include "interfaces/inner_api/ui_session/ui_session_json_util.h"
 #include "interfaces/inner_api/ui_session/ui_session_manager.h"
 
 #include "adapter/ohos/entrance/ui_session/include/ui_service_hilog.h"

adapter/ohos/entrance/utils.cpp

@@ -15,12 +15,8 @@
 
 #include "adapter/ohos/entrance/utils.h"
 
-#include <cstdio>
 #include <regex>
-#include <sstream>
-#include <string>
 
-#include "extractor.h"
 #include "wm/wm_common.h"
 #include "dm/dm_common.h"
 

adapter/ohos/entrance/window/foldable_window_ohos.cpp

@@ -17,8 +17,6 @@
 
 #include "dm/display_manager.h"
 
-#include "core/components_ng/render/adapter/rosen_window.h"
-
 namespace OHOS::Ace {
 RefPtr<FoldableWindow> FoldableWindow::CreateFoldableWindow(int32_t instanceId)
 {

adapter/ohos/osal/ace_checker.cpp

@@ -22,8 +22,6 @@
 #include "parameters.h"
 #endif
 
-#include "base/log/log.h"
-
 namespace OHOS::Ace {
 namespace {
 constexpr int32_t PAGE_NODES = 1000;

adapter/ohos/osal/ace_engine_ext.cpp

@@ -17,8 +17,6 @@
 
 #include <dlfcn.h>
 
-#include "base/log/log.h"
-#include "base/log/log_wrapper.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/ace_trace.cpp

@@ -17,9 +17,6 @@
 
 #include "hitrace_meter.h"
 
-#include "base/log/log.h"
-#include "base/utils/macros.h"
-#include "base/utils/system_properties.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/background_task_helper_ohos.cpp

@@ -17,7 +17,6 @@
 
 #include "background_mode.h"
 #include "background_task_mgr_helper.h"
-#include "continuous_task_callback_info.h"
 
 #include "core/common/ace_application_info.h"
 

adapter/ohos/osal/data_detector_adapter.cpp

@@ -15,11 +15,7 @@
 
 #include "core/common/ai/data_detector_adapter.h"
 
-#include "iremote_object.h"
-
 #include "adapter/ohos/entrance/ace_container.h"
-#include "base/log/log_wrapper.h"
-#include "bridge/common/utils/engine_helper.h"
 #include "core/common/ai/data_detector_mgr.h"
 #include "core/pipeline_ng/pipeline_context.h"
 

adapter/ohos/osal/data_detector_loader.cpp

@@ -14,7 +14,6 @@
  */
 #include <dlfcn.h>
 
-#include "base/log/log.h"
 #include "base/log/log_wrapper.h"
 #include "core/common/ai/data_detector_loader.h"
 namespace OHOS::Ace {

adapter/ohos/osal/download_manager_ohos.cpp

@@ -15,7 +15,6 @@
 
 #include <dlfcn.h>
 
-#include "base/log/log.h"
 #include "base/log/log_wrapper.h"
 #include "base/network/download_manager.h"
 

adapter/ohos/osal/drawing_lattice_ohos.cpp

@@ -16,7 +16,6 @@
 #include "drawing_lattice_ohos.h"
 
 #include "base/utils/utils.h"
-#include "draw/core_canvas.h"
 #include "lattice_napi/js_lattice.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/event_report.cpp

@@ -15,15 +15,10 @@
 
 #include "base/log/event_report.h"
 
-#include <ctime>
-#include <string>
 #include <unistd.h>
 
 #include "hisysevent.h"
 
-#include "base/log/ace_trace.h"
-#include "base/json/json_util.h"
-#include "core/common/ace_application_info.h"
 #include "core/common/ace_engine.h"
 #ifdef RESOURCE_SCHEDULE_SERVICE_ENABLE
 #include "res_sched_client.h"

adapter/ohos/osal/exception_handler.cpp

@@ -14,7 +14,6 @@
  */
 
 #include "base/log/exception_handler.h"
-#include "base/utils/utils.h"
 
 #include "app_mgr_client.h"
 #include "application_data_manager.h"

adapter/ohos/osal/frame_report.cpp

@@ -15,13 +15,9 @@
 
 #include "base/log/frame_report.h"
 
-#include <cstdio>
 #include <dlfcn.h>
-#include <unistd.h>
-
 #include <frame_collector.h>
 
-#include "base/log/log_wrapper.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/image_analyzer_loader.cpp

@@ -15,10 +15,8 @@
 
 #include <dlfcn.h>
 
-#include "frameworks/base/log/log_wrapper.h"
 #include "frameworks/bridge/common/utils/engine_helper.h"
 #include "core/common/ai/image_analyzer_loader.h"
-#include "napi/native_api.h"
 
 namespace OHOS::Ace {
 namespace {

adapter/ohos/osal/image_analyzer_manager.cpp

@@ -15,19 +15,10 @@
 
 #include "core/common/ai/image_analyzer_manager.h"
 
-#include "interfaces/inner_api/ace/ai/image_analyzer.h"
-#include "js_native_api_types.h"
-
-#include "base/geometry/offset.h"
-#include "base/image/pixel_map.h"
-#include "base/utils/utils.h"
 #include "core/common/ai/image_analyzer_adapter.h"
 #include "core/common/ai/image_analyzer_mgr.h"
-#include "core/components_ng/base/view_stack_processor.h"
 #include "core/components_ng/pattern/image/image_pattern.h"
-#include "core/components_ng/pattern/image/image_render_property.h"
 #include "core/components_ng/pattern/video/video_layout_property.h"
-#include "core/components_ng/property/measure_property.h"
 
 namespace OHOS::Ace {
 

adapter/ohos/osal/image_source_ohos.cpp

@@ -15,8 +15,6 @@
 
 #include "image_source_ohos.h"
 
-#include "image_source.h"
-#include "image_type.h"
 #include "media_errors.h"
 
 #include "base/image/pixel_map.h"

adapter/ohos/osal/input_method_manager_ohos.cpp

@@ -13,9 +13,7 @@
  * limitations under the License.
  */
 
-#include "core/common/container.h"
 #include "core/common/ime/input_method_manager.h"
-#include "core/components_ng/event/focus_hub.h"
 #include "core/components_ng/pattern/text_field/text_field_manager.h"
 #include "core/components_ng/pattern/window_scene/helper/window_scene_helper.h"
 #include "core/pipeline_ng/pipeline_context.h"

adapter/ohos/osal/log_wrapper.cpp

@@ -19,11 +19,6 @@
 #include <dlfcn.h>
 #endif
 #include <mutex>
-#include <cstring>
-#include <map>
-#include <unordered_map>
-
-#include "hilog/log.h"
 
 #ifdef ACE_INSTANCE_LOG
 #include "core/common/container_scope.h"

adapter/ohos/osal/mouse_style_ohos.cpp

@@ -16,12 +16,8 @@
 #include "mouse_style_ohos.h"
 
 #include "input_manager.h"
-#include "pointer_style.h"
 #include "struct_multimodal.h"
 
-#include "base/log/log_wrapper.h"
-#include "base/utils/linear_map.h"
-#include "base/utils/utils.h"
 #include "core/common/container.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/navigation_route_ohos.cpp

@@ -15,8 +15,6 @@
 #include "adapter/ohos/osal/navigation_route_ohos.h"
 #include "base/error/error_code.h"
 
-#include <mutex>
-
 #include "iservice_registry.h"
 #include "system_ability_definition.h"
 

adapter/ohos/osal/page_url_checker_ohos.cpp

@@ -15,20 +15,12 @@
 
 #include "page_url_checker_ohos.h"
 
-#include <string>
-
 #include "ability_runtime/context/context.h"
 #include "app_mgr_client.h"
-#include "atomic_service_status_callback.h"
-#include "errors.h"
-#include "iremote_broker.h"
-#include "iremote_object.h"
 #include "iremote_stub.h"
 #include "iservice_registry.h"
-#include "nocopyable.h"
 #include "singleton.h"
 #include "system_ability_definition.h"
-#include "want.h"
 
 namespace OHOS::Ace {
 const char BUNDLE_TAG[] = "@bundle:";

adapter/ohos/osal/pixel_map_ohos.cpp

@@ -15,13 +15,9 @@
 
 #include "pixel_map_ohos.h"
 
-#include <sstream>
-
 #include "drawable_descriptor.h"
 #include "pixel_map_manager.h"
 
-#include "base/log/log_wrapper.h"
-#include "base/utils/utils.h"
 #include "core/image/image_file_cache.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/resource_adapter_impl.cpp

@@ -22,9 +22,6 @@
 #include "adapter/ohos/entrance/ace_container.h"
 #include "adapter/ohos/osal/resource_convertor.h"
 #include "adapter/ohos/osal/resource_theme_style.h"
-#include "base/utils/system_properties.h"
-#include "base/utils/utils.h"
-#include "core/components/theme/theme_attributes.h"
 namespace OHOS::Ace {
 namespace {
 

adapter/ohos/osal/resource_adapter_impl_v2.cpp

@@ -22,9 +22,6 @@
 
 #include "adapter/ohos/entrance/ace_container.h"
 #include "adapter/ohos/osal/resource_convertor.h"
-#include "base/log/log_wrapper.h"
-#include "base/utils/device_config.h"
-#include "base/utils/system_properties.h"
 #include "base/utils/utils.h"
 #include "core/components/theme/theme_attributes.h"
 #include "core/pipeline_ng/pipeline_context.h"

adapter/ohos/osal/resource_theme_style.cpp

@@ -17,7 +17,6 @@
 
 #include <regex>
 #include <set>
-#include <string>
 
 namespace OHOS::Ace {
 namespace {

adapter/ohos/osal/ressched_report.cpp

@@ -15,7 +15,6 @@
 
 #include <dlfcn.h>
 
-#include "base/utils/utils.h"
 #include "base/ressched/ressched_report.h"
 
 namespace OHOS::Ace {

adapter/ohos/osal/stylus_detector_default.cpp

@@ -16,7 +16,6 @@
 #include "core/common/stylus/stylus_detector_default.h"
 
 #include "base/utils/string_utils.h"
-#include "frameworks/base/log/log_wrapper.h"
 namespace OHOS::Ace {
 
 namespace {

adapter/ohos/osal/stylus_detector_loader.cpp

@@ -16,7 +16,6 @@
 #include "core/common/stylus/stylus_detector_loader.h"
 
 #include <dlfcn.h>
-#include <memory>
 
 #include "frameworks/base/log/log_wrapper.h"
 

adapter/ohos/osal/system_bar_style_ohos.cpp

@@ -15,8 +15,6 @@
 
 #include "adapter/ohos/osal/system_bar_style_ohos.h"
 
-#include "core/components/common/properties/color.h"
-#include "core/pipeline/container_window_manager.h"
 #include "core/pipeline_ng/pipeline_context.h"
 
 namespace OHOS::Rosen {

adapter/ohos/osal/system_properties.cpp

@@ -15,23 +15,14 @@
 
 #include "base/utils/system_properties.h"
 
-#include <cstdint>
-#include <memory>
-#include <mutex>
 #include <shared_mutex>
-#include <string>
-#include <unistd.h>
 #include <regex>
 
-#include "dm_common.h"
-
 #include "display_manager.h"
 #include "locale_config.h"
 #include "parameter.h"
 #include "parameters.h"
 
-#include "base/log/log.h"
-#include "base/utils/utils.h"
 #include "core/common/ace_application_info.h"
 #ifdef OHOS_STANDARD_SYSTEM
 #include "systemcapability.h"

adapter/ohos/osal/view_data_wrap_ohos.cpp

@@ -16,8 +16,6 @@
 #include <dlfcn.h>
 #include "view_data_wrap_ohos.h"
 
-#include "base/utils/utils.h"
-
 namespace OHOS::Ace {
 #ifdef APP_USE_ARM
 constexpr char LIB_HINT2_TYPE_Z_SO_NAME[] = "/system/lib/module/core/atomicservicecomponent/libhint2type.z.so";

adapter/ohos/osal/want_wrap_ohos.cpp

@@ -17,7 +17,6 @@
 
 #include "napi_common_want.h"
 
-#include "base/log/log_wrapper.h"
 #include "base/utils/utils.h"
 
 namespace OHOS::Ace {

adapter/ohos/services/uiservice/src/ui_mgr_service.cpp

@@ -15,12 +15,6 @@
 
 #include "ui_mgr_service.h"
 
-#include <atomic>
-
-#include "if_system_ability_manager.h"
-#include "ipc_skeleton.h"
-#include "string_ex.h"
-#include "system_ability_definition.h"
 #include "ui_service_mgr_errors.h"
 #include "xcollie/watchdog.h"
 

adapter/ohos/services/uiservice/src/ui_service_mgr_client.cpp

@@ -15,12 +15,7 @@
 
 #include "ui_service_mgr_client.h"
 
-#include "dialog_callback.h"
-#include "if_system_ability_manager.h"
-#include "ipc_skeleton.h"
 #include "iservice_registry.h"
-#include "string_ex.h"
-#include "system_ability_definition.h"
 #include "ui_service_hilog.h"
 
 namespace OHOS {

adapter/ohos/services/uiservice/src/ui_service_mgr_proxy.cpp

@@ -15,12 +15,8 @@
 
 #include "ui_service_mgr_proxy.h"
 
-#include "errors.h"
-#include "string_ex.h"
 #include "ui_service_hilog.h"
 #include "ui_service_mgr_errors.h"
-#include "ui_service_proxy.h"
-#include "ui_service_stub.h"
 
 namespace OHOS::Ace {
 bool UIServiceMgrProxy::WriteInterfaceToken(MessageParcel& data)

adapter/ohos/services/uiservice/src/ui_service_mgr_stub.cpp

@@ -15,14 +15,9 @@
 
 #include "ui_service_mgr_stub.h"
 
-#include "errors.h"
 #include "ipc_skeleton.h"
-#include "string_ex.h"
 #include "tokenid_kit.h"
-#include "ui_service_mgr_errors.h"
 #include "ui_service_mgr_xcollie.h"
-#include "ui_service_proxy.h"
-#include "ui_service_stub.h"
 
 namespace OHOS::Ace {
 constexpr uint32_t UI_MGR_SERVICE_TIMEOUT = 5;

adapter/ohos/services/uiservice/src/ui_service_proxy.cpp

@@ -15,9 +15,6 @@
 
 #include "ui_service_proxy.h"
 
-#include "message_parcel.h"
-#include "want.h"
-
 #include "ui_service_hilog.h"
 
 namespace OHOS {