diff --git a/idl/uuid.idl.hh b/idl/uuid.idl.hh
index 567a30c610..65db413038 100644
--- a/idl/uuid.idl.hh
+++ b/idl/uuid.idl.hh
@@ -8,7 +8,7 @@
 
 #include "utils/UUID.hh"
 #include "schema/schema_fwd.hh"
-#include "query-request.hh"
+#include "query_id.hh"
 #include "locator/host_id.hh"
 #include "tasks/types.hh"
 
diff --git a/query-request.hh b/query-request.hh
index 58cacc3672..e8b510c8e3 100644
--- a/query-request.hh
+++ b/query-request.hh
@@ -23,6 +23,7 @@
 #include "utils/small_vector.hh"
 #include "query_class_config.hh"
 #include "db/per_partition_rate_limit_info.hh"
+#include "query_id.hh"
 #include "utils/UUID.hh"
 #include "bytes.hh"
 #include "cql_serialization_format.hh"
@@ -31,8 +32,6 @@ class position_in_partition_view;
 class position_in_partition;
 class partition_slice_builder;
 
-using query_id = utils::tagged_uuid<struct query_id_tag>;
-
 namespace query {
 
 using column_id_vector = utils::small_vector<column_id, 8>;
diff --git a/query_id.hh b/query_id.hh
new file mode 100644
index 0000000000..6f3b12fd35
--- /dev/null
+++ b/query_id.hh
@@ -0,0 +1,8 @@
+// Copyright (C) 2023-present ScyllaDB
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+#pragma once
+
+#include "utils/UUID.hh"
+
+using query_id = utils::tagged_uuid<struct query_id_tag>;