diff --git a/native/jni/src/suggest/core/dicnode/dic_nodes_cache.h b/native/jni/src/suggest/core/dicnode/dic_nodes_cache.h
index 089d4467f3549bd43b1e595c165d8ecb0ba19c23..fb76c731f668ba8febd19c8282a7a1dfc0c57be1 100644
--- a/native/jni/src/suggest/core/dicnode/dic_nodes_cache.h
+++ b/native/jni/src/suggest/core/dicnode/dic_nodes_cache.h
@@ -18,7 +18,6 @@
 #define LATINIME_DIC_NODES_CACHE_H
 
 #include <algorithm>
-#include <stdint.h>
 
 #include "defines.h"
 #include "suggest/core/dicnode/dic_node_priority_queue.h"
diff --git a/native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h
index 6ddb7f1afdb1ee3b232ebd734a6dff976bdba88a..11f8c29054792a54f4d8dfe1797bc3ad457b405f 100644
--- a/native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h
+++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_properties.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_DIC_NODE_PROPERTIES_H
 #define LATINIME_DIC_NODE_PROPERTIES_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h
index ea48de1ea8d562ab1c5cb84926556a85d269d3e6..69a886f55c95c5fb1b12dec7ae916d73f7217b47 100644
--- a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h
+++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_output.h
@@ -18,8 +18,8 @@
 #define LATINIME_DIC_NODE_STATE_OUTPUT_H
 
 #include <algorithm>
+#include <cstdint>
 #include <cstring> // for memmove()
-#include <stdint.h>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h
index f164edbee6f5f8e97d1a4ac3e655550400c4dd31..c19d48eb9a695837728038418a065216818fa286 100644
--- a/native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h
+++ b/native/jni/src/suggest/core/dicnode/internal/dic_node_state_scoring.h
@@ -18,7 +18,7 @@
 #define LATINIME_DIC_NODE_STATE_SCORING_H
 
 #include <algorithm>
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/dictionary/digraph_utils.h"
diff --git a/native/jni/src/suggest/core/dictionary/bloom_filter.h b/native/jni/src/suggest/core/dictionary/bloom_filter.h
index e22c3ae5ca30fa96bf24244235e0b027ea942dd3..85b8fc397f5e8b6656b5e2c92c5bd0f6f971df62 100644
--- a/native/jni/src/suggest/core/dictionary/bloom_filter.h
+++ b/native/jni/src/suggest/core/dictionary/bloom_filter.h
@@ -17,8 +17,8 @@
 #ifndef LATINIME_BLOOM_FILTER_H
 #define LATINIME_BLOOM_FILTER_H
 
+#include <cstdint>
 #include <cstring>
-#include <stdint.h>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.cpp b/native/jni/src/suggest/core/dictionary/dictionary.cpp
index ef7a0a8fe51fefc9f20c1e912d0a9a2e59684e0d..8445da3108f3fc5c058d7ddeeb0379aae58d4596 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.cpp
+++ b/native/jni/src/suggest/core/dictionary/dictionary.cpp
@@ -18,8 +18,6 @@
 
 #include "suggest/core/dictionary/dictionary.h"
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/core/policy/dictionary_header_structure_policy.h"
 #include "suggest/core/result/suggestion_results.h"
diff --git a/native/jni/src/suggest/core/dictionary/dictionary.h b/native/jni/src/suggest/core/dictionary/dictionary.h
index cd983b03211319f4f010c2ad3899c42e564189ee..a134516e1329044a86b4f8bdb6ee54a0d16fc30a 100644
--- a/native/jni/src/suggest/core/dictionary/dictionary.h
+++ b/native/jni/src/suggest/core/dictionary/dictionary.h
@@ -17,7 +17,6 @@
 #ifndef LATINIME_DICTIONARY_H
 #define LATINIME_DICTIONARY_H
 
-#include <stdint.h>
 #include <memory>
 
 #include "defines.h"
diff --git a/native/jni/src/suggest/core/dictionary/error_type_utils.h b/native/jni/src/suggest/core/dictionary/error_type_utils.h
index cc778676508cde677ccd377714bedd9656a0ad72..0e8e5b6352b1c8002f1ad4da9c1232192da00dc3 100644
--- a/native/jni/src/suggest/core/dictionary/error_type_utils.h
+++ b/native/jni/src/suggest/core/dictionary/error_type_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_ERROR_TYPE_UTILS_H
 #define LATINIME_ERROR_TYPE_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/core/session/dic_traverse_session.h b/native/jni/src/suggest/core/session/dic_traverse_session.h
