diff --git a/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h b/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h index c81be8b6de17558dab780e35fb4decc9df5ecd2e..796758a5331c1227ceef3871fc4be998d79b9ef5 100644 --- a/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h +++ b/frameworks/core/frame_aware_collector/include/frame_msg_mgr.h @@ -16,11 +16,10 @@ #ifndef FRAME_MSG_MGR_H #define FRAME_MSG_MGR_H -#include #include - -#include "rme_log_domain.h" #include "frame_info_const.h" +#include "single_instance.h" +#include "frame_scene_sched.h" #include "rme_scene_sched.h" namespace OHOS { diff --git a/frameworks/core/frame_aware_collector/include/frame_window_mgr.h b/frameworks/core/frame_aware_collector/include/frame_window_mgr.h index 56860fc7c8212a0c6e38f92f3f78242a0405ef8d..02f0728b8efd686a73686d60c4cad469af2c60c5 100644 --- a/frameworks/core/frame_aware_collector/include/frame_window_mgr.h +++ b/frameworks/core/frame_aware_collector/include/frame_window_mgr.h @@ -16,9 +16,7 @@ #ifndef FRAME_WINDOW_MGR_H #define FRAME_WINDOW_MGR_H -#include #include "single_instance.h" -#include "rme_log_domain.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_collector/include/rme_core_sched.h b/frameworks/core/frame_aware_collector/include/rme_core_sched.h index f8e52c1f03e467599eb014bcbd402578fc118111..3eb356346c316b0dfb763d5d15ebfadfd04c6698 100644 --- a/frameworks/core/frame_aware_collector/include/rme_core_sched.h +++ b/frameworks/core/frame_aware_collector/include/rme_core_sched.h @@ -16,10 +16,6 @@ #ifndef RME_CORE_SCHED_H #define RME_CORE_SCHED_H -#include -#include "rme_log_domain.h" -#include "rme_scoped_trace.h" - namespace OHOS { namespace RME { class RmeCoreSched { diff --git a/frameworks/core/frame_aware_collector/include/rme_scene_sched.h b/frameworks/core/frame_aware_collector/include/rme_scene_sched.h index 72012ba2094e3189daf17436280885287ad94105..6b5486a87aad45edece048877be9c6e1798ade34 100644 --- a/frameworks/core/frame_aware_collector/include/rme_scene_sched.h +++ b/frameworks/core/frame_aware_collector/include/rme_scene_sched.h @@ -16,11 +16,8 @@ #ifndef RME_SCENE_SCHED_H #define RME_SCENE_SCHED_H -#include "frame_scene_sched.h" -#include "frame_window_mgr.h" #include "rme_core_sched.h" - -#include +#include "frame_scene_sched.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp index 36bcc2cca0b1dafcafaea5eb39f6b9e99c5e8610..c8d816df96103588b68006754a02afce1b2c19bd 100644 --- a/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp +++ b/frameworks/core/frame_aware_collector/src/frame_msg_mgr.cpp @@ -14,6 +14,10 @@ */ #include "frame_msg_mgr.h" +#include +#include +#include +#include "rme_log_domain.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp index 5505f0a5590accb024aebc1b3658bb52396e2f17..06e5abffb4db4f5474e11f07852bdee0897c7210 100644 --- a/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp +++ b/frameworks/core/frame_aware_collector/src/frame_window_mgr.cpp @@ -14,6 +14,9 @@ */ #include "frame_window_mgr.h" +#include +#include +#include "rme_log_domain.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp index a1d7af10fcb2a49c21d90ac22560adaaae813fd3..8257dc4ee046c511c2bfc53b2d5a486f3050c598 100644 --- a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp @@ -14,7 +14,12 @@ */ #include "rme_core_sched.h" +#include +#include +#include #include "rtg_interface.h" +#include "rme_log_domain.h" +#include "rme_scoped_trace.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp index 6473a64c2ce88950164364945ba1dedf73b2c42d..8f6da7a1dabfa9fb345e0a87bb7f95cc9f0b7d5d 100644 --- a/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_scene_sched.cpp @@ -14,6 +14,8 @@ */ #include "rme_scene_sched.h" +#include "frame_window_mgr.h" +#include "rme_scoped_trace.h" namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_policy/include/app_info.h b/frameworks/core/frame_aware_policy/include/app_info.h index ea5b6209869c6bb0f141b33c229040543f392d5e..ba2d5d8c721fd9781aaa0a3d61ee09b00b798108 100644 --- a/frameworks/core/frame_aware_policy/include/app_info.h +++ b/frameworks/core/frame_aware_policy/include/app_info.h @@ -17,6 +17,7 @@ #define APP_INFO_H #include +#include namespace OHOS { namespace RME { diff --git a/frameworks/core/frame_aware_policy/include/intellisense_server.h b/frameworks/core/frame_aware_policy/include/intellisense_server.h index 37b1403075bded0ccaae014baecd48264826c950..f4cccf61171296a15e802935e9836060d0b8b211 100644 --- a/frameworks/core/frame_aware_policy/include/intellisense_server.h +++ b/frameworks/core/frame_aware_policy/include/intellisense_server.h @@ -21,12 +21,10 @@ #include #include #include -#include -#include - +#include +#include #include "rme_constants.h" #include "single_instance.h" -#include "event_handler.h" #include "app_info.h" namespace OHOS { diff --git a/frameworks/core/frame_aware_policy/include/para_config.h b/frameworks/core/frame_aware_policy/include/para_config.h index a3f8472f350866c07af7c13dc35e22aa4593d611..5fa0f6c1b5f320a832c5f6023a7137b4d6aa319f 100644 --- a/frameworks/core/frame_aware_policy/include/para_config.h +++ b/frameworks/core/frame_aware_policy/include/para_config.h @@ -20,9 +20,7 @@ #include #include #include - #include - #include "third_party/libxml2/include/libxml/parser.h" #include "third_party/libxml2/include/libxml/tree.h" #include "third_party/libxml2/include/libxml/xpath.h" diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp index 23b329da491c5ae38f8480bb1e4e888ac9e933ae..616d906d3c10a44c5dec61dd629c010835a4b4ef 100644 --- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp +++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp @@ -14,9 +14,12 @@ */ #include "intellisense_server.h" - -#include - +#include +#include +#include +#include +#include +#include #include "para_config.h" #include "rtg_interface.h" #include "rme_log_domain.h" diff --git a/interfaces/innerkits/frameintf/frame_ui_intf.cpp b/interfaces/innerkits/frameintf/frame_ui_intf.cpp index 6e8f6388686de5f731560a30565a9a936ed480e9..89b6e21c69cbaf2ed58c65afb1521f2c005c306d 100644 --- a/interfaces/innerkits/frameintf/frame_ui_intf.cpp +++ b/interfaces/innerkits/frameintf/frame_ui_intf.cpp @@ -18,6 +18,7 @@ #include "frame_info_const.h" #include "rme_constants.h" #include "frame_msg_mgr.h" +#include "rme_log_domain.h" namespace OHOS { namespace RME { diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp index bbe88bdc288608763a1cabcf35711f3f30e35d2b..21e0a1aff18410f2a6f97b0f5a519a4a5e498639 100644 --- a/interfaces/innerkits/frameintf/rtg_interface.cpp +++ b/interfaces/innerkits/frameintf/rtg_interface.cpp @@ -18,13 +18,11 @@ #include #include #include -#include #include -#include #include -#include -#include - +#include +#include +#include "bits/ioctl.h" #include "rme_log_domain.h" namespace OHOS {