diff --git a/Makefile b/Makefile
index 01aa57306c..efddf02a89 100644
--- a/Makefile
+++ b/Makefile
@@ -318,7 +318,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
 amd64-centos: centos9 centos9-clang centos9-dbg
 amd64-debian: debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
+amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
 amd64-ubuntu: ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 amd64-pkglist:
@@ -329,7 +329,7 @@ arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensu
 arm64-almalinux: almalinux8 almalinux9
 arm64-centos: centos9
 arm64-debian: debian12
-arm64-fedora: fedora40 fedora41
+arm64-fedora: fedora40 fedora41 fedora42
 arm64-opensuse: opensuse15
 arm64-ubuntu: ubuntu22 ubuntu24
 arm64-pkglist:
diff --git a/deps/Makefile b/deps/Makefile
index 87d2a20e8f..32727332e3 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -60,9 +60,13 @@ default: $(targets)
 
 ### deps targets
 
+include ../common_mk/openssl_flags.mk
+include ../common_mk/openssl_version_check.mk
+
+
 libinjection/libinjection/src/libinjection.a:
 	cd libinjection && rm -rf libinjection-*/ || true
-	cd libinjection && tar -zxf libinjection-3.10.0.tar.gz
+	cd libinjection && tar -zxf libinjection-*.tar.gz
 ifneq ($(CENTOSVER),6)
 	cd libinjection/libinjection && patch -p1 < ../update-build-py3.diff
 	cd libinjection/libinjection && patch -p1 < ../libinjection_sqli.c.patch
@@ -76,8 +80,6 @@ endif
 
 libinjection: libinjection/libinjection/src/libinjection.a
 
-include ../common_mk/openssl_flags.mk
-include ../common_mk/openssl_version_check.mk
 
 libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a re2/re2/obj/libre2.a
 	cd libhttpserver && rm -rf libhttpserver-*/ || true
@@ -114,8 +116,10 @@ coredumper/coredumper/src/libcoredumper.a:
 	cd coredumper/coredumper && patch -p1 < ../includes.patch
 	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
 	cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE}
+
 coredumper: coredumper/coredumper/src/libcoredumper.a
 
+
 curl/curl/lib/.libs/libcurl.a:
 	cd curl && rm -rf curl-*/ || true
 	cd curl && tar -zxf curl-*.tar.gz
@@ -156,20 +160,20 @@ lz4/lz4/lib/liblz4.a:
 lz4: lz4/lz4/lib/liblz4.a
 
 
-clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
+clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a:
 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
-	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
-	cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
-	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
+	cd clickhouse-cpp && tar -zxf clickhouse-cpp-*.tar.gz
+	cd clickhouse-cpp && ln -fsT clickhouse-cpp-*/ clickhouse-cpp
+	cd clickhouse-cpp/clickhouse-cpp && patch -p0 < ../fix_ciso646.patch
 	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 	cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
 
-clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a
+clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib.a
 
 
 libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
 	cd libdaemon && rm -rf libdaemon-*/ || true
-	cd libdaemon && tar -zxf libdaemon-0.14.tar.gz
+	cd libdaemon && tar -zxf libdaemon-*.tar.gz
 	cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
 	cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
 	cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
@@ -179,7 +183,7 @@ libdaemon: libdaemon/libdaemon/libdaemon/.libs/libdaemon.a
 
 jemalloc/jemalloc/lib/libjemalloc.a:
 	cd jemalloc && rm -rf jemalloc-*/ || true
-	cd jemalloc && tar --no-same-owner -jxf jemalloc-5.2.0.tar.bz2
+	cd jemalloc && tar --no-same-owner -jxf jemalloc-*.tar.bz2
 	cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue823.520.patch
 	cd jemalloc/jemalloc && patch src/jemalloc.c < ../issue2358.patch
 	cd jemalloc/jemalloc && patch -p0 < ../nothrow.patch
@@ -192,7 +196,7 @@ jemalloc: jemalloc/jemalloc/lib/libjemalloc.a
 
 mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
 	cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
-	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
+	cd mariadb-client-library && tar -zxf mariadb-connector-c-*-src.tar.gz
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
 	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
 ifeq ($(PROXYDEBUG),1)
@@ -234,6 +238,8 @@ endif
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_rpl.patch
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../cmakelists.txt.patch
 	cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.metadata_column_check.patch
+	cd mariadb-client-library/mariadb_client && patch -p0 < ../fix_bool.patch
+
 	cd mariadb-client-library/mariadb_client && CC=${CC} CXX=${CXX} ${MAKE} mariadbclient
 #	cd mariadb-client-library/mariadb_client/include && make my_config.h
 
@@ -252,13 +258,15 @@ sqlite3/sqlite3/sqlite3.o:
 
 sqlite3: sqlite3/sqlite3/sqlite3.o
 
-libconfig/libconfig/lib/.libs/libconfig++.a:
+
+libconfig/libconfig/out/libconfig++.a:
 	cd libconfig && rm -rf libconfig-*/ || true
 	cd libconfig && tar -zxf libconfig-*.tar.gz
-	cd libconfig/libconfig && ./configure --disable-examples
+	cd libconfig && ln -fsT libconfig-*/ libconfig
+	cd libconfig/libconfig && cmake -DBUILD_SHARED_LIBS=0 -DBUILD_EXAMPLES=0 -DBUILD_TESTS=0 -DBUILD_FUZZERS=0 .
 	cd libconfig/libconfig && CC=${CC} CXX=${CXX} ${MAKE}
 
-libconfig: libconfig/libconfig/lib/.libs/libconfig++.a
+libconfig: libconfig/libconfig/out/libconfig++.a
 
 
 prometheus-cpp/prometheus-cpp/lib/libprometheus-cpp-core.a:
@@ -301,9 +309,11 @@ pcre/pcre/.libs/libpcre.a:
 
 pcre: pcre/pcre/.libs/libpcre.a
 