index 9e5d902dd617763ecd1ef5f6ae8cbf8b2e53e76d..843ca85a043bb3780e9bf24fa70cc4e726dd65b3 100644
--- a/native/jni/src/suggest/core/session/dic_traverse_session.h
+++ b/native/jni/src/suggest/core/session/dic_traverse_session.h
@@ -17,7 +17,6 @@
 #ifndef LATINIME_DIC_TRAVERSE_SESSION_H
 #define LATINIME_DIC_TRAVERSE_SESSION_H
 
-#include <stdint.h>
 #include <vector>
 
 #include "defines.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_policy.h
index 6ff95cac4a7b178084b5d749c61335306870a76c..a898e2afcd708621661cf247d94b21d46711719e 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_policy.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_BIGRAM_LIST_POLICY_H
 #define LATINIME_BIGRAM_LIST_POLICY_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_bigrams_structure_policy.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_read_write_utils.h b/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_read_write_utils.h
index 7e1038300f5ff6ef46291eb2476494fb25c917e4..15f924a6a1328c930521452eed14a236dfe76ecf 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_read_write_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/bigram/bigram_list_read_write_utils.h
@@ -17,8 +17,8 @@
 #ifndef LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H
 #define LATINIME_BIGRAM_LIST_READ_WRITE_UTILS_H
 
+#include <cstdint>
 #include <cstdlib>
-#include <stdint.h>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
index 66824245e3066e7a366dd67899cd836499a543f4..f950cade33a5a768cd0087178c52b59dd8363f62 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_policy.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_HEADER_POLICY_H
 #define LATINIME_HEADER_POLICY_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_header_structure_policy.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h
index 4185a2e7c8bc4c10916d9dd2dc7621a43aade748..a6b4c4e142186195f50525ad7c0ce2afbdf2912b 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/header/header_read_write_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_HEADER_READ_WRITE_UTILS_H
 #define LATINIME_HEADER_READ_WRITE_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_header_structure_policy.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h
index d73f739533354d47a7caa0d111a83a0e3683af8d..6d2b4778c8a54cf539b445ff0677d8d9381adf63 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_policy.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_SHORTCUT_LIST_POLICY_H
 #define LATINIME_SHORTCUT_LIST_POLICY_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h
index a83ed5a50e3d37f4073bb30b3918ed6cf598bda1..d065bf7fd87cebf01a96a8136a751b8e4f4eaae6 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_SHORTCUT_LIST_READING_UTILS_H
 #define LATINIME_SHORTCUT_LIST_READING_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h b/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
index f2fa5b75b90e85226c33c1b12660823a8d468356..fe984615c0b17baeedaf302ef50f2e60da867bca 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/shortcut/ver4_shortcut_list_policy.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_VER4_SHORTCUT_LIST_POLICY_H
 #define LATINIME_VER4_SHORTCUT_LIST_POLICY_H
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/core/policy/dictionary_shortcuts_structure_policy.h"
 #include "suggest/policyimpl/dictionary/shortcut/shortcut_list_reading_utils.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
index 79bcf6fa4b783ad566e537d0189b606a5cc212e3..5f19534e2d3b3c21a57124178e0fb072f8a39336 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.cpp
@@ -17,7 +17,6 @@
 #include "suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h"
 
 #include <climits>
-#include <stdint.h>
 
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
index 9454ddf33ca175e5ae481a4e427eb66f2e11fbce..6053b7ed3265816bf1c00067e9277bc2168cc371 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/dictionary_structure_with_buffer_policy_factory.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H
 #define LATINIME_DICTIONARY_STRUCTURE_WITH_BUFFER_POLICY_FACTORY_H
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/core/policy/dictionary_structure_with_buffer_policy.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
index 89ae12c0bf9e143f7c18d740a8d16f2f3571fe90..b13a075d505b050b1d2f244f3dcfe17422501431 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_DYNAMIC_PT_READING_UTILS_H
 #define LATINIME_DYNAMIC_PT_READING_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
index 71f473096b1bdfe47758ca485526e4ded252fa2b..f703baf8538ebf5c42e44df36bb0ffca09b25758 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_updating_helper.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_DYNAMIC_PT_UPDATING_HELPER_H
 #define LATINIME_DYNAMIC_PT_UPDATING_HELPER_H
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
 #include "utils/hash_map_compat.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
index ebbdc2ea27a5d1308039c7a606c2e416b5b9264f..664aeebbb37cd5d56d692b217c2b994eb13af0a9 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.cpp
@@ -17,8 +17,8 @@
 #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_writing_utils.h"
 
 #include <cstddef>
+#include <cstdint>
 #include <cstdlib>
-#include <stdint.h>
 
 #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h
