diff --git a/common/log/src/app_log_wrapper.cpp b/common/log/src/app_log_wrapper.cpp
index d9706b9460ed3b96d11b878d5a0cfed7b5493702..88f3e2763186c34f96cae719a4dbfbea15360264 100644
--- a/common/log/src/app_log_wrapper.cpp
+++ b/common/log/src/app_log_wrapper.cpp
@@ -14,7 +14,6 @@
  */
 
 #include "app_log_wrapper.h"
-#include <iostream>
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h b/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h
index cc4fca2bf5aa5706976fc3ec5c3095b0bb6ca110..ccd75808ec578d62ddfeaf178d8eb95e914485d7 100644
--- a/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h
+++ b/interfaces/innerkits/appexecfwk_base/include/launcher_ability_info.h
@@ -23,7 +23,6 @@
 
 namespace OHOS {
 namespace AppExecFwk {
- 
 struct LauncherAbilityInfo {
 public:
     std::string name;  // ability name, only the main class name
diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h
index 689a9e00c9577f53843f629db389d91bf7c66944..5ed482fc1a391958dbbd8ea4e60bf887308445cf 100644
--- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h
+++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_host.h
@@ -457,7 +457,6 @@ private:
 
     DISALLOW_COPY_AND_MOVE(BundleMgrHost);
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_HOST_H
\ No newline at end of file
diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h
index 42ebdaa339bc46dcdc9eefc68ce0cf43e89b6055..8d2bb1a83130711c496814d6fb5ef9d172b6fc25 100644
--- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h
+++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h
@@ -542,7 +542,6 @@ public:
         CHECK_BUNDLE_NAME_IN_ALLOWLIST
     };
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_INTERFACE_H
diff --git a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h
index 3c889fe005a63f6d3f7753cd729fb0e7c52fa2c4..3701701f9ec8f6f182bc0ed2cbe1c1edbc156bdc 100644
--- a/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h
+++ b/interfaces/innerkits/appexecfwk_core/include/bundlemgr/bundle_mgr_proxy.h
@@ -499,7 +499,6 @@ private:
     bool GetParcelableInfos(IBundleMgr::Message code, MessageParcel &data, std::vector<T> &parcelableInfos);
     static inline BrokerDelegator<BundleMgrProxy> delegator_;
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_BUNDLEMGR_BUNDLE_MGR_PROXY_H
\ No newline at end of file
diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp
index f6a1b22d35f17b0b46606d712cdd09dfad6e4ac6..337f2f3b9b779f0add4e764848ef7bd680774481 100644
--- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp
+++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp
@@ -14,14 +14,8 @@
  */
 
 #include "app_mgr_client.h"
-
-#include <cstdio>
-#include <string>
-#include <unistd.h>
-
 #include "if_system_ability_manager.h"
 #include "ipc_skeleton.h"
-
 #include "app_mgr_interface.h"
 #include "app_service_manager.h"
 #include "app_log_wrapper.h"
diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp
index c1b5ab57051d17d3361a77274f74fad7caa68f80..fd57c8535f0522027dc901b0f83627a0171f2b90 100644
--- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp
+++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-#include <atomic>
-
 #include "app_record_id.h"
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp
index 47804ce3e09f49da6f7f201c16aef390cb6d4a0d..9d6063558734851ab46169ab48d205cbc73ff8d5 100755
--- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp
+++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_host.cpp
@@ -1275,6 +1275,5 @@ bool BundleMgrHost::WriteParcelableVector(std::vector<T> &parcelableVector, Parc
     }
     return true;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp
index 57a81f577f22ed78a1b40cd525d52b9441a2e41d..a1ba8342685486f4c3f162792498485043325abd 100644
--- a/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp
+++ b/interfaces/innerkits/appexecfwk_core/src/bundlemgr/bundle_mgr_proxy.cpp
@@ -1651,6 +1651,5 @@ bool BundleMgrProxy::SendTransactCmd(IBundleMgr::Message code, MessageParcel &da
     }
     return true;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/interfaces/innerkits/fmskit/native/src/form_mgr.cpp b/interfaces/innerkits/fmskit/native/src/form_mgr.cpp
index b70daef0f45896b9448a27ec5d0810a746fc1d8b..b8deb82d8e0bfff64bca08888f81d96e1d84d61c 100644
--- a/interfaces/innerkits/fmskit/native/src/form_mgr.cpp
+++ b/interfaces/innerkits/fmskit/native/src/form_mgr.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#include <thread>
 #include "appexecfwk_errors.h"
 #include "app_log_wrapper.h"
 #include "form_errors.h"
diff --git a/interfaces/innerkits/libeventhandler/include/event_handler.h b/interfaces/innerkits/libeventhandler/include/event_handler.h
index d232a1a195082090f420507ca7dfe0c7000a4aa6..c68db0285bcf7de9e3718b24221ff06f5841ee8b 100644
--- a/interfaces/innerkits/libeventhandler/include/event_handler.h
+++ b/interfaces/innerkits/libeventhandler/include/event_handler.h
@@ -17,7 +17,6 @@
 #define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_LIBEVENTHANDLER_INCLUDE_EVENT_HANDLER_H
 
 #include "event_runner.h"
-#include "dumper.h"
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/interfaces/innerkits/libeventhandler/include/event_queue.h b/interfaces/innerkits/libeventhandler/include/event_queue.h
index 0315975a11b6dd8fa045c84a56b17f064e713582..0caaf0fadc585da938f3840eb12125f2413373cf 100644
--- a/interfaces/innerkits/libeventhandler/include/event_queue.h
+++ b/interfaces/innerkits/libeventhandler/include/event_queue.h
@@ -19,13 +19,9 @@
 #include <array>
 #include <list>
 #include <map>
-#include <mutex>
-
 #include "inner_event.h"
 #include "event_handler_errors.h"
 #include "file_descriptor_listener.h"
-#include "dumper.h"
-#include "logger.h"
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/interfaces/innerkits/libeventhandler/include/event_runner.h b/interfaces/innerkits/libeventhandler/include/event_runner.h
index 4d648085c6d0eff7682a6a1eb049a7c169819003..ba60f56911359203e100a65f8c1f81cf669b1e92 100644
--- a/interfaces/innerkits/libeventhandler/include/event_runner.h
+++ b/interfaces/innerkits/libeventhandler/include/event_runner.h
@@ -17,10 +17,7 @@
 #define FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_LIBEVENTHANDLER_INCLUDE_EVENT_RUNNER_H
 
 #include <atomic>
-
 #include "event_queue.h"
-#include "dumper.h"
-#include "logger.h"
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h b/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h
index 22b248f0dfcaca62b97d5c5a04d449fef8b6453e..34d9d566de1a7e122b3c0ed0595482765b4832a6 100644
--- a/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h
+++ b/interfaces/innerkits/task_dispatcher/include/dispatcher/parallel_task_dispatcher_base.h
@@ -115,7 +115,6 @@ private:
         }
     };
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif
\ No newline at end of file
diff --git a/interfaces/innerkits/task_dispatcher/include/task/task_listener.h b/interfaces/innerkits/task_dispatcher/include/task/task_listener.h
index b1891899515af939f9bac91e872a42700427f559..6a6fb101d607db002fd345ad956f3a7789021f86 100644
--- a/interfaces/innerkits/task_dispatcher/include/task/task_listener.h
+++ b/interfaces/innerkits/task_dispatcher/include/task/task_listener.h
@@ -15,8 +15,6 @@
 #ifndef OHOS_APP_DISPATCHER_TASK_TASK_LISTENER_H
 #define OHOS_APP_DISPATCHER_TASK_TASK_LISTENER_H
 
