From c49ef4f902a35dd929f718fdb2e3c9160081e771 Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 24 Dec 2024 17:12:34 +0100
Subject: [PATCH] dnsdist: Clean up the dnsdist protobuf header

---
 pdns/dnsdistdist/dnsdist-protobuf.hh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pdns/dnsdistdist/dnsdist-protobuf.hh b/pdns/dnsdistdist/dnsdist-protobuf.hh
index c2dee817daf3..13d035749e60 100644
--- a/pdns/dnsdistdist/dnsdist-protobuf.hh
+++ b/pdns/dnsdistdist/dnsdist-protobuf.hh
@@ -21,12 +21,18 @@
  */
 #pragma once
 
-#include "dnsdist.hh"
 #include "dnsname.hh"
 
 #ifndef DISABLE_PROTOBUF
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/key_extractors.hpp>
+
 #include "protozero.hh"
 
+struct DNSQuestion;
+struct DNSResponse;
+
 class DNSDistProtoBufMessage
 {
 public:
@@ -146,9 +152,9 @@ class ProtoBufMetaKey
 
   using TypeContainer = boost::multi_index_container<
     KeyTypeDescription,
-    indexed_by<
-      hashed_unique<tag<NameTag>, member<KeyTypeDescription, const std::string, &KeyTypeDescription::d_name>>,
-      hashed_unique<tag<TypeTag>, member<KeyTypeDescription, const Type, &KeyTypeDescription::d_type>>>>;
+    boost::multi_index::indexed_by<
+      boost::multi_index::hashed_unique<boost::multi_index::tag<NameTag>, boost::multi_index::member<KeyTypeDescription, const std::string, &KeyTypeDescription::d_name>>,
+      boost::multi_index::hashed_unique<boost::multi_index::tag<TypeTag>, boost::multi_index::member<KeyTypeDescription, const Type, &KeyTypeDescription::d_type>>>>;
 
   static const TypeContainer s_types;