diff --git a/core/include/dap_math_convert.h b/core/include/dap_math_convert.h
index 65abc7bedaf2ddd7c132f0c11a9f18b0dbfa30a0..18a07363947ef552b3b25641e6473a8e47f7bfb5 100644
--- a/core/include/dap_math_convert.h
+++ b/core/include/dap_math_convert.h
@@ -257,7 +257,7 @@ uint256_t dap_uint256_scan_uninteger(const char *a_str_uninteger);
  */
 uint256_t dap_uint256_scan_decimal(const char *a_str_decimal);
 
-char *dap_uint256_to_char(uint256_t, char**);
+const char *dap_uint256_to_char(uint256_t a_uint256, const char **a_frac);
 
 /**
  * @brief dap_uint256_uninteger_to_char
@@ -285,7 +285,7 @@ char *dap_uint256_decimal_to_char(uint256_t a_decimal);
  * @param a_uint256
  * @return char*
  */
-char *dap_uint256_decimal_to_round_char(uint256_t a_uint256, uint8_t a_digits_after_point, bool is_round);
+const char *dap_uint256_decimal_to_round_char(uint256_t a_uint256, uint8_t a_digits_after_point, bool is_round);
 
 /**
  * @brief dap_uint256_char_to_round_char
@@ -295,7 +295,7 @@ char *dap_uint256_decimal_to_round_char(uint256_t a_uint256, uint8_t a_digits_af
  * @param a_uint256
  * @return char*
  */
-char *dap_uint256_char_to_round_char(char* a_str_decimal, uint8_t a_round_position, bool is_round);
+const char *dap_uint256_char_to_round_char(char* a_str_decimal, uint8_t a_round_position, bool is_round);
 
 int dap_id_uint64_parse(const char *a_id_str, uint64_t *a_id);
 uint64_t dap_uint128_to_uint64(uint128_t a_from);
diff --git a/core/src/dap_math_convert.c b/core/src/dap_math_convert.c
index 90fd59eb3a00735e318d9ce1815e7496fb9c3d2f..9066b605e000752a25518d30d4e27f45984bbe0f 100644
--- a/core/src/dap_math_convert.c
+++ b/core/src/dap_math_convert.c
@@ -188,7 +188,8 @@ uint256_t dap_uint256_scan_decimal(const char *a_str_decimal)
     return dap_uint256_scan_uninteger(l_buf);
 }
 
-char *dap_uint256_to_char(uint256_t a_uint256, char **a_frac) {
+const char *dap_uint256_to_char(uint256_t a_uint256, const char **a_frac)
+{
     _Thread_local static char   s_buf       [DATOSHI_POW256 + 2],
                                 s_buf_frac  [DATOSHI_POW256 + 2]; // Space for decimal dot and trailing zero
     char l_c, *l_c1 = s_buf, *l_c2 = s_buf;
@@ -238,17 +239,17 @@ char *dap_uint256_uninteger_to_char(uint256_t a_uninteger) {
 }
 
 char *dap_uint256_decimal_to_char(uint256_t a_decimal){ //dap_chain_balance_to_coins256, dap_chain_balance_to_coins
-    char *l_frac = NULL;
+    const char *l_frac = NULL;
     dap_uint256_to_char(a_decimal, &l_frac);
     return strdup(l_frac);
 }
 
-char *dap_uint256_decimal_to_round_char(uint256_t a_uint256, uint8_t a_round_position, bool is_round)
+const char *dap_uint256_decimal_to_round_char(uint256_t a_uint256, uint8_t a_round_position, bool is_round)
 {
     return dap_uint256_char_to_round_char(dap_uint256_decimal_to_char(a_uint256), a_round_position, is_round);
 }
 
-char *dap_uint256_char_to_round_char(char* a_str_decimal, uint8_t a_round_pos, bool is_round)
+const char *dap_uint256_char_to_round_char(char* a_str_decimal, uint8_t a_round_pos, bool is_round)
 {
     _Thread_local static char s_buf[DATOSHI_POW256 + 3];
     char *l_dot_pos = strchr(a_str_decimal, '.'), *l_res = s_buf;
@@ -502,7 +503,7 @@ uint128_t dap_uint128_scan_decimal(const char *a_str_decimal)
 }
 
 double dap_uint256_decimal_to_double(uint256_t a_decimal){
-    char *l_str = NULL;
+    const char *l_str = NULL;
     dap_uint256_to_char(a_decimal, &l_str);
     return strtod(l_str, NULL);
 }
diff --git a/crypto/src/dap_hash.c b/crypto/src/dap_hash.c
index 36575a03d424eb5bf12e1998cb9c97ccf4f11683..431a7b0e63176c4fb91abcd5e6750856d31b0a25 100755
--- a/crypto/src/dap_hash.c
+++ b/crypto/src/dap_hash.c
@@ -28,9 +28,6 @@
 #include "dap_hash.h"
 #include "dap_enc_base58.h"
 
-#include "KeccakHash.h"
-#include "SimpleFIPS202.h"
-
 #define LOG_TAG "dap_hash"
 
 /**
diff --git a/io/include/dap_net.h b/io/include/dap_net.h
index 6e9c69cddfee07c18aff94ceaebf1394ff8faa3e..c9bff23458007acb95bdabe51da1061cb715d603 100644
--- a/io/include/dap_net.h
+++ b/io/include/dap_net.h
@@ -39,10 +39,8 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
-
 #endif
 
-#include "dap_common.h"
 #include "dap_events_socket.h"
 
 int dap_net_resolve_host(const char *a_host, const char *a_port, struct sockaddr_storage *a_addr_out, bool a_passive_flag);