index 11a40de55af1a8740850e54cc405d76e1a54265c..79500b9fa5f62a116ed59f466e23fc98fef41094 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_policy.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_PATRICIA_TRIE_POLICY_H
 #define LATINIME_PATRICIA_TRIE_POLICY_H
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include "defines.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h
index fa1430ce60d01c62eb9da7f2bb2bdbfc08947a59..a6090a513adec443f0fb341a0f146738c75f96b7 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/patricia_trie_reading_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_PATRICIA_TRIE_READING_UTILS_H
 #define LATINIME_PATRICIA_TRIE_READING_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
index dd1a0da5166aeebeb00641b84f68d849746fc3d6..86fc89c5ee81093e1319f536034c0d75c3a00508 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_patricia_trie_node_reader.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H
 #define LATINIME_VER2_PATRICIA_TRIE_NODE_READER_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h
index 77404adf8ac1ef876d09e5ad646b3329298ca91f..548272148b15e712b45595f7e026986796827b3d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v2/ver2_pt_node_array_reader.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_VER2_PT_NODE_ARRAY_READER_H
 #define LATINIME_VER2_PT_NODE_ARRAY_READER_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_array_reader.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
index 1db9ea026394bf2cf1166a1e295e03420bfacb91..f24307e7bb64ad13910a567b37340163d005fe94 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_reader.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H
 #define LATINIME_VER4_PATRICIA_TRIE_NODE_READER_H
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_reader.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
index f01b3af0e8261e886eb967a186d866eff22e516d..b2b0504a1fd593c2aee4fae394f115a4aaf794bb 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_node_writer.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H
 #define LATINIME_VER4_PATRICIA_TRIE_NODE_WRITER_H
 
-#include <stdint.h>
-
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/dynamic_pt_reading_helper.h"
 #include "suggest/policyimpl/dictionary/structure/pt_common/pt_node_params.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
index e418c493317ab7c0789947ca547386816ce63aad..466ff55d5ba475dd446fa2164d1c0c499fc0ed1d 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_reading_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H
 #define LATINIME_VER4_PATRICIA_TRIE_READING_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
index 76be16518f104d4990523bafec4a6a9c201dd817..23cbe3aa377479d302aaccfc4b0b7a15be3769f5 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h
@@ -18,7 +18,7 @@
 #define LATINIME_BUFFER_WITH_EXTENDABLE_BUFFER_H
 
 #include <cstddef>
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 
 #include "defines.h"
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h b/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h
index ebdd523e1747ce0371af07339ee6789bb59ccb4c..c0a9fcb1dc821b84f7b05620f91fae136805a783 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/byte_array_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_BYTE_ARRAY_UTILS_H
 #define LATINIME_BYTE_ARRAY_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h b/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
index 7c6a21dd72e7822933ccd9cc389bcee77cce5ddb..759b1c9b22b8ace99c6d691247572791c9e2d414 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/format_utils.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_FORMAT_UTILS_H
 #define LATINIME_FORMAT_UTILS_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h b/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h
index f73716c8ed562b9d12ec4b14cf674059e86dced3..8460087ab3d86bb48a452de51d7c24ea18b6ef16 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/mmapped_buffer.h
@@ -17,8 +17,8 @@
 #ifndef LATINIME_MMAPPED_BUFFER_H
 #define LATINIME_MMAPPED_BUFFER_H
 
+#include <cstdint>
 #include <memory>
-#include <stdint.h>
 
 #include "defines.h"
 
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h b/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h
index 14fdf53cbdb8486f44e4e2bfe015ae7995916bea..3b339e61a8e5576410b812e641ce68667527b482 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/probability_utils.h
@@ -17,8 +17,6 @@
 #ifndef LATINIME_PROBABILITY_UTILS_H
 #define LATINIME_PROBABILITY_UTILS_H
 
-#include <stdint.h>
-
 #include "defines.h"
 
 namespace latinime {
diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h b/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h
index 21c167506573861a3d16bc20d416833d9aeedcd7..fca8120f1a67e1c8dd4e2a3409900e7c13a17e00 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/sparse_table.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_SPARSE_TABLE_H
 #define LATINIME_SPARSE_TABLE_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/policyimpl/dictionary/utils/buffer_with_extendable_buffer.h"
diff --git a/native/jni/src/suggest/policyimpl/typing/typing_traversal.h b/native/jni/src/suggest/policyimpl/typing/typing_traversal.h
index 7c86b7dc9fb0c362c85840486253061f27ca8902..5ba8bfa0104a559fa83d776669c7c1b0d6640734 100644
--- a/native/jni/src/suggest/policyimpl/typing/typing_traversal.h
+++ b/native/jni/src/suggest/policyimpl/typing/typing_traversal.h
@@ -17,7 +17,7 @@
 #ifndef LATINIME_TYPING_TRAVERSAL_H
 #define LATINIME_TYPING_TRAVERSAL_H
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "defines.h"
 #include "suggest/core/dicnode/dic_node.h"