diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c
index 3a7aeded16872749ab924eada630cb5c3f92e15a..2bd2f5f0fc2bdc0ce28b217f50e2a15c2576a26e 100644
--- a/dap-sdk/net/core/dap_events_socket.c
+++ b/dap-sdk/net/core/dap_events_socket.c
@@ -1166,11 +1166,11 @@ static void *dap_events_socket_buf_thread(void *arg)
         l_sock = l_item->es->fd2;
 #elif defined(DAP_EVENTS_CAPS_QUEUE_MQUEUE)
         l_sock = l_item->es->mqd;
-#elif defined(DAP_EVENTS_CAPS_KQUEUE)
-#error "Undefined waiting for KQUEUE CAPS"
 #endif
+#ifndef DAP_EVENTS_CAPS_KQUEUE
         // wait max 5 min
         l_res = wait_send_socket(l_sock, 300000);
+#endif
         if (l_res == 0) {
             dap_events_socket_queue_ptr_send(l_item->es, l_item->arg);
             break;
diff --git a/modules/global-db/CMakeLists.txt b/modules/global-db/CMakeLists.txt
index 1d22fa8fc7419a150c632feda51d79d4085baf46..017fabcbe0783d88deac4f0abcff48ea8299588a 100644
--- a/modules/global-db/CMakeLists.txt
+++ b/modules/global-db/CMakeLists.txt
@@ -1,12 +1,29 @@
 cmake_minimum_required(VERSION 3.1)
 project (dap_chain_global_db C)
 
-file(GLOB DAP_CHAIN_GLOBAL_DB_SRC *.c)
-file(GLOB DAP_CHAIN_GLOBAL_DB_HDR include/*.h)
+file(GLOB DAP_CHAIN_GLOBAL_DB_SRC
+    dap_chain_global_db_driver_cdb.c
+    dap_chain_global_db_driver_sqlite.c
+    dap_chain_global_db.c
+    dap_chain_global_db_remote.c
+    dap_chain_global_db_driver.c
+    dap_chain_global_db_driver_pgsql.c
+)
+file(GLOB DAP_CHAIN_GLOBAL_DB_HDR
+    include/dap_chain_global_db.h
+    include/dap_chain_global_db_remote.h
+    include/dap_chain_global_db_driver.h
+    include/dap_chain_global_db_driver_pgsql.h
+    include/dap_chain_global_db_driver_cdb.h
+    include/dap_chain_global_db_driver_sqlite.h
+)
 
 set(DAP_CHAIN_GLOBAL_DB_LIBS dap_core dap_crypto dap_chain sqlite3 dap_cuttdb json-c)
 
 if(BUILD_WITH_GDB_DRIVER_MDBX)
+    file(GLOB DAP_CHAIN_GLOBAL_DB_SRC ${DAP_CHAIN_GLOBAL_DB_SRC} dap_chain_global_db_driver_mdbx.c)
+    file(GLOB DAP_CHAIN_GLOBAL_DB_HRR ${DAP_CHAIN_GLOBAL_DB_HDR} include/dap_chain_global_db_driver_mdbx.h)
+
     set(DAP_CHAIN_GLOBAL_DB_LIBS ${DAP_CHAIN_GLOBAL_DB_LIBS} mdbx-static)
     add_definitions ("-DDAP_CHAIN_GDB_ENGINE_MDBX")
 endif()
diff --git a/modules/global-db/dap_chain_global_db_driver.c b/modules/global-db/dap_chain_global_db_driver.c
index 3cbee088b33588ba55ccaa733f5333ae2dae4c52..d96260b5a58126d4899ef8fe5d485dd16572a16d 100644
--- a/modules/global-db/dap_chain_global_db_driver.c
+++ b/modules/global-db/dap_chain_global_db_driver.c
@@ -46,8 +46,15 @@
 
 #include "dap_chain_global_db_driver_sqlite.h"
 #include "dap_chain_global_db_driver_cdb.h"
+
+#ifdef DAP_CHAIN_GDB_ENGINE_MDBX
 #include "dap_chain_global_db_driver_mdbx.h"
+#endif
+
+#ifdef DAP_CHAIN_GDB_ENGINE_PGSQL
 #include "dap_chain_global_db_driver_pgsql.h"
+#endif
+
 #include "dap_chain_global_db_driver.h"
 
 #define LOG_TAG "db_driver"
@@ -109,8 +116,10 @@ int l_ret = -1;
         l_ret = dap_db_driver_sqlite_init(l_db_path_ext, &s_drv_callback);
     else if(!dap_strcmp(s_used_driver, "cdb"))
         l_ret = dap_db_driver_cdb_init(l_db_path_ext, &s_drv_callback);
+#ifdef DAP_CHAIN_GDB_ENGINE_MDBX
     else if(!dap_strcmp(s_used_driver, "mdbx"))
         l_ret = dap_db_driver_mdbx_init(l_db_path_ext, &s_drv_callback);
+#endif
 
 #ifdef DAP_CHAIN_GDB_ENGINE_PGSQL
     else if(!dap_strcmp(s_used_driver, "pgsql"))