-#include "task_stage.h"
-
 namespace OHOS {
 namespace AppExecFwk {
 /**
diff --git a/interfaces/innerkits/task_dispatcher/include/threading/runnable.h b/interfaces/innerkits/task_dispatcher/include/threading/runnable.h
index af541d17cae10e168dc11811a41711a337397213..176af9bc1e695b3b666829ed7e9bd40891677a78 100644
--- a/interfaces/innerkits/task_dispatcher/include/threading/runnable.h
+++ b/interfaces/innerkits/task_dispatcher/include/threading/runnable.h
@@ -16,8 +16,6 @@
 #ifndef OHOS_APP_DISPATCHER_THREADING_RUNNABLE_H
 #define OHOS_APP_DISPATCHER_THREADING_RUNNABLE_H
 
-#include <functional>
-
 namespace OHOS {
 namespace AppExecFwk {
 using Runnable = std::function<void()>;
diff --git a/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h b/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h
index f1d685ed0f2680de2410170493ae8a1ccecfff79..8fe1be8b6470747dddac926ac11b9db1bf199292 100644
--- a/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h
+++ b/interfaces/innerkits/task_dispatcher/include/threading/thread_factory.h
@@ -16,10 +16,6 @@
 #ifndef OHOS_APP_DISPATCHER_THREADING_THREAD_FACTORY_H
 #define OHOS_APP_DISPATCHER_THREADING_THREAD_FACTORY_H
 
-#include "runnable.h"
-#include <thread>
-#include <memory>
-
 namespace OHOS {
 namespace AppExecFwk {
 class Thread {
diff --git a/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp b/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp
index a551df0e437bdff4a158d18f0d049b6a8296b461..e37e61e1a0a6dff9e6d1245d5eb81cbb40d4519b 100644
--- a/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp
+++ b/interfaces/innerkits/task_dispatcher/src/task/sync_task.cpp
@@ -58,6 +58,5 @@ void SyncTask::WaitTask()
 
     APP_LOGI("SyncTask::WaitTask end thread=%{public}zu", CalculateHashCode(threadId));
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/kits/appkit/native/app/include/app_loader.h b/kits/appkit/native/app/include/app_loader.h
index b38c156103007baf5d88dd9210057f2e5580984c..0ce175ecd7d40dd20738dbb30459407e6d930b1f 100644
--- a/kits/appkit/native/app/include/app_loader.h
+++ b/kits/appkit/native/app/include/app_loader.h
@@ -17,10 +17,7 @@
 #define FOUNDATION_APPEXECFWK_OHOS_APPLICATION_LOADER_H
 
 #include "ohos_application.h"
-
-#include <functional>
 #include <string>
-#include <unordered_map>
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/kits/appkit/test/Mock/include/mock_ability_mgr_service.h b/kits/appkit/test/Mock/include/mock_ability_mgr_service.h
index 0b239e2e7371b9a3a2cbcabd90e9f53f3180aa51..c2758930c152a79cf532367f058fc0d783d06e40 100644
--- a/kits/appkit/test/Mock/include/mock_ability_mgr_service.h
+++ b/kits/appkit/test/Mock/include/mock_ability_mgr_service.h
@@ -83,7 +83,6 @@ private:
     bool DumpStateCalled_ = false;
     Semaphore sem_;
 };
-
 }  // namespace AAFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_KITS_APPKIT_TEST_MOCK_ABILITY_MGR_SERVICE_H
\ No newline at end of file
diff --git a/services/appmgr/include/process_optimizer_uba.h b/services/appmgr/include/process_optimizer_uba.h
index 89c0440afd1ef1ec8e6eeaa633fa76c2e438cbca..5970c4f6aaf7e9e1205954b4106962b56d77daa6 100644
--- a/services/appmgr/include/process_optimizer_uba.h
+++ b/services/appmgr/include/process_optimizer_uba.h
@@ -17,11 +17,7 @@
 #define FOUNDATION_APPEXECFWK_SERVICES_APPMGR_INCLUDE_PROCESS_OPTIMIZER_UBA_H
 
 #include <chrono>
-#include <functional>
 #include <string>
-#include <vector>
-#include <variant>
-
 #include "process_optimizer.h"
 
 namespace OHOS {
diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp
index be3048ca3f803834bd4d13509d62ec221875929b..7f6b900c07fcc04c1643a319afdeb3365bcc2fe6 100644
--- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp
+++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp
@@ -1132,6 +1132,5 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess004, TestSize.Level1)
     EXPECT_EQ(record1, nullptr);
     APP_LOGI("AmsServiceLoadAbilityProcessTest StartProcess004 end");
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/services/bundlemgr/include/base_bundle_installer.h b/services/bundlemgr/include/base_bundle_installer.h
index 033dc7a5ee27d4f887a4783f95012b3da7f338ea..45a94aff31d009b483661cd33de0e8269f24949f 100644
--- a/services/bundlemgr/include/base_bundle_installer.h
+++ b/services/bundlemgr/include/base_bundle_installer.h
@@ -263,7 +263,6 @@ private:
 
     DISALLOW_COPY_AND_MOVE(BaseBundleInstaller);
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BASE_BUNDLE_INSTALLER_H
\ No newline at end of file
diff --git a/services/bundlemgr/include/bundle_data_mgr.h b/services/bundlemgr/include/bundle_data_mgr.h
index 4be16d6a2234fd7bbfe79c637979aa011d0859d8..29d92664d9dc4aa8f5bf722c99d439604760f2c4 100755
--- a/services/bundlemgr/include/bundle_data_mgr.h
+++ b/services/bundlemgr/include/bundle_data_mgr.h
@@ -587,7 +587,6 @@ private:
     // map<uid, callback>.
     std::map<int32_t, std::set<sptr<OnPermissionChangedCallback>>> permissionsCallbacks_;
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_DATA_MGR_H
diff --git a/services/bundlemgr/include/bundle_installer.h b/services/bundlemgr/include/bundle_installer.h
index 896ade5c74ff041082faa0a33b48a6b54a045a76..4e653ab05c5ab028b2e752d64a0fcbe69b9e3554 100644
--- a/services/bundlemgr/include/bundle_installer.h
+++ b/services/bundlemgr/include/bundle_installer.h
@@ -83,7 +83,6 @@ private:
     const sptr<IStatusReceiver> statusReceiver_;
     DISALLOW_COPY_AND_MOVE(BundleInstaller);
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_INSTALLER_H
\ No newline at end of file
diff --git a/services/bundlemgr/include/bundle_mgr_host_impl.h b/services/bundlemgr/include/bundle_mgr_host_impl.h
index d6ec4e92bd5f206586f707e2005406023e6c4b97..ef3c0ca29b58e73ff0af54b18031df0feb3a6ee3 100644
--- a/services/bundlemgr/include/bundle_mgr_host_impl.h
+++ b/services/bundlemgr/include/bundle_mgr_host_impl.h
@@ -22,7 +22,6 @@
 
 namespace OHOS {
 namespace AppExecFwk {
-
 class BundleMgrHostImpl : public BundleMgrHost {
 public:
     /**
@@ -448,7 +447,6 @@ private:
     const std::shared_ptr<BundleCloneMgr> GetCloneMgrFromService();
     const std::shared_ptr<BundleDataMgr> GetDataMgrFromService();
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_MGR_HOST_IMPL_H
diff --git a/services/bundlemgr/include/bundle_mgr_service.h b/services/bundlemgr/include/bundle_mgr_service.h
index 7969f3cd89cdb26cb001fbcef3a5863df6bcb6ed..39645e25287e1e9e845a4281ffd1708604c969fd 100644
--- a/services/bundlemgr/include/bundle_mgr_service.h
+++ b/services/bundlemgr/include/bundle_mgr_service.h
@@ -49,14 +49,15 @@ public:
      * @return Returns true if the bundle manager service is ready; returns false otherwise.
      */
     bool IsServiceReady() const;
+    /**
+     * @brief Get a shared pointer to the BundleCloneMgr object.
+     * @return Returns the pointer of BundleCloneMgr object.
+     */
+    const std::shared_ptr<BundleCloneMgr> GetCloneMgr() const;
     /**
      * @brief Get a shared pointer to the BundleDataMgr object.
      * @return Returns the pointer of BundleDataMgr object.
      */
-    const std::shared_ptr<BundleCloneMgr> GetCloneMgr() const;
-
-
-
     const std::shared_ptr<BundleDataMgr> GetDataMgr() const;
     /**
      * @brief Get a IBundleInstaller object for IPC
@@ -90,7 +91,6 @@ private:
 
     DISALLOW_COPY_AND_MOVE(BundleMgrService);
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  // FOUNDATION_APPEXECFWK_SERVICES_BUNDLEMGR_INCLUDE_BUNDLE_MGR_SERVICE_H
diff --git a/services/bundlemgr/include/inner_bundle_info.h b/services/bundlemgr/include/inner_bundle_info.h
index a320c6709cef9222ed283c8f6935ceb894163d13..afdcfdff9c6190746b2a90e8f8b5c62f4c09b196 100644
--- a/services/bundlemgr/include/inner_bundle_info.h
+++ b/services/bundlemgr/include/inner_bundle_info.h
@@ -1105,7 +1105,6 @@ public:
      */
     void GetCommonEvents(const std::string &eventKey, std::vector<CommonEventInfo> &commonEvents) const;
 
-
     std::optional<InnerModuleInfo> GetInnerModuleInfoByModuleName(const std::string &moduleName) const;
 
     void GetModuleNames(std::vector<std::string> &moduleNames) const;
diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp
index 5dc838278511160d2f33ee07c4e2543677877cc6..4172814fa829545ed9979aeb6bf1da28b9bf6606 100755
--- a/services/bundlemgr/src/base_bundle_installer.cpp
+++ b/services/bundlemgr/src/base_bundle_installer.cpp
@@ -39,7 +39,6 @@
 namespace OHOS {
 namespace AppExecFwk {
 namespace {
-
 bool UninstallApplicationProcesses(const std::string &bundleName, const int uid)
 {
     APP_LOGI("uninstall kill running processes, app name is %{public}s", bundleName.c_str());
@@ -55,7 +54,6 @@ bool UninstallApplicationProcesses(const std::string &bundleName, const int uid)
     }
     return true;
 }
-
 }  // namespace
 
 BaseBundleInstaller::BaseBundleInstaller()
@@ -683,6 +681,5 @@ bool BaseBundleInstaller::UpdateBundlePaths(InnerBundleInfo &info, const std::st
     info.SetAppCacheDir(baseDataPath + Constants::PATH_SEPARATOR + Constants::CACHE_DIR);
     return true;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/services/bundlemgr/src/base_extractor.cpp b/services/bundlemgr/src/base_extractor.cpp
index 0303824fd1fe672685dcc485c7729ff14145d015..84c5d1644df5cfd8b116acf89702659fb44ac2ae 100644
--- a/services/bundlemgr/src/base_extractor.cpp
+++ b/services/bundlemgr/src/base_extractor.cpp
@@ -14,10 +14,6 @@
  */
 
 #include "base_extractor.h"
-
-#include <fstream>
-#include <dirent.h>
-
 #include "string_ex.h"
 #include "app_log_wrapper.h"
 #include "bundle_constants.h"
diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp
index b35744156952e22765958eecd4b8340ac0034056..c7761bfdd1e09c9f31da09ebe92ce9a917a66fd8 100755
--- a/services/bundlemgr/src/bundle_data_mgr.cpp
+++ b/services/bundlemgr/src/bundle_data_mgr.cpp
@@ -33,7 +33,6 @@
 
 namespace OHOS {
 namespace AppExecFwk {
-
 BundleDataMgr::BundleDataMgr()
 {
     InitStateTransferMap();
@@ -1993,6 +1992,5 @@ bool BundleDataMgr::GetClonedBundleName(const std::string &bundleName, std::stri
     return false;
     APP_LOGI("GetCloneBundleName finish");
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/services/bundlemgr/src/bundle_data_storage.cpp b/services/bundlemgr/src/bundle_data_storage.cpp
index 56cc84bcc006837e1e3dd3011c7c3937b1534aa1..12752da63538203c50f64201f8487da4ba4dbdee 100644
--- a/services/bundlemgr/src/bundle_data_storage.cpp
+++ b/services/bundlemgr/src/bundle_data_storage.cpp
@@ -14,10 +14,6 @@
  */
 
 #include "bundle_data_storage.h"
-
-#include <fstream>
-#include <iomanip>
-
 #include "string_ex.h"
 #include "app_log_wrapper.h"
 #include "bundle_constants.h"
diff --git a/services/bundlemgr/src/bundle_data_storage_database.cpp b/services/bundlemgr/src/bundle_data_storage_database.cpp
index 176abafc2321da321c403ece63a916109c49cdfa..b740a3cd56bf7d76d614a66e860a72849d53c4d6 100644
--- a/services/bundlemgr/src/bundle_data_storage_database.cpp
+++ b/services/bundlemgr/src/bundle_data_storage_database.cpp
@@ -292,6 +292,5 @@ bool BundleDataStorageDatabase::ResetKvStore()
     APP_LOGW("failed");
     return false;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/services/bundlemgr/src/bundle_mgr_host_impl.cpp b/services/bundlemgr/src/bundle_mgr_host_impl.cpp
index 98955c46e241e39300e3c4462b739ef0c1b446e4..3929026c61deff9c53975970b90ecc57047c002d 100755
--- a/services/bundlemgr/src/bundle_mgr_host_impl.cpp
+++ b/services/bundlemgr/src/bundle_mgr_host_impl.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "bundle_mgr_host_impl.h"
-
-#include <future>
-
 #include "json_serializer.h"
 #include "app_log_wrapper.h"
 #include "bundle_mgr_service.h"
@@ -28,7 +25,6 @@
 
 namespace OHOS {
 namespace AppExecFwk {
-
 bool BundleMgrHostImpl::GetApplicationInfo(
     const std::string &appName, const ApplicationFlag flag, const int userId, ApplicationInfo &appInfo)
 {
@@ -719,6 +715,5 @@ const std::shared_ptr<BundleDataMgr> BundleMgrHostImpl::GetDataMgrFromService()
 {
     return DelayedSingleton<BundleMgrService>::GetInstance()->GetDataMgr();
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/services/bundlemgr/src/bundle_mgr_service.cpp b/services/bundlemgr/src/bundle_mgr_service.cpp
index 3222f5a32a44d3078a46bdb25a9931475a662bae..6a6d47b4c7a4dd8ba7fa31a2ba36768726612291 100644
--- a/services/bundlemgr/src/bundle_mgr_service.cpp
+++ b/services/bundlemgr/src/bundle_mgr_service.cpp
@@ -195,6 +195,5 @@ void BundleMgrService::SelfClean()
         }
     }
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp
index 9255e2459eb4a9f2c59fc3f18a77588db0ec00de..17ce40196dcabae21f35a089d683308ff95adfd3 100755
--- a/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp
+++ b/services/bundlemgr/src/bundle_mgr_service_event_handler.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "bundle_mgr_service_event_handler.h"
-
-#include <future>
-
 #include "app_log_wrapper.h"
 #include "bundle_mgr_service.h"
 #include "bundle_scanner.h"
diff --git a/services/bundlemgr/src/bundle_parser.cpp b/services/bundlemgr/src/bundle_parser.cpp
index 52353bec6f413bf8e49411c1db6a20ef1b2b2169..01fa9637d8696eeef12c7aa83b462e2deaaeb236 100644
--- a/services/bundlemgr/src/bundle_parser.cpp
+++ b/services/bundlemgr/src/bundle_parser.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "bundle_parser.h"
-
-#include <sstream>
-
 #include "app_log_wrapper.h"
 #include "bundle_constants.h"
 #include "bundle_extractor.h"
diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp
index f29e758be883ff21ebc55729f749588e216a5460..7d44df56a8ae2ec7369b2643679714f55ed37de8 100644
--- a/services/bundlemgr/src/bundle_profile.cpp
+++ b/services/bundlemgr/src/bundle_profile.cpp
@@ -14,10 +14,6 @@
  */
 
 #include "bundle_profile.h"
-
-#include <sstream>
-#include <fstream>
-
 #include "permission/permission_kit.h"
 #include "app_log_wrapper.h"
 #include "bundle_constants.h"
@@ -2168,7 +2164,6 @@ bool TransformToInfo(ProfileReader::ConfigJson &configJson, InnerBundleInfo &inn
     innerBundleInfo.InsertInnerModuleInfo(configJson.module.package, innerModuleInfo);
     return true;
 }
-
 }  // namespace
 
 ErrCode BundleProfile::TransformTo(const std::ostringstream &source, InnerBundleInfo &innerBundleInfo) const
@@ -2193,6 +2188,5 @@ ErrCode BundleProfile::TransformTo(const std::ostringstream &source, InnerBundle
     }
     return ERR_OK;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/services/bundlemgr/src/bundle_scanner.cpp b/services/bundlemgr/src/bundle_scanner.cpp
index f160bf4e726c624d50444824952ecad1da7b4fbe..41e8b71463a03da262c37a4045f1c6d832c8b52a 100755
--- a/services/bundlemgr/src/bundle_scanner.cpp
+++ b/services/bundlemgr/src/bundle_scanner.cpp
@@ -14,11 +14,6 @@
  */
 
 #include "bundle_scanner.h"
-
-#include <cstddef>
-#include <string>
-#include <dirent.h>
-
 #include "datetime_ex.h"
 #include "string_ex.h"
 #include "app_log_wrapper.h"
diff --git a/services/bundlemgr/src/inner_bundle_info.cpp b/services/bundlemgr/src/inner_bundle_info.cpp
index e9e1cf71a7cdef2cdb6e2846d3b5872d24141380..3f25695ed8e5041093270f1c8752bcda37b32275 100644
--- a/services/bundlemgr/src/inner_bundle_info.cpp
+++ b/services/bundlemgr/src/inner_bundle_info.cpp
@@ -61,7 +61,6 @@ const std::string MODULE_SHORTCUT = "shortcutInfos";
 const std::string MODULE_COMMON_EVENT = "commonEvents";
 const std::string MODULE_MAIN_ABILITY = "mainAbility";
 const std::string NEW_BUNDLE_NAME = "newBundleName";
-
 }  // namespace
 
 InnerBundleInfo::InnerBundleInfo()
@@ -1149,6 +1148,5 @@ void InnerBundleInfo::GetModuleNames(std::vector<std::string> &moduleNames) cons
         moduleNames.emplace_back(innerModuleInfo.second.moduleName);
     }
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
\ No newline at end of file
diff --git a/services/bundlemgr/src/installd/installd_host_impl.cpp b/services/bundlemgr/src/installd/installd_host_impl.cpp
index bb3cb325ab166a50bb67115a9f3f3cf668587d68..f928e76a79d81fa3bb3d0ccc2139990753fe307b 100644
--- a/services/bundlemgr/src/installd/installd_host_impl.cpp
+++ b/services/bundlemgr/src/installd/installd_host_impl.cpp
@@ -14,16 +14,6 @@
  */
 
 #include "installd/installd_host_impl.h"
-
-#include <memory>
-#include <cstdio>
-#include <fstream>
-#include <map>
-#include <sstream>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #include "directory_ex.h"
 #include "bundle_constants.h"
 #include "app_log_wrapper.h"
diff --git a/services/bundlemgr/src/module_usage_data_storage.cpp b/services/bundlemgr/src/module_usage_data_storage.cpp
index 1a0e63a0ffe83b85f39740dae4ee151279dd12b3..e160458c9925122f52d1160ad8600bb97ba2229f 100644
--- a/services/bundlemgr/src/module_usage_data_storage.cpp
+++ b/services/bundlemgr/src/module_usage_data_storage.cpp
@@ -372,6 +372,5 @@ bool ModuleUsageRecordStorage::ResetKvStore()
     APP_LOGW("usage reset failed");
     return false;
 }
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
diff --git a/services/bundlemgr/test/mock/src/system_ability_helper.cpp b/services/bundlemgr/test/mock/src/system_ability_helper.cpp
index 87df614aeaf2c37c07da4c365e8898b49962beea..b8b455f5016a4603b54ca02ca6e654930640cea3 100644
--- a/services/bundlemgr/test/mock/src/system_ability_helper.cpp
+++ b/services/bundlemgr/test/mock/src/system_ability_helper.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "system_ability_helper.h"
-
-#include <map>
-
 #include "system_ability_definition.h"
 #include "app_log_wrapper.h"
 #include "mock_ability_mgr_host.h"
diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
index 3557e746a851000eb2a31bfceeb4e04ca9fa22f2..4ab02d7e74bbd598d1834ba1fe165c2a5c172bda 100755
--- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
+++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp
@@ -38,7 +38,6 @@ using namespace OHOS::AppExecFwk;
 using OHOS::AAFwk::Want;
 
 namespace {
-
 const std::string BUNDLE_NAME_TEST = "com.example.bundlekit.test";
 const std::string MODULE_NAME_TEST = "com.example.bundlekit.test.entry";
 const std::string ABILITY_NAME_TEST1 = ".Reading1";
@@ -146,7 +145,6 @@ const std::string COMMON_EVENT_EVENT = "usual.event.PACKAGE_ADDED";
 const std::string COMMON_EVENT_EVENT_ERROR_KEY = "usual.event.PACKAGE_ADDED_D";
 const std::string COMMON_EVENT_EVENT_NOT_EXISTS_KEY = "usual.event.PACKAGE_REMOVED";
 const int FORMINFO_DESCRIPTIONID = 123;
-
 }  // namespace
 
 class BmsBundleKitServiceTest : public testing::Test {
@@ -865,7 +863,6 @@ void BmsBundleKitServiceTest::CheckShortcutInfoTest(std::vector<ShortcutInfo> &s
 void BmsBundleKitServiceTest::CheckCommonEventInfoTest(std::vector<CommonEventInfo> &commonEventInfos) const
 {
     for (const auto &commonEventInfo : commonEventInfos) {
-
         EXPECT_EQ(commonEventInfo.name, COMMON_EVENT_NAME);
         EXPECT_EQ(commonEventInfo.bundleName, BUNDLE_NAME_TEST);
         EXPECT_EQ(commonEventInfo.uid, TEST_UID);
diff --git a/services/formmgr/include/form_item_info.h b/services/formmgr/include/form_item_info.h
index 3106ed83c82e0e4c08ceac03e5cf6540028e7615..c33df4e3545dfa1e9aced58f0f7695273d4199be 100644
--- a/services/formmgr/include/form_item_info.h
+++ b/services/formmgr/include/form_item_info.h
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
-#include <unordered_map>
 #include "form_record.h"
 
 namespace OHOS {
diff --git a/services/formmgr/include/form_refresh_limiter.h b/services/formmgr/include/form_refresh_limiter.h
index e4202b169b051c383359af0964c782455da5d094..1a947bfb08905768bd8a58bb118329a7578a2ea1 100644
--- a/services/formmgr/include/form_refresh_limiter.h
+++ b/services/formmgr/include/form_refresh_limiter.h
@@ -16,11 +16,6 @@
 #ifndef FOUNDATION_APPEXECFWK_SERVICES_FORMMGR_INCLUDE_FORM_TIMER_REFRESH_LIMITER_H
 #define FOUNDATION_APPEXECFWK_SERVICES_FORMMGR_INCLUDE_FORM_TIMER_REFRESH_LIMITER_H
 
-#include <map>
-#include <mutex>
-#include <vector>
-#include "form_timer.h"
-
 namespace OHOS {
 namespace AppExecFwk {
 /**
diff --git a/services/test/mock/src/system_ability_helper.cpp b/services/test/mock/src/system_ability_helper.cpp
index 00c4654a81a2c3a334dd9151caf45f6fcd10d841..431568e321eb7d680648c49ab880d7490d625e3d 100644
--- a/services/test/mock/src/system_ability_helper.cpp
+++ b/services/test/mock/src/system_ability_helper.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "system_ability_helper.h"
-
-#include <map>
-
 #include "system_ability_definition.h"
 #include "app_log_wrapper.h"
 #include "mock_ability_mgr_host.h"
diff --git a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp
index 46b9091edea2a020ac145ed2694f898a3abf3006..846325edf53774c9c6f07c686e63fa40af7f5a86 100755
--- a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp
+++ b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp
@@ -1011,7 +1011,6 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_013, TestSize.Level3)
  */
 HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_014, TestSize.Level1)
 {
-
     pid_t pid = 1000;
     sptr<IRemoteObject> token = GetAbilityToken();
     auto abilityInfo = GetAbilityInfo("0", "MainAbility", "p1", "com.ohos.test.special");
diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..2ec484b7efb8d2473c128ae2b801e9db688f631b 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..cbc97a19a56284c124fb3059de1074015a04c44a 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..2ec484b7efb8d2473c128ae2b801e9db688f631b 100755
--- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
index d259b18fe1ca036207c9028ecc8eebcd35b986b7..08b07980f43e38bd37d52f5ad537e8fa2fddf2c5 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp
@@ -13,12 +13,6 @@
  * limitations under the License.
  */
 #include "ams_st_data_ability_data_a.h"
-
-#include <condition_variable>
-#include <fstream>
-#include <mutex>
-#include <stdio.h>
-
 #include "app_log_wrapper.h"
 #include "data_ability_helper.h"
 #include "file_ex.h"
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp
index 901cc5f8f035446330d4156e1ff066e94dafb21b..691c21330435f1df03fd739d81b8b38e751382dd 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "kit_test_ability_manager_second.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "app_log_wrapper.h"
 
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h
index 1bc3c529ed1d2eec1a368058024516d4802b4e4b..87192013740548d04d6a0a505fb5c13417678698 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h
@@ -189,7 +189,6 @@ private:
     std::unordered_map<std::string, std::function<void(int, int, int)>> mapTestFunc_;
     KitTestAbilityManager *kitTestAbility_;
 };
-
 }  // namespace AppExecFwk
 }  // namespace OHOS
 #endif  //_KIT_TEST_ABILITY_MANAGER_H_
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp
index 50307f3f9e9cd53f7373ac16e4d8cd30d9a07384..5e9868e1cf1424b6596c923414a39a898dee17b8 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "kit_test_ability_manager.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "app_log_wrapper.h"
 
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp
index 1f7fa556737647aecddbe3a8190286ad772fbb23..c49f54a87f488874afbc1f99b441f104dd96cb34 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <sstream>
-#include <regex>
-#include <numeric>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp
index 844f12ec941cbef0c02630eb53adf904c3a4b5e0..6e83693678b9f6c0c492e45e63adb7266dbeabe1 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/kit_test_ability_manager.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "kit_test_ability_manager.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "app_log_wrapper.h"
 
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp
index 1f7fa556737647aecddbe3a8190286ad772fbb23..d9920480c6a588d3882b686563fb71ac15558175 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/test_utils.cpp
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <sstream>
-#include <regex>
-#include <numeric>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp
index f3cf209df3b594d28a21c6b2d06e7bfb3a632462..2c92735eed622f0aa834ab3a3313a22a034d8dc6 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/third_ability.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "third_ability.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "app_log_wrapper.h"
 #include "test_utils.h"
 
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..cbc97a19a56284c124fb3059de1074015a04c44a 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestA/src/test_utils.cpp
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..cbc97a19a56284c124fb3059de1074015a04c44a 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestB/src/test_utils.cpp
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp
index c6a74ab78d2ebe0a92e07d36ba8639bb0f2288da..e7bafde26dec8e0b25dcb081535e3244ced97c1d 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestPageA/src/test_utils.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp
index c6a74ab78d2ebe0a92e07d36ba8639bb0f2288da..9a826fea3071f7f0f1ab15041e9bfb582f5e6876 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestService/src/test_utils.cpp
@@ -14,11 +14,9 @@
  */
 
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..2ec484b7efb8d2473c128ae2b801e9db688f631b 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTest/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..cbc97a19a56284c124fb3059de1074015a04c44a 100644
--- a/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/amsMissionStackTestSubsidiary/src/test_utils.cpp
@@ -13,12 +13,9 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
+
 namespace OHOS {
 namespace AppExecFwk {
 using namespace OHOS::EventFwk;
diff --git a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp
index 7b565fcd78fa2005b1600f94bda7519089720dd2..e321399dbea7c12c4289a99a82b6e8bdba628f18 100755
--- a/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/fwkAbilityState/src/test_utils.cpp
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 #include "test_utils.h"
diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp
index 8ce8b83fe29fff7f7a1e7a40181e72f37bbb4ac5..288498eec2da95d13168bb385833e5777a6c06f5 100644
--- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/main_ability.cpp
@@ -16,12 +16,6 @@
 #include "main_ability.h"
 #include "app_log_wrapper.h"
 #include "test_utils.h"
-#include <algorithm>
-#include <condition_variable>
-#include <chrono>
-#include <functional>
-#include <regex>
-#include <string>
 
 namespace OHOS {
 namespace AppExecFwk {
diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..2ec484b7efb8d2473c128ae2b801e9db688f631b 100644
--- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestA/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp
index 3e75bdf815379f71af430ad9d5c979da62400675..2ec484b7efb8d2473c128ae2b801e9db688f631b 100644
--- a/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp
+++ b/test/resource/amssystemtestability/abilitySrc/taskDispatcherTestB/src/test_utils.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 #include "test_utils.h"
-#include <iostream>
-#include <numeric>
-#include <sstream>
-#include <regex>
 #include "common_event_data.h"
 #include "common_event_manager.h"
 namespace OHOS {
diff --git a/test/resource/amssystemtestability/abilitySrc/tools/include/event.h b/test/resource/amssystemtestability/abilitySrc/tools/include/event.h
index 4e659a7bd700b404d249954636828c6c3b3100d5..b06cbef790bb9eedd4f209f0a2245c17a68311ce 100644
--- a/test/resource/amssystemtestability/abilitySrc/tools/include/event.h
+++ b/test/resource/amssystemtestability/abilitySrc/tools/include/event.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 #pragma once
-#include <string>
-#include <vector>
-#include <condition_variable>
 
 namespace STtools {
 class Event {
diff --git a/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h b/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h
index f7a8f367f01b3302b96144dfc2050e7bc2b07c21..c124b7187f11721e570b0f65698ff1e7ccded662 100644
--- a/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h
+++ b/test/resource/amssystemtestability/abilitySrc/tools/include/stoperator.h
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 #pragma once
-#include <string>
-#include <memory>
-#include <vector>
 
 namespace STtools {
 using std::string;
diff --git a/test/systemtest/common/ams/tool/include/module_test_dump_util.h b/test/systemtest/common/ams/tool/include/module_test_dump_util.h
index 8fb77bf90bc4fb2a3af191479a154f80731d4ddf..a72800febbda6841c1db4c3be943f538efb04d42 100644
--- a/test/systemtest/common/ams/tool/include/module_test_dump_util.h
+++ b/test/systemtest/common/ams/tool/include/module_test_dump_util.h
@@ -16,11 +16,8 @@
 #ifndef OHOS_MODULE_TEST_DUMP_UTIL_H
 #define OHOS_MODULE_TEST_DUMP_UTIL_H
 
-#include <mutex>
 #include <vector>
 #include <string>
-#include <regex>
-#include <unordered_map>
 #include <algorithm>
 #include <iterator>
 
diff --git a/test/systemtest/common/ams/tool/include/stoperator.h b/test/systemtest/common/ams/tool/include/stoperator.h
index 3cf9b14874c7d78fea0a1b95fcaf6b1c4cdd6ef5..d32968ec864e69997f91553d0539bf7ea6e94996 100644
--- a/test/systemtest/common/ams/tool/include/stoperator.h
+++ b/test/systemtest/common/ams/tool/include/stoperator.h
@@ -17,8 +17,6 @@
 
 #include <cstring>
 #include <string>
-#include <memory>
-#include <vector>
 
 namespace OHOS {
 namespace STtools {