diff --git a/configure.py b/configure.py
index 2aaf658c7d..20b22ded5d 100755
--- a/configure.py
+++ b/configure.py
@@ -668,6 +668,7 @@ scylla_core = (['message/messaging_service.cc',
                 'caching_options.cc',
                 'collection_mutation.cc',
                 'client_data.cc',
+                'debug.cc',
                 'hashers.cc',
                 'schema.cc',
                 'frozen_schema.cc',
diff --git a/debug.cc b/debug.cc
new file mode 100644
index 0000000000..7861013d27
--- /dev/null
+++ b/debug.cc
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2023-present ScyllaDB
+ */
+
+/*
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include "debug.hh"
+
+namespace debug {
+
+seastar::sharded<replica::database>* the_database = nullptr;
+
+}
diff --git a/main.cc b/main.cc
index 69c1d52f58..2d7516b354 100644
--- a/main.cc
+++ b/main.cc
@@ -435,7 +435,6 @@ sharded<cql3::query_processor>* the_query_processor;
 sharded<qos::service_level_controller>* the_sl_controller;
 sharded<service::migration_manager>* the_migration_manager;
 sharded<service::storage_service>* the_storage_service;
-sharded<replica::database>* the_database;
 sharded<streaming::stream_manager> *the_stream_manager;
 sharded<gms::feature_service> *the_feature_service;
 sharded<gms::gossiper> *the_gossiper;
@@ -1747,7 +1746,7 @@ static main_func_type lookup_main_func(std::string_view name) {
         {"types", tools::scylla_types_main},
         {"sstable", tools::scylla_sstable_main},
     };
-    auto found = std::ranges::find_if(funcs, [name](auto& name_and_func) {
+    auto found = std::ranges::find_if(funcs, [name] (auto& name_and_func) {
         return name_and_func.first == name;
     });
     if (found == std::end(funcs)) {
diff --git a/test/lib/cql_test_env.cc b/test/lib/cql_test_env.cc
index 7e79352fa2..e5cf910904 100644
--- a/test/lib/cql_test_env.cc
+++ b/test/lib/cql_test_env.cc
@@ -973,9 +973,3 @@ cql_test_config raft_cql_test_config() {
     c.db_config->consistent_cluster_management(true);
     return c;
 }
-
-namespace debug {
-
-seastar::sharded<replica::database>* the_database;
-
-}