diff --git a/contrib/qpl-cmake/CMakeLists.txt b/contrib/qpl-cmake/CMakeLists.txt
index e62612cff5a..89332ae0f7a 100644
--- a/contrib/qpl-cmake/CMakeLists.txt
+++ b/contrib/qpl-cmake/CMakeLists.txt
@@ -728,10 +728,6 @@ add_library(_qpl STATIC ${LIB_DEPS})
target_include_directories(_qpl
PUBLIC $ $)
-
-target_compile_definitions(_qpl
- PUBLIC -DENABLE_QPL_COMPRESSION)
-
target_link_libraries(_qpl
PRIVATE ch_contrib::accel-config)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db3ef0f489f..eba04d93df5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -556,6 +556,8 @@ target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::lz4)
if (TARGET ch_contrib::qpl)
dbms_target_link_libraries(PUBLIC ch_contrib::qpl)
+ target_link_libraries (clickhouse_compression PUBLIC ch_contrib::qpl)
+ target_link_libraries (clickhouse_compression PUBLIC ch_contrib::accel-config)
endif ()
if (TARGET ch_contrib::accel-config)
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index 56a067b06e8..1680cde22a2 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -32,6 +32,7 @@
#cmakedefine01 USE_IDNA
#cmakedefine01 USE_NLP
#cmakedefine01 USE_VECTORSCAN
+#cmakedefine01 USE_QPL
#cmakedefine01 USE_LIBURING
#cmakedefine01 USE_AVRO
#cmakedefine01 USE_CAPNP
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
index f1b5b24e866..c82ee861a6f 100644
--- a/src/Compression/CompressionCodecDeflateQpl.cpp
+++ b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -1,7 +1,3 @@
-#ifdef ENABLE_QPL_COMPRESSION
-
-#include
-#include
#include
#include
#include
@@ -11,6 +7,10 @@
#include
#include
#include
+#include
+#include
+
+#if USE_QPL
#include "libaccel_config.h"
diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
index 86fd9051bd8..d9abc0fb7e0 100644
--- a/src/Compression/CompressionCodecDeflateQpl.h
+++ b/src/Compression/CompressionCodecDeflateQpl.h
@@ -4,6 +4,11 @@
#include