diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9838e4e4aa47bce6da51f9445f5ebb8b3ebaaa8..9cba6b8ca270277a0d91d8d3ba1639a2c0833a6b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,19 +3,18 @@ project (dap_chain_net_srv_vpn)
   
 set(DAP_CHAIN_NET_SRV_VPN_SRCS 
 	dap_chain_net_srv_vpn.c
-        dap_chain_net_srv_vpn_cdb.c
-        dap_chain_net_srv_vpn_cdb_server_list.c
+    dap_chain_net_srv_vpn_cdb.c
+    dap_chain_net_srv_vpn_cdb_server_list.c
 	dap_chain_net_vpn_client.c
 	dap_chain_net_vpn_client_tun.c
         )
 
 set(DAP_CHAIN_NET_SRV_VPN_HEADERS
 	dap_chain_net_srv_vpn.h
-        dap_chain_net_srv_vpn_cdb.h
-        dap_chain_net_srv_vpn_cdb_server_list.h
+    dap_chain_net_srv_vpn_cdb.h
+    dap_chain_net_srv_vpn_cdb_server_list.h
 	dap_chain_net_vpn_client.h
 	dap_chain_net_vpn_client_tun.h
-
     )
 
 if(WIN32)
@@ -30,8 +29,13 @@ endif()
 
 add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRV_VPN_SRCS} ${DAP_CHAIN_NET_SRV_VPN_HEADERS})
 
-target_link_libraries(dap_chain_net_srv_vpn dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net dap_chain_net_srv dap_server_http_db dap_server_http_db_auth)
-target_include_directories(dap_chain_net_srv_vpn INTERFACE .)
+target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_chain dap_chain_crypto dap_chain_net dap_chain_net_srv)
+
+if(NOT ANDROID)
+    target_link_libraries(${PROJECT_NAME} dap_server_http_db_auth dap_server_http_db)
+endif()
+
+target_include_directories(${PROJECT_NAME} INTERFACE .)
 
 set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
 
diff --git a/dap_chain_net_srv_vpn_cdb.c b/dap_chain_net_srv_vpn_cdb.c
index 9e1e4dc68cf8b1274d06c923d3dbc17e8334d459..1b844153fcd60565b3a96d5667a86cf349f0b139 100644
--- a/dap_chain_net_srv_vpn_cdb.c
+++ b/dap_chain_net_srv_vpn_cdb.c
@@ -28,10 +28,12 @@
 #include "dap_enc_http.h"
 #include "dap_http.h"
 
+#ifndef __ANDROID__
 #include "db_core.h"
 #include "db_auth.h"
 #include "db_http.h"
 #include "db_http_file.h"
+#endif
 
 #include "dap_chain.h"
 #include "dap_chain_net.h"
@@ -240,6 +242,7 @@ void dap_chain_net_srv_vpn_cdb_deinit()
  */
 static void s_auth_callback(enc_http_delegate_t* a_delegate, void * a_arg)
 {
+#ifndef __ANDROID__
     db_auth_info_t *l_auth_info = (db_auth_info_t *) a_arg;
     log_it( L_DEBUG, "Authorized, now need to create conditioned transaction if not present");
 
@@ -290,5 +293,5 @@ static void s_auth_callback(enc_http_delegate_t* a_delegate, void * a_arg)
         }
         enc_http_reply_f(a_delegate,"\t</tx_cond_tpl>\n");
     }
-
+#endif
 }
diff --git a/dap_chain_net_srv_vpn_cdb_server_list.c b/dap_chain_net_srv_vpn_cdb_server_list.c
index 87b5cc52148758244cb4552fb2d62311bef86046..1417a60125653ec61d1ffa17977d08fbf18b1d0b 100644
--- a/dap_chain_net_srv_vpn_cdb_server_list.c
+++ b/dap_chain_net_srv_vpn_cdb_server_list.c
@@ -110,7 +110,7 @@ static void s_http_simple_proc(dap_http_simple_t *a_http_simple, void *a_arg)
                     char l_node_ext_ipv6_str[INET6_ADDRSTRLEN]={0};
                     if (l_node_info->hdr.ext_addr_v4.s_addr)
                         inet_ntop(AF_INET,&l_node_info->hdr.ext_addr_v4,l_node_ext_ipv4_str,sizeof(l_node_ext_ipv4_str));
-                    if (  *((uint128_t *) l_node_info->hdr.ext_addr_v6.__in6_u.__u6_addr8 ) )
+                    if (  *((uint128_t *) l_node_info->hdr.ext_addr_v6.s6_addr ) )
                         inet_ntop(AF_INET6,&l_node_info->hdr.ext_addr_v6,l_node_ext_ipv6_str,sizeof(l_node_ext_ipv6_str));
                     dap_string_append_printf( l_reply_str, "    {\n");