+
 postgresql/postgresql/src/interfaces/libpq/libpq.a:
 	cd postgresql && rm -rf postgresql-*/ || true
 	cd postgresql && tar -zxf postgresql-*.tar.gz
+	cd postgresql && ln -fsT postgresql-*/ postgresql
 	cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch
 	cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch
 	cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch
@@ -314,6 +324,7 @@ postgresql/postgresql/src/interfaces/libpq/libpq.a:
 
 postgresql: postgresql/postgresql/src/interfaces/libpq/libpq.a
 
+
 libusual/libusual/.libs/libusual.a:
 	cd libusual && rm -rf libusual-*/ || true
 	cd libusual && tar -zxf libusual-*.tar.gz
@@ -323,12 +334,14 @@ libusual/libusual/.libs/libusual.a:
 
 libusual: libusual/libusual/.libs/libusual.a
 
+
 libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a 
 	cd libscram && rm -rf lib/* || true
 	cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR="$(SSL_IDIR)" POSTGRESQL_DIR="$(shell pwd)/postgresql/postgresql/"
 
 libscram: libscram/lib/libscram.a
 
+
 ### clean targets
 
 cleanpart:
@@ -348,7 +361,7 @@ cleanall:
 	cd re2 && rm -rf re2-*/ || true
 	cd pcre && rm -rf pcre-*/ || true
 	cd sqlite3 && rm -rf sqlite-amalgamation-*/ || true
-	cd clickhouse-cpp/ && rm -rf clickhouse-cpp-* || true
+	cd clickhouse-cpp/ && rm -rf clickhouse-cpp-*/ || true
 	cd lz4 && rm -rf lz4-*/ || true
 	cd libmicrohttpd && rm -rf libmicrohttpd-*/ || true
 	cd curl && rm -rf curl-*/ || true
