diff --git a/contrib/annoy-cmake/CMakeLists.txt b/contrib/annoy-cmake/CMakeLists.txt
index bdef7d92132..f6579c12412 100644
--- a/contrib/annoy-cmake/CMakeLists.txt
+++ b/contrib/annoy-cmake/CMakeLists.txt
@@ -20,5 +20,4 @@ add_library(_annoy INTERFACE)
 target_include_directories(_annoy SYSTEM INTERFACE ${ANNOY_SOURCE_DIR})
 
 add_library(ch_contrib::annoy ALIAS _annoy)
-target_compile_definitions(_annoy INTERFACE ENABLE_ANNOY)
 target_compile_definitions(_annoy INTERFACE ANNOYLIB_MULTITHREADED_BUILD)
diff --git a/contrib/usearch-cmake/CMakeLists.txt b/contrib/usearch-cmake/CMakeLists.txt
index 0b6f60e106b..6be622275ae 100644
--- a/contrib/usearch-cmake/CMakeLists.txt
+++ b/contrib/usearch-cmake/CMakeLists.txt
@@ -12,4 +12,3 @@ target_include_directories(_usearch SYSTEM INTERFACE
     ${USEARCH_PROJECT_DIR}/include)
 
 add_library(ch_contrib::usearch ALIAS _usearch)
-target_compile_definitions(_usearch INTERFACE ENABLE_USEARCH)
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index e3f8882850f..0fa5f4313b2 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -58,6 +58,8 @@
 #cmakedefine01 USE_FILELOG
 #cmakedefine01 USE_ODBC
 #cmakedefine01 USE_BLAKE3
+#cmakedefine01 USE_ANNOY
+#cmakedefine01 USE_USEARCH
 #cmakedefine01 USE_SKIM
 #cmakedefine01 USE_PRQL
 #cmakedefine01 USE_ULID
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 901d7c61167..0ec7bde933c 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -52,6 +52,8 @@
 #include <memory>
 #include <unordered_map>
 
+#include "config.h"
+
 using namespace DB;
 
 namespace
@@ -1476,11 +1478,11 @@ static void buildIndexes(
                 MergeTreeIndexConditionPtr condition;
                 if (index_helper->isVectorSearch())
                 {
-#ifdef ENABLE_ANNOY
+#if USE_ANNOY
                     if (const auto * annoy = typeid_cast<const MergeTreeIndexAnnoy *>(index_helper.get()))
                         condition = annoy->createIndexCondition(query_info, context);
 #endif
-#ifdef ENABLE_USEARCH
+#if USE_USEARCH
                     if (const auto * usearch = typeid_cast<const MergeTreeIndexUSearch *>(index_helper.get()))
                         condition = usearch->createIndexCondition(query_info, context);
 #endif
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
index b68e48eeb3a..cec0e0926f0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.cpp
@@ -1,7 +1,7 @@
-#ifdef ENABLE_ANNOY
-
 #include <Storages/MergeTree/MergeTreeIndexAnnoy.h>
 
+#if USE_ANNOY
+
 #include <Columns/ColumnArray.h>
 #include <Common/typeid_cast.h>
 #include <Core/Field.h>
diff --git a/src/Storages/MergeTree/MergeTreeIndexAnnoy.h b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
index 282920c608e..8e0e0e621a0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
+++ b/src/Storages/MergeTree/MergeTreeIndexAnnoy.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#ifdef ENABLE_ANNOY
+#include "config.h"
+
+#if USE_ANNOY
 
 #include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp b/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp
index efd9bb754e1..5a532803d84 100644
--- a/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexUSearch.cpp
@@ -1,10 +1,10 @@
-#ifdef ENABLE_USEARCH
+#include <Storages/MergeTree/MergeTreeIndexUSearch.h>
+
+#if USE_USEARCH
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpass-failed"
 
-#include <Storages/MergeTree/MergeTreeIndexUSearch.h>
-
 #include <Columns/ColumnArray.h>
 #include <Common/typeid_cast.h>
 #include <Core/Field.h>
diff --git a/src/Storages/MergeTree/MergeTreeIndexUSearch.h b/src/Storages/MergeTree/MergeTreeIndexUSearch.h
index e6068790d22..6923ef2f807 100644
--- a/src/Storages/MergeTree/MergeTreeIndexUSearch.h
+++ b/src/Storages/MergeTree/MergeTreeIndexUSearch.h
@@ -1,12 +1,16 @@
 #pragma once
 
-#ifdef ENABLE_USEARCH
+#include "config.h"
 
-#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
+#if USE_USEARCH
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpass-failed"
+
+#include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
+
 #include <usearch/index_dense.hpp>
+
 #pragma clang diagnostic pop
 
 namespace DB
diff --git a/src/Storages/MergeTree/MergeTreeIndices.cpp b/src/Storages/MergeTree/MergeTreeIndices.cpp
index bded961db8e..32ac629e706 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndices.cpp
@@ -127,12 +127,12 @@ MergeTreeIndexFactory::MergeTreeIndexFactory()
     registerCreator("hypothesis", hypothesisIndexCreator);
 
     registerValidator("hypothesis", hypothesisIndexValidator);
-#ifdef ENABLE_ANNOY
+#if USE_ANNOY
     registerCreator("annoy", annoyIndexCreator);
     registerValidator("annoy", annoyIndexValidator);
 #endif
 
-#ifdef ENABLE_USEARCH
+#if USE_USEARCH
     registerCreator("usearch", usearchIndexCreator);
     registerValidator("usearch", usearchIndexValidator);
 #endif
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index 1be73e1c811..355f1b69356 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -15,6 +15,7 @@
 #include <Interpreters/ExpressionActions.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 
+#include "config.h"
 
 constexpr auto INDEX_FILE_PREFIX = "skp_idx_";
 
@@ -230,12 +231,12 @@ void bloomFilterIndexValidator(const IndexDescription & index, bool attach);
 MergeTreeIndexPtr hypothesisIndexCreator(const IndexDescription & index);
 void hypothesisIndexValidator(const IndexDescription & index, bool attach);
 
-#ifdef ENABLE_ANNOY
+#if USE_ANNOY
 MergeTreeIndexPtr annoyIndexCreator(const IndexDescription & index);
 void annoyIndexValidator(const IndexDescription & index, bool attach);
 #endif
 
-#ifdef ENABLE_USEARCH
+#if USE_USEARCH
 MergeTreeIndexPtr usearchIndexCreator(const IndexDescription& index);
 void usearchIndexValidator(const IndexDescription& index, bool attach);
 #endif
diff --git a/src/configure_config.cmake b/src/configure_config.cmake
index 5b24f79ef6e..702875b1f40 100644
--- a/src/configure_config.cmake
+++ b/src/configure_config.cmake
@@ -164,6 +164,12 @@ endif()
 if (TARGET ch_contrib::bcrypt)
     set(USE_BCRYPT 1)
 endif()
+if (TARGET ch_contrib::annoy)
+    set(USE_ANNOY 1)
+endif()
+if (TARGET ch_contrib::usearch)
+    set(USE_USEARCH 1)
+endif()
 if (TARGET ch_contrib::ssh)
     set(USE_SSH 1)
 endif()