diff --git a/common/include/dscreen_hisysevent.h b/common/include/dscreen_hisysevent.h index b16b102ae54ce566872692b672f0a4f7a3155610..b403a37eac68a293ad16c1c6db62ecf64696dfc2 100644 --- a/common/include/dscreen_hisysevent.h +++ b/common/include/dscreen_hisysevent.h @@ -18,8 +18,6 @@ #include -#include "hisysevent.h" - namespace OHOS { namespace DistributedHardware { const std::string DSCREEN_INIT_FAIL = "DSCREEN_INIT_FAIL"; diff --git a/common/include/dscreen_util.h b/common/include/dscreen_util.h index aea24399c639e55bb85431c9c9f837ed4c448758..5b642c9c835878e5ce5c42ffdcdceca46e610ff7 100644 --- a/common/include/dscreen_util.h +++ b/common/include/dscreen_util.h @@ -16,6 +16,7 @@ #ifndef OHOS_DSCREEN_UTIL_H #define OHOS_DSCREEN_UTIL_H +#include #include namespace OHOS { diff --git a/common/src/dscreen_hisysevent.cpp b/common/src/dscreen_hisysevent.cpp index 102ab480f8e39ae794d0324babf0aef55c153b62..aafa6827e935eb68b0bc08ab4c3865f3346871eb 100644 --- a/common/src/dscreen_hisysevent.cpp +++ b/common/src/dscreen_hisysevent.cpp @@ -12,9 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include "dscreen_hisysevent.h" -#include +#include "hisysevent.h" #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/common/src/dscreen_sa_process_state.cpp b/common/src/dscreen_sa_process_state.cpp index ae8f53eebee9f083cbe6449f864c2c7922db0dfa..8f052d23d4c7fc0687d2c80153a64f8549d9b936 100644 --- a/common/src/dscreen_sa_process_state.cpp +++ b/common/src/dscreen_sa_process_state.cpp @@ -15,6 +15,8 @@ #include "dscreen_sa_process_state.h" +#include +#include #include #include "dscreen_constants.h" diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index bd380199566bc6e72188846676db07f042dae873..21703d556244bcac55f3d8ab03e4c6c0d05316f8 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -15,10 +15,11 @@ #include "dscreen_util.h" +#include +#include #include #include #include -#include #include #include "softbus_bus_center.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h b/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h index 92496721342a9ba0315006790021ca19840dad93..c3dddfd31e717dc58be18c795dc3cf28c232b31f 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/callback/dscreen_sink_load_callback.h @@ -16,8 +16,13 @@ #ifndef OHOS_DSCREEN_SINK_LOAD_CALLBACK_H #define OHOS_DSCREEN_SINK_LOAD_CALLBACK_H +#include +#include + +#include "refbase.h" #include "system_ability_load_callback_stub.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSinkLoadCallback : public SystemAbilityLoadCallbackStub { diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h index 400e510621dd5fe8743d4f66c26fb4a4a7de84c5..ad55d8f8f7c1c9b545e34d20879e89272eb0a88e 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_handler.h @@ -17,9 +17,12 @@ #define OHOS_DSCREEN_SINK_HANDLER_H #include +#include #include #include "idistributed_hardware_sink.h" +#include "iremote_object.h" +#include "refbase.h" #include "single_instance.h" #include "idscreen_sink.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h index ca69db104f5401a98b17343bafc3fdd5dde5206e..34e9d14b7cdd8912eb282f636246919900a25d02 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/dscreen_sink_proxy.h @@ -16,11 +16,15 @@ #ifndef OHOS_DSCREEN_SINK_PROXY_H #define OHOS_DSCREEN_SINK_PROXY_H +#include + #include "iremote_broker.h" #include "iremote_proxy.h" +#include "refbase.h" #include "idscreen_sink.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSinkProxy : public IRemoteProxy { diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp index caec8439cc4bf42b15c8da1428ac867f980e3242..bb6b0aa0f421362debb137436d3fa6bc1830d18e 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp @@ -12,9 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "dscreen_sink_load_callback.h" -#include +#include "dscreen_sink_load_callback.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" @@ -22,6 +21,7 @@ #include "dscreen_log.h" #include "dscreen_sink_handler.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { DScreenSinkLoadCallback::DScreenSinkLoadCallback( diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index c6bc4f3b062c9db0162f770eefaf92b1a950880c..33884aac85cdae75df5804b6bf202d0dce925635 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -15,8 +15,15 @@ #include "dscreen_sink_handler.h" +#include +#include + +#include "errors.h" +#include "hitrace_meter.h" +#include "iremote_broker.h" #include "if_system_ability_manager.h" #include "iservice_registry.h" +#include "isystem_ability_load_callback.h" #include "dscreen_constants.h" #include "dscreen_errcode.h" diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp index a6d1e999f2994237f36913bcb3ad2f603f7d659b..b2e30981597d22e2371653c1aae9d68c1f85cf89 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp @@ -15,7 +15,9 @@ #include "dscreen_sink_proxy.h" -#include "parcel.h" +#include "iremote_object.h" +#include "message_option.h" +#include "message_parcel.h" #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h index 3eb89ddadf28ff3d24c1a77ce1a75658a1cf1d7c..f7bc172d2992f4affb0ca8a45bb2037aa66e58db 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback.h @@ -16,7 +16,9 @@ #ifndef OHOS_DSCREEN_SOURCE_CALLBACK_H #define OHOS_DSCREEN_SOURCE_CALLBACK_H +#include #include +#include #include "idistributed_hardware_source.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h index f85c25e002ef9a03d03245c8a041236a36bd1d36..a63a556092988d93e1307e5e2302ddde293e0c0f 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_callback_stub.h @@ -16,12 +16,16 @@ #ifndef OHOS_DSCREEN_SOURCE_CALLBACK_STUB_H #define OHOS_DSCREEN_SOURCE_CALLBACK_STUB_H +#include #include #include "iremote_stub.h" +#include "refbase.h" #include "idscreen_source_callback.h" +namespace OHOS { class MessageOption; } +namespace OHOS { class MessageParcel; } namespace OHOS { namespace DistributedHardware { class DScreenSourceCallbackStub : public IRemoteStub { diff --git a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h index 17688f1b4bf3628da040cf05fb4652db5f08bf3c..e8420e23349dae7fbe9bc60b4be06ee70bbacbd6 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/callback/dscreen_source_load_callback.h @@ -16,8 +16,13 @@ #ifndef OHOS_DSCREEN_SOURCE_LOAD_CALLBACK_H #define OHOS_DSCREEN_SOURCE_LOAD_CALLBACK_H +#include +#include + +#include "refbase.h" #include "system_ability_load_callback_stub.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSourceLoadCallback : public SystemAbilityLoadCallbackStub { diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h index a602ab613df22e00daa8c0b4dab97307c379a6e7..bcb400340e998329dc5bb003e95b204c1632bb05 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h @@ -17,8 +17,13 @@ #define OHOS_DSCREEN_SOURCE_HANDLER_H #include +#include +#include #include +#include "iremote_object.h" +#include "refbase.h" + #include "dscreen_source_callback.h" #include "idscreen_source.h" #include "idistributed_hardware_source.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h index a0d84ba01a37a21787626bfe37c7a61ae9fc8e08..13c3df828652b262a32c180b57df7ff652f77f1d 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_proxy.h @@ -16,11 +16,15 @@ #ifndef OHOS_DSCREEN_SOURCE_PROXY_H #define OHOS_DSCREEN_SOURCE_PROXY_H +#include + +#include "idistributed_hardware_source.h" +#include "idscreen_source.h" #include "iremote_broker.h" #include "iremote_proxy.h" -#include "idscreen_source.h" -#include "idistributed_hardware_source.h" +#include "refbase.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { class DScreenSourceProxy : public IRemoteProxy { diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp index 4ec6a3f71747fff7c52df75850513055573dec09..00b55fe1dc1695de1e9a319a3e389ec21c5a1913 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp @@ -15,9 +15,16 @@ #include "dscreen_source_callback_stub.h" +#include + +#include "idscreen_source_callback.h" +#include "ipc_types.h" +#include "message_parcel.h" + #include "dscreen_errcode.h" #include "dscreen_log.h" +namespace OHOS { class MessageOption; } namespace OHOS { namespace DistributedHardware { DScreenSourceCallbackStub::DScreenSourceCallbackStub() diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp index 28bac922bddeab30c2fca94e4a1842eaa174f334..a4e4e57177b61e74bbd1566309972dd4c07ceb0a 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp @@ -14,14 +14,13 @@ */ #include "dscreen_source_load_callback.h" -#include - #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_hisysevent.h" #include "dscreen_log.h" #include "dscreen_source_handler.h" +namespace OHOS { class IRemoteObject; } namespace OHOS { namespace DistributedHardware { DScreenSourceLoadCallback::DScreenSourceLoadCallback( diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index 06894f941cd051bc3b5064eaf6287394410a0e88..73d8509ca68ef99c5213bed4797d2aa6fc909efb 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -15,7 +15,16 @@ #include "dscreen_source_handler.h" +#include +#include +#include + +#include "errors.h" +#include "hitrace_meter.h" +#include "idscreen_source_callback.h" #include "if_system_ability_manager.h" +#include "iremote_broker.h" +#include "isystem_ability_load_callback.h" #include "iservice_registry.h" #include "dscreen_constants.h" diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp index 5f0bad83cfaabbd0ac7b1badbbde29a7b2436c4c..f4ab20d03a5f7126e477cc27b40872322a72ecfe 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp @@ -15,7 +15,10 @@ #include "dscreen_source_proxy.h" -#include "parcel.h" +#include "idscreen_source_callback.h" +#include "iremote_object.h" +#include "message_option.h" +#include "message_parcel.h" #include "dscreen_errcode.h" #include "dscreen_log.h" diff --git a/services/common/utils/src/video_param.cpp b/services/common/utils/src/video_param.cpp index 7ff83ceef979d27bdfc5611ec1efdc8b96b15207..0b6d2b9f2454d359924de034d27fdf82b6698b79 100644 --- a/services/common/utils/src/video_param.cpp +++ b/services/common/utils/src/video_param.cpp @@ -15,7 +15,6 @@ #include "video_param.h" #include "dscreen_constants.h" -#include "dscreen_errcode.h" using json = nlohmann::json;