diff --git a/deps/clickhouse-cpp/clickhouse-cpp b/deps/clickhouse-cpp/clickhouse-cpp
index 1838bb1c6f..6123b64592 120000
--- a/deps/clickhouse-cpp/clickhouse-cpp
+++ b/deps/clickhouse-cpp/clickhouse-cpp
@@ -1 +1 @@
-clickhouse-cpp-2.3.0
\ No newline at end of file
+clickhouse-cpp-2.5.1/
\ No newline at end of file
diff --git a/deps/clickhouse-cpp/clickhouse-cpp-2.5.1.tar.gz b/deps/clickhouse-cpp/clickhouse-cpp-2.5.1.tar.gz
new file mode 100644
index 0000000000..62538316c9
Binary files /dev/null and b/deps/clickhouse-cpp/clickhouse-cpp-2.5.1.tar.gz differ
diff --git a/deps/clickhouse-cpp/fix_ciso646.patch b/deps/clickhouse-cpp/fix_ciso646.patch
new file mode 100644
index 0000000000..84ec03ce80
--- /dev/null
+++ b/deps/clickhouse-cpp/fix_ciso646.patch
@@ -0,0 +1,16 @@
+diff -rau clickhouse-cpp-2.5.1.O/contrib/absl/absl/base/options.h clickhouse-cpp-2.5.1/contrib/absl/absl/base/options.h
+--- contrib/absl/absl/base/options.h	2023-09-30 00:53:54.000000000 +0000
++++ contrib/absl/absl/base/options.h	2025-05-27 09:27:52.020638618 +0000
+@@ -70,7 +70,11 @@
+ // Include a standard library header to allow configuration based on the
+ // standard library in use.
+ #ifdef __cplusplus
+-#include <ciso646>
++#if __has_include(<version>)
++#include <version>
++#else
++#include <ciso646>
++#endif
+ #endif
+ 
+ // -----------------------------------------------------------------------------
diff --git a/deps/clickhouse-cpp/v2.3.0.tar.gz b/deps/clickhouse-cpp/v2.3.0.tar.gz
deleted file mode 100644
index 9d00cd9b44..0000000000
Binary files a/deps/clickhouse-cpp/v2.3.0.tar.gz and /dev/null differ
diff --git a/deps/clickhouse-cpp/wire_format.patch b/deps/clickhouse-cpp/wire_format.patch
deleted file mode 100644
index e9f74be86a..0000000000
--- a/deps/clickhouse-cpp/wire_format.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- clickhouse-cpp/clickhouse/base/wire_format.h	2022-11-23 09:33:15.000000000 +0000
-+++ clickhouse-cpp/clickhouse/base/wire_format.h	2023-05-02 19:17:50.000000000 +0000
-@@ -1,6 +1,7 @@
- #pragma once
- 
- #include <string>
-+#include <stdint.h>
- 
- namespace clickhouse {
- 
diff --git a/deps/libconfig/libconfig b/deps/libconfig/libconfig
index 771e600d38..16d5a3fbe3 120000
--- a/deps/libconfig/libconfig
+++ b/deps/libconfig/libconfig
@@ -1 +1 @@
-libconfig-1.7.3
\ No newline at end of file
+libconfig-1.8/
\ No newline at end of file
diff --git a/deps/libconfig/libconfig-1.7.3.tar.gz b/deps/libconfig/libconfig-1.7.3.tar.gz
deleted file mode 100644
index 424e971d6a..0000000000
Binary files a/deps/libconfig/libconfig-1.7.3.tar.gz and /dev/null differ
diff --git a/deps/libconfig/libconfig-1.8.tar.gz b/deps/libconfig/libconfig-1.8.tar.gz
new file mode 100644
index 0000000000..a501d1ce44
Binary files /dev/null and b/deps/libconfig/libconfig-1.8.tar.gz differ
diff --git a/deps/mariadb-client-library/fix_bool.patch b/deps/mariadb-client-library/fix_bool.patch
new file mode 100644
index 0000000000..cf48b0cd73
--- /dev/null
+++ b/deps/mariadb-client-library/fix_bool.patch
@@ -0,0 +1,43 @@
+--- include/ma_global.h	2023-11-01 10:28:04.000000000 +0000
++++ include/ma_global.h	2025-05-27 08:50:58.456939147 +0000
+@@ -684,7 +684,7 @@
+ typedef char		my_bool; /* Small bool */
+ typedef unsigned long long my_ulonglong;
+ #if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
+-typedef char		bool;	/* Ordinary boolean values 0 1 */
++typedef char		bbool;	/* Ordinary boolean values 0 1 */
+ #endif
+ 	/* Macros for converting *constants* to the right type */
+ #define INT8(v)		(int8) (v)
+--- unittest/libmariadb/ssl.c	2023-11-01 10:28:04.000000000 +0000
++++ unittest/libmariadb/ssl.c	2025-05-27 08:50:58.459166509 +0000
+@@ -1238,7 +1238,7 @@
+ static int test_mdev14101(MYSQL *my __attribute__((unused)))
+ {
+   struct {
+-    bool do_yassl;
++    bbool do_yassl;
+     const char *opt_tls_version;
+     const char *expected;
+   } combinations[]= {
+@@ -1251,9 +1251,9 @@
+ 
+   int i;
+ #ifdef HAVE_SCHANNEL
+-  bool skip_tlsv12= 1;
++  bbool skip_tlsv12= 1;
+ #else
+-  bool skip_tlsv12= !have_openssl;
++  bbool skip_tlsv12= !have_openssl;
+ #endif
+ 
+ #if defined(HAVE_OPENSSL) && defined(TLS1_3_VERSION)
+@@ -1264,7 +1264,7 @@
+   for (i=0; combinations[i].expected; i++)
+   {
+     MYSQL *mysql;
+-    bool val=1;
++    bbool val=1;
+     char *tls_version;
+ 
+     if (!combinations[i].do_yassl && skip_tlsv12)
diff --git a/deps/postgresql/postgresql b/deps/postgresql/postgresql
index 1bbe35dc8e..fa1f3d319b 120000
--- a/deps/postgresql/postgresql
+++ b/deps/postgresql/postgresql
@@ -1 +1 @@
-postgresql-16.3
\ No newline at end of file
+postgresql-16.9/
\ No newline at end of file
diff --git a/deps/postgresql/postgresql-16.3.tar.gz b/deps/postgresql/postgresql-16.9.tar.gz
similarity index 74%
rename from deps/postgresql/postgresql-16.3.tar.gz
rename to deps/postgresql/postgresql-16.9.tar.gz
index d05e3acc5d..74b38cabaf 100644
Binary files a/deps/postgresql/postgresql-16.3.tar.gz and b/deps/postgresql/postgresql-16.9.tar.gz differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 8354d95d96..ad190c44fa 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -104,6 +104,34 @@ services:
       - PKG_RELEASE=dbg-fedora41
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  fedora42_build:
+    extends:
+      service: _build
+    image: proxysql/packaging:build-fedora42-v3.0.2
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - PKG_RELEASE=fedora42
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora42_clang_build:
+    extends:
+      service: fedora42_build
+    image: proxysql/packaging:build-clang-fedora42-v3.0.2
+    environment:
+      - PKG_RELEASE=fedora42-clang
+
+  fedora42_dbg_build:
+    extends:
+      service: fedora42_build
+    environment:
+      - PKG_RELEASE=dbg-fedora42
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   debian12_build:
diff --git a/include/btree.h b/include/btree.h
index bb22e0cf33..cd54d2fbea 100644
--- a/include/btree.h
+++ b/include/btree.h
@@ -109,6 +109,7 @@
 #include <iostream>
 #include <iterator>
 #include <limits>
+#include <cstdint>
 #include <type_traits>
 #include <new>
 #include <ostream>
diff --git a/lib/Makefile b/lib/Makefile
index 33fc0fa5c6..19b501a4b1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -28,68 +28,94 @@ DEPS_PATH := $(PROXYSQL_PATH)/deps
 
 MARIADB_PATH := $(DEPS_PATH)/mariadb-client-library/mariadb_client
 MARIADB_IDIR := $(MARIADB_PATH)/include
+MARIADB_LDIR := $(MARIADB_PATH)/libmariadb
+
+LIBDAEMON_PATH := $(DEPS_PATH)/libdaemon/libdaemon
+LIBDAEMON_IDIR := $(LIBDAEMON_PATH)
+LIBDAEMON_LDIR := $(LIBDAEMON_PATH)/libdaemon/.libs
 
 JEMALLOC_PATH := $(DEPS_PATH)/jemalloc/jemalloc
 JEMALLOC_IDIR := $(JEMALLOC_PATH)/include/jemalloc
+JEMALLOC_LDIR := $(JEMALLOC_PATH)/lib
 
 LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig
-LIBCONFIG_IDIR := -I$(LIBCONFIG_PATH)/lib
+LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib
+LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/out
+
+PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp
+PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
+PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib
 
-#INJECTION_PATH := $(DEPS_PATH)/libinjection
-#INJECTION_IDIR := $(INJECTION_PATH)
+JSON_PATH := $(DEPS_PATH)/json
+JSON_IDIR := $(JSON_PATH)
 
 RE2_PATH := $(DEPS_PATH)/re2/re2
 RE2_IDIR := $(RE2_PATH)
+RE2_LDIR := $(RE2_PATH)/obj
 
 PCRE_PATH := $(DEPS_PATH)/pcre/pcre
+PCRE_IDIR := $(PCRE_PATH)
+PCRE_LDIR := $(PCRE_PATH)/.libs
 
-SQLITE3_DIR := $(DEPS_PATH)/sqlite3/sqlite3
+SQLITE3_PATH := $(DEPS_PATH)/sqlite3/sqlite3
+SQLITE3_IDIR := $(SQLITE3_PATH)
+SQLITE3_LDIR := $(SQLITE3_PATH)
 
-CLICKHOUSE_CPP_DIR := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
+CITYHASH_PATH := $(DEPS_PATH)/cityhash/cityhash
+CITYHASH_LDIR := $(CITYHASH_PATH)/src/.libs
 
-LIBINJECTION_DIR := $(DEPS_PATH)/libinjection/libinjection
-LIBINJECTION_IDIR := -I$(LIBINJECTION_DIR)/src
+LZ4_PATH := $(DEPS_PATH)/lz4/lz4
+LZ4_LDIR := $(LZ4_PATH)/lib
 
-LIBHTTPSERVER_DIR := $(DEPS_PATH)/libhttpserver/libhttpserver
-LIBHTTPSERVER_IDIR := -I$(LIBHTTPSERVER_DIR)/src
+CLICKHOUSE_CPP_PATH := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
+CLICKHOUSE_CPP_IDIR := $(CLICKHOUSE_CPP_PATH) -I$(CLICKHOUSE_CPP_PATH)/contrib -I$(CLICKHOUSE_CPP_PATH)/contrib/absl
+CLICKHOUSE_CPP_LDIR := $(CLICKHOUSE_CPP_PATH)/clickhouse
 
-MICROHTTPD_DIR := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd
-MICROHTTPD_IDIR := -I$(MICROHTTPD_DIR) -I$(MICROHTTPD_DIR)/src/include
+LIBINJECTION_PATH := $(DEPS_PATH)/libinjection/libinjection
+LIBINJECTION_IDIR := $(LIBINJECTION_PATH)/src
+LIBINJECTION_LDIR := $(LIBINJECTION_PATH)/src
 
-COREDUMPER_DIR := $(DEPS_PATH)/coredumper/coredumper
-COREDUMPER_IDIR := $(COREDUMPER_DIR)/include
+LIBHTTPSERVER_PATH := $(DEPS_PATH)/libhttpserver/libhttpserver
+LIBHTTPSERVER_IDIR := $(LIBHTTPSERVER_PATH)/src
+LIBHTTPSERVER_LDIR := $(LIBHTTPSERVER_PATH)/build/src/.libs
 
-CURL_DIR := $(DEPS_PATH)/curl/curl
-CURL_IDIR := $(CURL_DIR)/include
+MICROHTTPD_PATH := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd
+MICROHTTPD_IDIR := $(MICROHTTPD_PATH) -I$(MICROHTTPD_PATH)/src/include
+MICROHTTPD_LDIR := $(MICROHTTPD_PATH)/src/microhttpd/.libs
 
-include ../common_mk/openssl_flags.mk
+COREDUMPER_PATH := $(DEPS_PATH)/coredumper/coredumper
+COREDUMPER_IDIR := $(COREDUMPER_PATH)/include
+COREDUMPER_LDIR := $(COREDUMPER_PATH)/src
 
-EV_DIR := $(DEPS_PATH)/libev/libev/
-EV_IDIR := $(EV_DIR)
+CURL_PATH := $(DEPS_PATH)/curl/curl
+CURL_IDIR := $(CURL_PATH)/include
+CURL_LDIR := $(CURL_PATH)/lib/.libs
 
-PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp
-PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
-PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib
+include ../common_mk/openssl_flags.mk
+
+EV_PATH := $(DEPS_PATH)/libev/libev
+EV_IDIR := $(EV_PATH)
+EV_LDIR := $(EV_PATH)/.libs
 
-LIBUSUAL_PATH=$(DEPS_PATH)/libusual/libusual
-LIBUSUAL_IDIR=$(LIBUSUAL_PATH)
-LIBUSUAL_LDIR=$(LIBUSUAL_PATH)/.libs/
+POSTGRES_PATH := $(DEPS_PATH)/postgresql/postgresql/src
+POSTGRES_IDIR := $(POSTGRES_PATH)/include -I$(POSTGRES_PATH)/interfaces/libpq
+POSTGRES_LDIR := $(POSTGRES_PATH)/interfaces/libpq -L$(POSTGRES_PATH)/common -L$(POSTGRES_PATH)/port
 
-LIBSCRAM_PATH=$(DEPS_PATH)/libscram/
-LIBSCRAM_IDIR=$(LIBSCRAM_PATH)/include/
-LIBSCRAM_LDIR=$(LIBSCRAM_PATH)/lib/
+LIBUSUAL_PATH := $(DEPS_PATH)/libusual/libusual
+LIBUSUAL_IDIR := $(LIBUSUAL_PATH)
+LIBUSUAL_LDIR := $(LIBUSUAL_PATH)/.libs
 
-POSTGRES_PATH=$(DEPS_PATH)/postgresql/postgresql/src/
-POSTGRES_IFACE=$(POSTGRES_PATH)/interfaces/libpq/ -I$(POSTGRES_PATH)/include
-POSTGRES_LDIR=$(POSTGRES_IFACES)/libpq/
+LIBSCRAM_PATH := $(DEPS_PATH)/libscram
+LIBSCRAM_IDIR := $(LIBSCRAM_PATH)/include
+LIBSCRAM_LDIR := $(LIBSCRAM_PATH)/lib
 
 IDIR := ../include
 
-IDIRS := -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) $(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_DIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_DIR) -I$(CLICKHOUSE_CPP_DIR)/contrib/ $(MICROHTTPD_IDIR) $(LIBHTTPSERVER_IDIR) $(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_DIR) -I$(PROMETHEUS_IDIR) -I$(LIBUSUAL_IDIR) -I$(LIBSCRAM_IDIR) -I$(POSTGRES_IFACE) -I$(SSL_IDIR)
+IDIRS := -I$(IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(LIBCONFIG_IDIR) -I$(RE2_IDIR) -I$(SQLITE3_IDIR) -I$(PCRE_PATH) -I/usr/local/include -I$(CLICKHOUSE_CPP_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_PATH) -I$(PROMETHEUS_IDIR) -I$(LIBUSUAL_IDIR) -I$(LIBSCRAM_IDIR) -I$(POSTGRES_IDIR) -I$(SSL_IDIR)
 ifeq ($(UNAME_S),Linux)
 	IDIRS += -I$(COREDUMPER_IDIR)
 endif
-LDIRS := -L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(INJECTION_PATH) -L$(PROMETHEUS_LDIR)
+LDIRS := -L$(JEMALLOC_PATH)/lib -L$(RE2_PATH)/obj -L$(LIBINJECTION_LDIR) -L$(PROMETHEUS_LDIR)
 
 #LIBS := -rdynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt $(EXTRALINK)
 #LIBS := -Wl,--export-dynamic -Wl,-Bstatic -ljemalloc_pic -lre2 -Wl,-Bdynamic -ldl -lpthread -lm -lz -lrt $(EXTRALINK)
@@ -175,8 +201,8 @@ HEADERS := ../include/*.h ../include/*.hpp
 $(ODIR)/%.oo: %.cpp $(HEADERS)
 	$(CXX) -fPIC -c -o $@ $< $(MYCXXFLAGS) $(CXXFLAGS)
 
-libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o
-	ar rcs $@ $(OBJ) $(OBJ_CXX) $(SQLITE3_DIR)/sqlite3.o
+libproxysql.a: $(ODIR) $(OBJ) $(OBJ_CXX) $(SQLITE3_LDIR)/sqlite3.o
+	ar rcs $@ $(OBJ) $(OBJ_CXX) $(SQLITE3_LDIR)/sqlite3.o
 
 $(ODIR):
 	mkdir $(ODIR)
diff --git a/src/Makefile b/src/Makefile
index 53d0d9b004..2d2d2b2737 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -40,12 +40,15 @@ JEMALLOC_LDIR := $(JEMALLOC_PATH)/lib
 
 LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig
 LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib
-LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/lib/.libs
+LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/out
 
 PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp
 PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
 PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib
 
+JSON_PATH := $(DEPS_PATH)/json
+JSON_IDIR := $(JSON_PATH)
+
 RE2_PATH := $(DEPS_PATH)/re2/re2
 RE2_IDIR := $(RE2_PATH)
 RE2_LDIR := $(RE2_PATH)/obj
@@ -65,8 +68,7 @@ LZ4_PATH := $(DEPS_PATH)/lz4/lz4
 LZ4_LDIR := $(LZ4_PATH)/lib
 
 CLICKHOUSE_CPP_PATH := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
-CLICKHOUSE_CPP_CDIR := $(CLICKHOUSE_CPP_PATH)/contrib
-CLICKHOUSE_CPP_IDIR := $(CLICKHOUSE_CPP_PATH)
+CLICKHOUSE_CPP_IDIR := $(CLICKHOUSE_CPP_PATH) -I$(CLICKHOUSE_CPP_PATH)/contrib -I$(CLICKHOUSE_CPP_PATH)/contrib/absl
 CLICKHOUSE_CPP_LDIR := $(CLICKHOUSE_CPP_PATH)/clickhouse
 
 LIBINJECTION_PATH := $(DEPS_PATH)/libinjection/libinjection
@@ -75,11 +77,11 @@ LIBINJECTION_LDIR := $(LIBINJECTION_PATH)/src
 
 LIBHTTPSERVER_PATH := $(DEPS_PATH)/libhttpserver/libhttpserver
 LIBHTTPSERVER_IDIR := $(LIBHTTPSERVER_PATH)/src
-LIBHTTPSERVER_LDIR := $(LIBHTTPSERVER_PATH)/build/src/.libs/
+LIBHTTPSERVER_LDIR := $(LIBHTTPSERVER_PATH)/build/src/.libs
 
-MICROHTTPD_PATH := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd/src
-MICROHTTPD_IDIR := $(MICROHTTPD_PATH)/include
-MICROHTTPD_LDIR := $(MICROHTTPD_PATH)/microhttpd/.libs
+MICROHTTPD_PATH := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd
+MICROHTTPD_IDIR := $(MICROHTTPD_PATH) -I$(MICROHTTPD_PATH)/src/include
+MICROHTTPD_LDIR := $(MICROHTTPD_PATH)/src/microhttpd/.libs
 
 COREDUMPER_PATH := $(DEPS_PATH)/coredumper/coredumper
 COREDUMPER_IDIR := $(COREDUMPER_PATH)/include
@@ -91,24 +93,26 @@ CURL_LDIR := $(CURL_PATH)/lib/.libs
 
 include ../common_mk/openssl_flags.mk
 
-EV_PATH := $(DEPS_PATH)/libev/libev/
+EV_PATH := $(DEPS_PATH)/libev/libev
 EV_IDIR := $(EV_PATH)
 EV_LDIR := $(EV_PATH)/.libs
 
-POSTGRESQL_PATH := $(DEPS_PATH)/postgresql/postgresql/src
-POSTGRESQL_IDIR := $(POSTGRESQL_PATH)/include -I$(POSTGRESQL_PATH)/interfaces/libpq
-POSTGRESQL_LDIR := $(POSTGRESQL_PATH)/interfaces/libpq -L$(POSTGRESQL_PATH)/common -L$(POSTGRESQL_PATH)/port
+POSTGRES_PATH := $(DEPS_PATH)/postgresql/postgresql/src
+POSTGRES_IDIR := $(POSTGRES_PATH)/include -I$(POSTGRES_PATH)/interfaces/libpq
+POSTGRES_LDIR := $(POSTGRES_PATH)/interfaces/libpq -L$(POSTGRES_PATH)/common -L$(POSTGRES_PATH)/port
+
+LIBUSUAL_PATH := $(DEPS_PATH)/libusual/libusual
+LIBUSUAL_IDIR := $(LIBUSUAL_PATH)
+LIBUSUAL_LDIR := $(LIBUSUAL_PATH)/.libs
 
-LIBUSUAL_PATH=$(DEPS_PATH)/libusual/libusual
-LIBUSUAL_IDIR=$(LIBUSUAL_PATH)
-LIBUSUAL_LDIR=$(LIBUSUAL_PATH)/.libs/
+LIBSCRAM_PATH := $(DEPS_PATH)/libscram
+LIBSCRAM_IDIR := $(LIBSCRAM_PATH)/include
+LIBSCRAM_LDIR := $(LIBSCRAM_PATH)/lib
 
-LIBSCRAM_PATH=$(DEPS_PATH)/libscram/
-LIBSCRAM_IDIR=$(LIBSCRAM_PATH)/include/
-LIBSCRAM_LDIR=$(LIBSCRAM_PATH)/lib/
+IDIR := ../include
 
-IDIRS := -I$(PROXYSQL_IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(LIBCONFIG_IDIR) -I$(LIBDAEMON_IDIR) -I$(RE2_IDIR) -L$(PCRE_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(PROMETHEUS_IDIR) -I$(POSTGRESQL_IDIR) -I$(LIBSCRAM_IDIR) -I$(SQLITE3_IDIR) -I$(CLICKHOUSE_CPP_IDIR) -I$(CLICKHOUSE_CPP_CDIR) -I$(SSL_IDIR) -I$(0)
-LDIRS := -L$(PROXYSQL_LDIR) -L$(JEMALLOC_LDIR) -L$(MARIADB_LDIR) -L$(LIBCONFIG_LDIR) -L$(LIBDAEMON_LDIR) -L$(RE2_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(PROMETHEUS_LDIR) -L$(POSTGRESQL_LDIR) -L$(LIBUSUAL_LDIR) -L$(LIBSCRAM_LDIR) -L$(SSL_LDIR)
+IDIRS := -I$(PROXYSQL_IDIR) -I$(JEMALLOC_IDIR) -I$(MARIADB_IDIR) -I$(LIBCONFIG_IDIR) -I$(LIBDAEMON_IDIR) -I$(RE2_IDIR) -L$(PCRE_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(LIBINJECTION_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR) -I$(PROMETHEUS_IDIR) -I$(POSTGRES_IDIR) -I$(LIBSCRAM_IDIR) -I$(LIBUSUAL_IDIR) -I$(SQLITE3_IDIR) -I$(CLICKHOUSE_CPP_IDIR) -I$(SSL_IDIR) -I$(0)
+LDIRS := -L$(PROXYSQL_LDIR) -L$(JEMALLOC_LDIR) -L$(MARIADB_LDIR) -L$(LIBCONFIG_LDIR) -L$(LIBDAEMON_LDIR) -L$(RE2_LDIR) -L$(PCRE_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(LIBINJECTION_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR) -L$(PROMETHEUS_LDIR) -L$(POSTGRES_LDIR) -L$(LIBSCRAM_LDIR) -L$(LIBUSUAL_LDIR) -L$(SQLITE3_LDIR) -L$(CLICKHOUSE_CPP_LDIR) -L$(SSL_LDIR)
 
 
 ifeq ($(UNAME_S),Linux)
@@ -240,7 +244,7 @@ $(ODIR)/%.o: %.cpp
 
 $(EXECUTABLE): $(ODIR) $(OBJ) $(LIBPROXYSQLAR)
 ifeq ($(PROXYSQLCLICKHOUSE),1)
-	$(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_LDIR)/libclickhouse-cpp-lib-static.a $(LZ4_LDIR)/liblz4.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS)
+	$(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(CLICKHOUSE_CPP_LDIR)/libclickhouse-cpp-lib.a $(LZ4_LDIR)/liblz4.a $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS)
 else
 	$(CXX) -o $@ $(OBJ) $(CLANGFIX) $(LIBPROXYSQLAR) $(MYCXXFLAGS) $(CXXFLAGS) $(LDIRS) $(LIBS) $(MYLIBS)
 endif
diff --git a/test/tap/tests/Makefile b/test/tap/tests/Makefile
index 9af58719db..53509e9ac9 100644
--- a/test/tap/tests/Makefile
+++ b/test/tap/tests/Makefile
@@ -17,68 +17,93 @@ MARIADB_PATH := $(DEPS_PATH)/mariadb-client-library/mariadb_client
 MARIADB_IDIR := $(MARIADB_PATH)/include
 MARIADB_LDIR := $(MARIADB_PATH)/libmariadb
 
-POSTGRESQL_PATH := $(DEPS_PATH)/postgresql/postgresql/src
-POSTGRESQL_IDIR := $(POSTGRESQL_PATH)/include -I$(POSTGRESQL_PATH)/interfaces/libpq
-POSTGRESQL_LDIR := $(POSTGRESQL_PATH)/interfaces/libpq -L$(POSTGRESQL_PATH)/common -L$(POSTGRESQL_PATH)/port
+LIBDAEMON_PATH := $(DEPS_PATH)/libdaemon/libdaemon
+LIBDAEMON_IDIR := $(LIBDAEMON_PATH)
+LIBDAEMON_LDIR := $(LIBDAEMON_PATH)/libdaemon/.libs
 
 JEMALLOC_PATH := $(DEPS_PATH)/jemalloc/jemalloc
 JEMALLOC_IDIR := $(JEMALLOC_PATH)/include/jemalloc
 JEMALLOC_LDIR := $(JEMALLOC_PATH)/lib
 
-JSON_IDIR := $(DEPS_PATH)/json
+LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig
+LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib
+LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/out
+
+PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp
+PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
+PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib
+
+JSON_PATH := $(DEPS_PATH)/json
+JSON_IDIR := $(JSON_PATH)
 
 RE2_PATH := $(DEPS_PATH)/re2/re2
 RE2_IDIR := $(RE2_PATH)
 RE2_LDIR := $(RE2_PATH)/obj
 
+PCRE_PATH := $(DEPS_PATH)/pcre/pcre
+PCRE_IDIR := $(PCRE_PATH)
+PCRE_LDIR := $(PCRE_PATH)/.libs
+
 SQLITE3_PATH := $(DEPS_PATH)/sqlite3/sqlite3
 SQLITE3_IDIR := $(SQLITE3_PATH)
 SQLITE3_LDIR := $(SQLITE3_PATH)
 
-LIBHTTPSERVER_DIR := $(DEPS_PATH)/libhttpserver/libhttpserver
-LIBHTTPSERVER_IDIR := $(LIBHTTPSERVER_DIR)/src
-LIBHTTPSERVER_LDIR := $(LIBHTTPSERVER_DIR)/build/src/.libs/
+CITYHASH_PATH := $(DEPS_PATH)/cityhash/cityhash
+CITYHASH_LDIR := $(CITYHASH_PATH)/src/.libs
 
-LIBCONFIG_PATH := $(DEPS_PATH)/libconfig/libconfig
-LIBCONFIG_IDIR := $(LIBCONFIG_PATH)/lib
-LIBCONFIG_LDIR := $(LIBCONFIG_PATH)/lib/.libs
+LZ4_PATH := $(DEPS_PATH)/lz4/lz4
+LZ4_LDIR := $(LZ4_PATH)/lib
 
-CURL_DIR := $(DEPS_PATH)/curl/curl
-CURL_IDIR := $(CURL_DIR)/include
-CURL_LDIR := $(CURL_DIR)/lib/.libs
+CLICKHOUSE_CPP_PATH := $(DEPS_PATH)/clickhouse-cpp/clickhouse-cpp
+CLICKHOUSE_CPP_IDIR := $(CLICKHOUSE_CPP_PATH) -I$(CLICKHOUSE_CPP_PATH)/contrib -I$(CLICKHOUSE_CPP_PATH)/contrib/absl
+CLICKHOUSE_CPP_LDIR := $(CLICKHOUSE_CPP_PATH)/clickhouse
 
-DAEMONPATH := $(DEPS_PATH)/libdaemon/libdaemon
-DAEMONPATH_IDIR := $(DAEMONPATH)
-DAEMONPATH_LDIR := $(DAEMONPATH)/libdaemon/.libs
+LIBINJECTION_PATH := $(DEPS_PATH)/libinjection/libinjection
+LIBINJECTION_IDIR := $(LIBINJECTION_PATH)/src
+LIBINJECTION_LDIR := $(LIBINJECTION_PATH)/src
 
-PCRE_PATH := $(DEPS_PATH)/pcre/pcre
-PCRE_LDIR := $(PCRE_PATH)/.libs
+LIBHTTPSERVER_PATH := $(DEPS_PATH)/libhttpserver/libhttpserver
+LIBHTTPSERVER_IDIR := $(LIBHTTPSERVER_PATH)/src
+LIBHTTPSERVER_LDIR := $(LIBHTTPSERVER_PATH)/build/src/.libs
 
-MICROHTTPD_DIR := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd/src
-MICROHTTPD_IDIR := $(MICROHTTPD_DIR)/include
-MICROHTTPD_LDIR := $(MICROHTTPD_DIR)/microhttpd/.libs
+MICROHTTPD_PATH := $(DEPS_PATH)/libmicrohttpd/libmicrohttpd
+MICROHTTPD_IDIR := $(MICROHTTPD_PATH) -I$(MICROHTTPD_PATH)/src/include
+MICROHTTPD_LDIR := $(MICROHTTPD_PATH)/src/microhttpd/.libs
 
-LIBINJECTION_DIR := $(DEPS_PATH)/libinjection/libinjection
-LIBINJECTION_IDIR := $(LIBINJECTION_DIR)/src
-LIBINJECTION_LDIR := $(LIBINJECTION_DIR)/src
+COREDUMPER_PATH := $(DEPS_PATH)/coredumper/coredumper
+COREDUMPER_IDIR := $(COREDUMPER_PATH)/include
+COREDUMPER_LDIR := $(COREDUMPER_PATH)/src
+
+CURL_PATH := $(DEPS_PATH)/curl/curl
+CURL_IDIR := $(CURL_PATH)/include
+CURL_LDIR := $(CURL_PATH)/lib/.libs
 
 include ../../../common_mk/openssl_flags.mk
 
-EV_DIR := $(DEPS_PATH)/libev/libev/
-EV_IDIR := $(EV_DIR)
-EV_LDIR := $(EV_DIR)/.libs
+EV_PATH := $(DEPS_PATH)/libev/libev
+EV_IDIR := $(EV_PATH)
+EV_LDIR := $(EV_PATH)/.libs
 
-PROMETHEUS_PATH := $(DEPS_PATH)/prometheus-cpp/prometheus-cpp
-PROMETHEUS_IDIR := $(PROMETHEUS_PATH)/pull/include -I$(PROMETHEUS_PATH)/core/include
-PROMETHEUS_LDIR := $(PROMETHEUS_PATH)/lib
+POSTGRES_PATH := $(DEPS_PATH)/postgresql/postgresql/src
+POSTGRES_IDIR := $(POSTGRES_PATH)/include -I$(POSTGRES_PATH)/interfaces/libpq
+POSTGRES_LDIR := $(POSTGRES_PATH)/interfaces/libpq -L$(POSTGRES_PATH)/common -L$(POSTGRES_PATH)/port
+
+LIBUSUAL_PATH := $(DEPS_PATH)/libusual/libusual
+LIBUSUAL_IDIR := $(LIBUSUAL_PATH)
+LIBUSUAL_LDIR := $(LIBUSUAL_PATH)/.libs
 
-CITYHASH_DIR := $(DEPS_PATH)/cityhash/cityhash/
-CITYHASH_IDIR := $(CITYHASH_DIR)
-CITYHASH_LDIR := $(CITYHASH_DIR)/src/.libs
+LIBSCRAM_PATH := $(DEPS_PATH)/libscram
+LIBSCRAM_IDIR := $(LIBSCRAM_PATH)/include
+LIBSCRAM_LDIR := $(LIBSCRAM_PATH)/lib
+
+CITYHASH_PATH := $(DEPS_PATH)/cityhash/cityhash
+CITYHASH_IDIR := $(CITYHASH_PATH)
+CITYHASH_LDIR := $(CITYHASH_PATH)/src/.libs
+
+LIBINJECTION_PATH := $(DEPS_PATH)/libinjection/libinjection
+LIBINJECTION_IDIR := $(LIBINJECTION_PATH)/src
+LIBINJECTION_LDIR := $(LIBINJECTION_PATH)/src
 
-COREDUMPER_DIR := $(DEPS_PATH)/coredumper/coredumper
-COREDUMPER_IDIR := $(COREDUMPER_DIR)/include
-COREDUMPER_LDIR := $(COREDUMPER_DIR)/src
 
 TAP_PATH := ../tap
 TAP_IDIR := ../tap
@@ -96,24 +121,12 @@ TEST_MARIADB_LDIR := $(TEST_MARIADB_PATH)/libmariadb
 
 TEST_MYSQL_PATH := $(TEST_DEPS_PATH)/mysql-connector-c/mysql-connector-c
 TEST_MYSQL_IDIR := $(TEST_MYSQL_PATH)/include
-TEST_MYSQL_EDIR := $(TEST_MYSQL_PATH)/libbinlogevents/export/
+TEST_MYSQL_EDIR := $(TEST_MYSQL_PATH)/libbinlogevents/export
 TEST_MYSQL_LDIR := $(TEST_MYSQL_PATH)/libmysql
 
-POSTGRESQL_PATH := $(DEPS_PATH)/postgresql/postgresql/src
-POSTGRESQL_IDIR := $(POSTGRESQL_PATH)/include -I$(POSTGRESQL_PATH)/interfaces/libpq
-POSTGRESQL_LDIR := $(POSTGRESQL_PATH)/interfaces/libpq -L$(POSTGRESQL_PATH)/common -L$(POSTGRESQL_PATH)/port
-
-LIBUSUAL_PATH := $(DEPS_PATH)/libusual/libusual
-LIBUSUAL_IDIR := $(LIBUSUAL_PATH)
-LIBUSUAL_LDIR := $(LIBUSUAL_PATH)/.libs/
-
-LIBSCRAM_PATH := $(DEPS_PATH)/libscram/
-LIBSCRAM_IDIR := $(LIBSCRAM_PATH)/include/
-LIBSCRAM_LDIR := $(LIBSCRAM_PATH)/lib/
-
 TEST_MYSQL8_PATH := $(TEST_DEPS_PATH)/mysql-connector-c-8.4.0/mysql-connector-c
 TEST_MYSQL8_IDIR := $(TEST_MYSQL8_PATH)/include
-TEST_MYSQL8_EDIR := $(TEST_MYSQL8_PATH)/libbinlogevents/export/
+TEST_MYSQL8_EDIR := $(TEST_MYSQL8_PATH)/libbinlogevents/export
 TEST_MYSQL8_LDIR := $(TEST_MYSQL8_PATH)/libmysql
 
 LIBPROXYSQLAR := $(PROXYSQL_LDIR)/libproxysql.a
@@ -125,13 +138,13 @@ EXECUTABLE := proxysql
 OBJ := $(PROXYSQL_PATH)/src/obj/proxysql_global.o $(PROXYSQL_PATH)/src/obj/main.o $(PROXYSQL_PATH)/src/obj/proxy_tls.o
 
 IDIRS := -I$(TAP_IDIR) -I$(RE2_IDIR) -I$(PROXYSQL_IDIR) -I$(JEMALLOC_IDIR) -I$(LIBCONFIG_IDIR) -I$(MARIADB_IDIR)\
-		 -I$(DAEMONPATH_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR)\
-		 -I$(PROMETHEUS_IDIR) -I$(DOTENV_DYN_IDIR) -I$(SQLITE3_IDIR) -I$(JSON_IDIR) -I$(POSTGRESQL_IDIR)\
+		 -I$(LIBDAEMON_IDIR) -I$(MICROHTTPD_IDIR) -I$(LIBHTTPSERVER_IDIR) -I$(CURL_IDIR) -I$(EV_IDIR)\
+		 -I$(PROMETHEUS_IDIR) -I$(DOTENV_DYN_IDIR) -I$(SQLITE3_IDIR) -I$(JSON_IDIR) -I$(POSTGRES_IDIR)\
 		 -I$(LIBSCRAM_IDIR) -I$(LIBUSUAL_IDIR) -I$(SSL_IDIR)
 
 LDIRS := -L$(TAP_LDIR) -L$(RE2_LDIR) -L$(PROXYSQL_LDIR) -L$(JEMALLOC_LDIR) -L$(LIBCONFIG_LDIR) -L$(MARIADB_LDIR)\
-		 -L$(DAEMONPATH_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR)\
-		 -L$(PROMETHEUS_LDIR) -L$(DOTENV_DYN_LDIR) -L$(PCRE_LDIR) -L$(LIBINJECTION_LDIR) -L$(POSTGRESQL_LDIR)\
+		 -L$(LIBDAEMON_LDIR) -L$(MICROHTTPD_LDIR) -L$(LIBHTTPSERVER_LDIR) -L$(CURL_LDIR) -L$(EV_LDIR)\
+		 -L$(PROMETHEUS_LDIR) -L$(DOTENV_DYN_LDIR) -L$(PCRE_LDIR) -L$(LIBINJECTION_LDIR) -L$(POSTGRES_LDIR)\
 		 -L$(LIBSCRAM_LDIR) -L$(LIBUSUAL_LDIR) -L$(SSL_LDIR)
 
 #SOURCES := ../tap/utils.cpp