diff --git a/etc/para/src/para_handle.cpp b/etc/para/src/para_handle.cpp
index 5d4ec40..7dc2759 100644
--- a/etc/para/src/para_handle.cpp
+++ b/etc/para/src/para_handle.cpp
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include "para_handle.h"
 #include "parameter.h"
 
diff --git a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
index 568eb0b..d6269f6 100644
--- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
+++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
@@ -16,8 +16,17 @@
 #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 <cstdint>
+#include <functional>
+#include <string>
+
 #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"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp b/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp
index 357d2f5..96afcca 100644
--- a/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp
+++ b/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 {
diff --git a/frameworks/inputmethod_controller/include/input_client_proxy.h b/frameworks/inputmethod_controller/include/input_client_proxy.h
index fc1fcc4..5193993 100644
--- a/frameworks/inputmethod_controller/include/input_client_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_client_proxy.h
@@ -13,12 +13,19 @@
  * limitations under the License.
  */
 
-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 
-#include "iremote_proxy.h"
+#include <cstdint>
+#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 {
diff --git a/frameworks/inputmethod_controller/include/input_client_stub.h b/frameworks/inputmethod_controller/include/input_client_stub.h
index 5ccc71e..605e1dc 100644
--- a/frameworks/inputmethod_controller/include/input_client_stub.h
+++ b/frameworks/inputmethod_controller/include/input_client_stub.h
@@ -13,14 +13,18 @@
  * limitations under the License.
  */
 
-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 
-#include "iremote_stub.h"
+#include <cstdint>
 #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 {
diff --git a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
index 5d26ae6..b3414c4 100644
--- a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
@@ -16,9 +16,16 @@
 #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 <cstdint>
+#include <functional>
+#include <string>
+
 #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"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/frameworks/inputmethod_controller/include/input_data_channel_stub.h b/frameworks/inputmethod_controller/include/input_data_channel_stub.h
index 68e1bba..f4b0b0f 100644
--- a/frameworks/inputmethod_controller/include/input_data_channel_stub.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_stub.h
@@ -13,15 +13,19 @@
  * limitations under the License.
  */
 
-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H
 
+#include <cstdint>
+#include <string>
+
 #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"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/frameworks/inputmethod_controller/src/input_client_proxy.cpp b/frameworks/inputmethod_controller/src/input_client_proxy.cpp
index d3c6a03..4cab09f 100644
--- a/frameworks/inputmethod_controller/src/input_client_proxy.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_proxy.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "input_client_proxy.h"
+#include "global.h"
+#include "message_option.h"
+#include "message_parcel.h"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp
index 3db66b9..3d9f12c 100644
--- a/frameworks/inputmethod_controller/src/input_client_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp
@@ -14,7 +14,11 @@
  */
 
 #include "input_client_stub.h"
+
 #include "global.h"
+#include "ipc_object_stub.h"
+#include "ipc_types.h"
+#include "message.h"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp
index 860410b..a14e7b0 100644
--- a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp
+++ b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp
@@ -14,8 +14,10 @@
  */
 
 #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 {
diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
index 47a1a1e..92d7ddd 100644
--- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
@@ -14,7 +14,12 @@
  */
 
 #include "input_data_channel_stub.h"
-#include "string_ex.h"
+
+#include "global.h"
+#include "input_method_controller.h"
+#include "ipc_object_stub.h"
+#include "ipc_types.h"
+#include "message.h"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/dfx/include/inputmethod_dump.h b/services/dfx/include/inputmethod_dump.h
index 466dbfa..07218a8 100644
--- a/services/dfx/include/inputmethod_dump.h
+++ b/services/dfx/include/inputmethod_dump.h
@@ -16,11 +16,13 @@
 #ifndef INPUTMETHOD_DUMP_H
 #define INPUTMETHOD_DUMP_H
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <functional>
 #include <list>
 #include <string>
 #include <vector>
+
+#include "iosfwd"
 #include "singleton.h"
 
 namespace OHOS {
diff --git a/services/dfx/src/inputmethod_dump.cpp b/services/dfx/src/inputmethod_dump.cpp
index db04fa6..c3f4fb2 100644
--- a/services/dfx/src/inputmethod_dump.cpp
+++ b/services/dfx/src/inputmethod_dump.cpp
@@ -14,6 +14,13 @@
  */
 
 #include "inputmethod_dump.h"
+
+#include <cstdint>
+#include <functional>
+#include <list>
+#include <string>
+#include <vector>
+
 #include "global.h"
 
 namespace OHOS {
diff --git a/services/include/input_attribute.h b/services/include/input_attribute.h
index b6b39b4..27252d5 100644
--- a/services/include/input_attribute.h
+++ b/services/include/input_attribute.h
@@ -15,6 +15,9 @@
 
 #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
 #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
+
+#include <cstdint>
+
 #include "parcel.h"
 
 namespace OHOS {
diff --git a/services/include/input_method_property.h b/services/include/input_method_property.h
index 8602692..c9bb675 100644
--- a/services/include/input_method_property.h
+++ b/services/include/input_method_property.h
@@ -15,10 +15,13 @@
 
 #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
 #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
-#include <vector>
+
+#include <cstdint>
 #include <string>
-#include "parcel.h"
+#include <vector>
+
 #include "keyboard_type.h"
+#include "parcel.h"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/include/keyboard_type.h b/services/include/keyboard_type.h
index 7344362..b58edc6 100644
--- a/services/include/keyboard_type.h
+++ b/services/include/keyboard_type.h
@@ -16,7 +16,7 @@
 #ifndef SERVICES_INCLUDE_KEYBOARD_TYPE_H
 #define SERVICES_INCLUDE_KEYBOARD_TYPE_H
 
-#include <vector>
+#include <cstdint>
 #include <string>
 #include "parcel.h"
 
diff --git a/services/include/message.h b/services/include/message.h
index 5038e1a..c981690 100644
--- a/services/include/message.h
+++ b/services/include/message.h
@@ -17,8 +17,10 @@
 #ifndef SERVICES_INCLUDE_MESSAGE_H
 #define SERVICES_INCLUDE_MESSAGE_H
 
-#include "global.h"
+#include <cstdint>
+
 #include "message_parcel.h"
+
 namespace OHOS {
 namespace MiscServices {
     class Message {