Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

Changes to be committed:

etc/para/include/para_handle.h

@@ -15,7 +15,9 @@
 
 #ifndef ETC_PARA_INCLUDE_PARA_HANDLE_H
 #define ETC_PARA_INCLUDE_PARA_HANDLE_H
-#include <string>
+//#include <string>
+#include <stdint.h>  
+#include "iosfwd"    
 namespace OHOS {
     namespace MiscServices {
         class ParaHandle {

etc/para/src/para_handle.cpp

@@ -12,8 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
 #include "para_handle.h"
 #include "parameter.h"
+#include "string"
 
 namespace OHOS {
     namespace MiscServices {

frameworks/inputmethod_ability/include/input_method_agent_proxy.h

@@ -16,8 +16,16 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H
 
-#include "iremote_proxy.h"
+#include <stdint.h> 
+#include "functional"
 #include "i_input_method_agent.h"
+#include "iremote_broker.h"
+#include "iremote_object.h"
+#include "iremote_proxy.h"
+#include "message_parcel.h"
+#include "nocopyable.h"
+#include "refbase.h"
+#include "string"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp

@@ -14,6 +14,8 @@
  */
 
 #include "input_method_agent_proxy.h"
+#include "global.h"
+#include "message_option.h"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/include/input_client_proxy.h

@@ -17,8 +17,15 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 
-#include "iremote_proxy.h"
+#include <stdint.h>
+#include "functional"
 #include "i_input_client.h"
+#include "i_input_method_agent.h"
+#include "iremote_broker.h"
+#include "iremote_object.h"
+#include "iremote_proxy.h"
+#include "nocopyable.h"
+#include "refbase.h"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/include/input_client_stub.h

@@ -17,10 +17,15 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 
-#include "iremote_stub.h"
+#include <stdint.h>
 #include "i_input_client.h"
+#include "i_input_method_agent.h"
+#include "iremote_stub.h"
 #include "message_handler.h"
-#include "message.h"
+#include "message_option.h"
+#include "message_parcel.h"
+#include "nocopyable.h"
+#include "refbase.h"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/include/input_data_channel_proxy.h

@@ -16,9 +16,15 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
 
-#include "iremote_proxy.h"
+#include <stdint.h>
+#include "functional"
 #include "i_input_data_channel.h"
-#include "input_method_utils.h"
+#include "iremote_broker.h"
+#include "iremote_object.h"
+#include "iremote_proxy.h"
+#include "nocopyable.h"
+#include "refbase.h"
+#include "string"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/include/input_data_channel_stub.h

@@ -17,11 +17,15 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
 
+#include <stdint.h>
 #include "i_input_data_channel.h"
 #include "iremote_stub.h"
 #include "message_handler.h"
-#include "input_method_utils.h"
-#include "input_method_controller.h"
+#include "message_option.h"
+#include "message_parcel.h"
+#include "nocopyable.h"
+#include "refbase.h"
+#include "string"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/src/input_client_proxy.cpp

@@ -13,7 +13,11 @@
  * limitations under the License.
  */
 
+
 #include "input_client_proxy.h"
+#include "global.h"
+#include "message_option.h"
+#include "message_parcel.h"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/src/input_client_stub.cpp

@@ -13,8 +13,15 @@
  * limitations under the License.
  */
 
+
 #include "input_client_stub.h"
+#include <string>
 #include "global.h"
+#include "ipc_object_stub.h"
+#include "ipc_types.h"
+#include "message.h"
+#include "new"
+#include "string"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp

@@ -13,9 +13,12 @@
  * limitations under the License.
  */
 
+
 #include "input_data_channel_proxy.h"
+#include "global.h"
+#include "ipc_types.h"
+#include "message_option.h"
 #include "message_parcel.h"
-#include "utils.h"
 
 namespace OHOS {
 namespace MiscServices {

frameworks/inputmethod_controller/src/input_data_channel_stub.cpp

@@ -13,8 +13,15 @@
  * limitations under the License.
  */
 
+
 #include "input_data_channel_stub.h"
-#include "string_ex.h"
+#include <string>
+#include "global.h"
+#include "input_method_controller.h"
+#include "ipc_object_stub.h"
+#include "ipc_types.h"
+#include "message.h"
+#include "new"
 
 namespace OHOS {
 namespace MiscServices {

services/dfx/include/inputmethod_dump.h

@@ -16,12 +16,13 @@
 #ifndef INPUTMETHOD_DUMP_H
 #define INPUTMETHOD_DUMP_H
 
-#include <stdlib.h>
-#include <functional>
-#include <list>
-#include <string>
-#include <vector>
-#include "singleton.h"
+#include <functional>    
+#include <list>          
+#include <string>        
+#include <vector>        
+#include "__mutex_base"  
+#include "iosfwd"        
+#include "singleton.h"   
 
 namespace OHOS {
 namespace MiscServices {

services/dfx/include/inputmethod_sysevent.h

@@ -16,8 +16,8 @@
 #ifndef INPUTMETHOD_SYSEVENT_H
 #define INPUTMETHOD_SYSEVENT_H
 
-#include <string>
-#include "global.h"
+#include <stdint.h>  
+#include "iosfwd"    
 
 namespace OHOS {
 namespace MiscServices {

services/dfx/include/inputmethod_trace.h

@@ -16,7 +16,8 @@
 #ifndef INPUTMETHOD_TRACE_H
 #define INPUTMETHOD_TRACE_H
 
-#include <string>
+#include <stdint.h>
+#include "iosfwd"
 
 namespace OHOS {
 namespace MiscServices {

services/dfx/src/inputmethod_dump.cpp

@@ -13,8 +13,16 @@
  * limitations under the License.
  */
 
+// #include "inputmethod_dump.h"
+// #include "global.h"
 #include "inputmethod_dump.h"
+#include <stdint.h>
+#include "functional"
 #include "global.h"
+#include "list"
+#include "stdio.h"     
+#include "string"
+#include "vector"
 
 namespace OHOS {
 namespace MiscServices {

services/dfx/src/inputmethod_sysevent.cpp

@@ -13,9 +13,11 @@
  * limitations under the License.
  */
 
-#include "inputmethod_sysevent.h"
 
-#include "hisysevent.h"
+#include "inputmethod_sysevent.h"
+#include "global.h"      
+#include "hisysevent.h"  
+#include "string"        
 
 namespace OHOS {
 namespace MiscServices {

services/include/input_attribute.h

@@ -15,7 +15,9 @@
 
 #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
 #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
-#include "parcel.h"
+
+#include <stdint.h>  
+#include "parcel.h"  
 
 namespace OHOS {
 namespace MiscServices {

services/include/input_method_property.h

@@ -15,10 +15,12 @@
 
 #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
 #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
-#include <vector>
-#include <string>
-#include "parcel.h"
-#include "keyboard_type.h"
+
+#include <stdint.h>         
+#include <string>           
+#include <vector>           
+#include "keyboard_type.h"  
+#include "parcel.h"         
 
 namespace OHOS {
 namespace MiscServices {

services/include/keyboard_type.h

@@ -16,7 +16,7 @@
 #ifndef SERVICES_INCLUDE_KEYBOARD_TYPE_H
 #define SERVICES_INCLUDE_KEYBOARD_TYPE_H
 
-#include <vector>
+#include <stdint.h>
 #include <string>
 #include "parcel.h"
 

services/include/message.h

@@ -17,8 +17,9 @@
 #ifndef SERVICES_INCLUDE_MESSAGE_H
 #define SERVICES_INCLUDE_MESSAGE_H
 
-#include "global.h"
-#include "message_parcel.h"
+#include <stdint.h>          
+#include "message_parcel.h"  
+
 namespace OHOS {
 namespace MiscServices {
     class Message {

services/include/message_handler.h

@@ -18,10 +18,7 @@
 #define SERVICES_INCLUDE_MESSAGE_HANDLER_H
 
 #include <queue>
-#include <mutex>
-#include <condition_variable>
-#include "global.h"
-#include "message_parcel.h"
+#include "__mutex_base"
 #include "message.h"
 
 namespace OHOS {

services/src/input_attribute.cpp

@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
+
 #include "input_attribute.h"
+#include "new"  
 
 namespace OHOS {
 namespace MiscServices {

services/src/input_method_property.cpp

@@ -13,7 +13,12 @@
  * limitations under the License.
  */
 
+
 #include "input_method_property.h"
+#include "__config"
+#include "new"
+#include "string"
+#include "vector"
 
 namespace OHOS {
 namespace MiscServices {

services/src/keyboard_type.cpp

@@ -13,7 +13,11 @@
  * limitations under the License.
  */
 
+
 #include "keyboard_type.h"
+#include "__config"
+#include "new"
+#include "string"
 
 namespace OHOS {
 namespace MiscServices {

services/src/message.cpp

@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
+
 #include "message.h"
+#include "new"
 
 namespace OHOS {
 namespace MiscServices {

services/src/message_handler.cpp

@@ -13,7 +13,10 @@
  * limitations under the License.
  */
 
+
 #include "message_handler.h"
+#include "new"
+#include "queue"
 
 namespace OHOS {
 namespace MiscServices {