diff --git a/etc/para/src/para_handle.cpp b/etc/para/src/para_handle.cpp
index 3c3d955..7dc2759 100644
--- a/etc/para/src/para_handle.cpp
+++ b/etc/para/src/para_handle.cpp
@@ -13,7 +13,6 @@
  * 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 f5cc835..d6269f6 100644
--- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
+++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h
@@ -16,9 +16,10 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H
 
-#include <stdint.h>
+#include <cstdint>
+#include <functional>
+#include <string>
 
-#include "functional"
 #include "i_input_method_agent.h"
 #include "iremote_broker.h"
 #include "iremote_object.h"
@@ -26,7 +27,6 @@
 #include "message_parcel.h"
 #include "nocopyable.h"
 #include "refbase.h"
-#include "string"
 
 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 1089402..5193993 100644
--- a/frameworks/inputmethod_controller/include/input_client_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_client_proxy.h
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H
 
-#include <stdint.h>
-#include "functional"
+#include <cstdint>
+#include <functional>
+
 #include "i_input_client.h"
 #include "i_input_method_agent.h"
 #include "iremote_broker.h"
diff --git a/frameworks/inputmethod_controller/include/input_client_stub.h b/frameworks/inputmethod_controller/include/input_client_stub.h
index d5b3bde..605e1dc 100644
--- a/frameworks/inputmethod_controller/include/input_client_stub.h
+++ b/frameworks/inputmethod_controller/include/input_client_stub.h
@@ -13,11 +13,10 @@
  * limitations under the License.
  */
 
-
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H
 
-#include <stdint.h>
+#include <cstdint>
 #include "i_input_client.h"
 #include "i_input_method_agent.h"
 #include "iremote_stub.h"
diff --git a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
index e3edc62..b3414c4 100644
--- a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h
@@ -16,15 +16,16 @@
 #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
 #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H
 
-#include <stdint.h>
-#include "functional"
+#include <cstdint>
+#include <functional>
+#include <string>
+
 #include "i_input_data_channel.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 {
diff --git a/frameworks/inputmethod_controller/include/input_data_channel_stub.h b/frameworks/inputmethod_controller/include/input_data_channel_stub.h
index ba75c95..f4b0b0f 100644
--- a/frameworks/inputmethod_controller/include/input_data_channel_stub.h
+++ b/frameworks/inputmethod_controller/include/input_data_channel_stub.h
@@ -13,11 +13,12 @@
  * 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 <stdint.h>
+#include <cstdint>
+#include <string>
+
 #include "i_input_data_channel.h"
 #include "iremote_stub.h"
 #include "message_handler.h"
@@ -25,7 +26,6 @@
 #include "message_parcel.h"
 #include "nocopyable.h"
 #include "refbase.h"
-#include "string"
 
 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 89a2579..4cab09f 100644
--- a/frameworks/inputmethod_controller/src/input_client_proxy.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_proxy.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-
 #include "input_client_proxy.h"
 #include "global.h"
 #include "message_option.h"
diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp
index 0509b2e..b65becf 100644
--- a/frameworks/inputmethod_controller/src/input_client_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp
@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-
 #include "input_client_stub.h"
+
+#include <new>
+#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 {
diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
index b27d137..675d398 100644
--- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
+++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp
@@ -13,14 +13,15 @@
  * limitations under the License.
  */
 
-
 #include "input_data_channel_stub.h"
+
+#include <new>
+
 #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 {
diff --git a/services/dfx/src/inputmethod_dump.cpp b/services/dfx/src/inputmethod_dump.cpp
index 2074dab..c3f4fb2 100644
--- a/services/dfx/src/inputmethod_dump.cpp
+++ b/services/dfx/src/inputmethod_dump.cpp
@@ -16,12 +16,12 @@
 #include "inputmethod_dump.h"
 
 #include <cstdint>
+#include <functional>
+#include <list>
+#include <string>
+#include <vector>
 
-#include "functional"
 #include "global.h"
-#include "list"
-#include "string"
-#include "vector"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/dfx/src/inputmethod_sysevent.cpp b/services/dfx/src/inputmethod_sysevent.cpp
index f251dd9..51970ee 100644
--- a/services/dfx/src/inputmethod_sysevent.cpp
+++ b/services/dfx/src/inputmethod_sysevent.cpp
@@ -17,7 +17,6 @@
 
 #include "hisysevent.h"
 
-
 namespace OHOS {
 namespace MiscServices {
 namespace {
diff --git a/services/include/input_attribute.h b/services/include/input_attribute.h
index 409efbc..27252d5 100644
--- a/services/include/input_attribute.h
+++ b/services/include/input_attribute.h
@@ -16,7 +16,7 @@
 #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
 #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "parcel.h"
 
diff --git a/services/include/input_method_property.h b/services/include/input_method_property.h
index 1c526af..c9bb675 100644
--- a/services/include/input_method_property.h
+++ b/services/include/input_method_property.h
@@ -16,8 +16,7 @@
 #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
 #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <vector>
 
diff --git a/services/include/keyboard_type.h b/services/include/keyboard_type.h
index 7e54901..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 <stdint.h>
+#include <cstdint>
 #include <string>
 #include "parcel.h"
 
diff --git a/services/include/message.h b/services/include/message.h
index 176eee2..c981690 100644
--- a/services/include/message.h
+++ b/services/include/message.h
@@ -17,7 +17,7 @@
 #ifndef SERVICES_INCLUDE_MESSAGE_H
 #define SERVICES_INCLUDE_MESSAGE_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "message_parcel.h"
 
diff --git a/services/src/input_attribute.cpp b/services/src/input_attribute.cpp
index 85ff3e9..c0b3a21 100644
--- a/services/src/input_attribute.cpp
+++ b/services/src/input_attribute.cpp
@@ -15,7 +15,7 @@
 
 #include "input_attribute.h"
 
-#include "new"
+#include <new>
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/src/input_method_property.cpp b/services/src/input_method_property.cpp
index a368837..46a95d8 100644
--- a/services/src/input_method_property.cpp
+++ b/services/src/input_method_property.cpp
@@ -13,12 +13,13 @@
  * limitations under the License.
  */
 
-
 #include "input_method_property.h"
+
+#include <new>
+#include <string>
+#include <vector>
+
 #include "__config"
-#include "new"
-#include "string"
-#include "vector"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/src/keyboard_type.cpp b/services/src/keyboard_type.cpp
index 5d6d021..28bea25 100644
--- a/services/src/keyboard_type.cpp
+++ b/services/src/keyboard_type.cpp
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
-
 #include "keyboard_type.h"
+
+#include <new>
+#include <string>
+
 #include "__config"
-#include "new"
-#include "string"
 
 namespace OHOS {
 namespace MiscServices {
diff --git a/services/src/message_handler.cpp b/services/src/message_handler.cpp
index 635dd56..4c34fa2 100644
--- a/services/src/message_handler.cpp
+++ b/services/src/message_handler.cpp
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-
 #include "message_handler.h"
-#include "new"
-#include "queue"
 
-namespace OHOS {
+#include <new>
+#include <queue>
+
+    namespace OHOS {
 namespace MiscServices {
     /*! Constructor
     */