From ff24926fe4374995abcfb606ef880e146eb40647 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Fri, 3 Jan 2025 19:22:48 +0200
Subject: [PATCH] httpd: drop unnecessary dependencies from httpd.hh

Downstream files are updated to re-add necessary dependencies.

This reduces include load, especially app-template.hh, which pulls
in a bunch of boost dependencies.

Closes #2607
---
 apps/httpd/main.cc            | 1 +
 include/seastar/http/httpd.hh | 2 --
 src/core/prometheus.cc        | 1 +
 tests/unit/rest_api_httpd.cc  | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/httpd/main.cc b/apps/httpd/main.cc
index 50fdc231d12..21ed6a68e6d 100644
--- a/apps/httpd/main.cc
+++ b/apps/httpd/main.cc
@@ -26,6 +26,7 @@
 #include <seastar/http/file_handler.hh>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/reactor.hh>
+#include <seastar/core/app-template.hh>
 #include "demo.json.hh"
 #include <seastar/http/api_docs.hh>
 #include <seastar/core/thread.hh>
diff --git a/include/seastar/http/httpd.hh b/include/seastar/http/httpd.hh
index 87ebb0ad36a..641c6b0aba3 100644
--- a/include/seastar/http/httpd.hh
+++ b/include/seastar/http/httpd.hh
@@ -31,8 +31,6 @@
 #include <seastar/http/request.hh>
 #include <seastar/core/seastar.hh>
 #include <seastar/core/sstring.hh>
-#include <seastar/core/app-template.hh>
-#include <seastar/core/circular_buffer.hh>
 #include <seastar/core/distributed.hh>
 #include <seastar/core/queue.hh>
 #include <seastar/core/gate.hh>
diff --git a/src/core/prometheus.cc b/src/core/prometheus.cc
index 95889a23e5a..642e041b6f2 100644
--- a/src/core/prometheus.cc
+++ b/src/core/prometheus.cc
@@ -28,6 +28,7 @@
 #include <sstream>
 
 #include <seastar/core/metrics_api.hh>
+#include <seastar/core/scollectd.hh>
 #include <seastar/http/function_handlers.hh>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/range/algorithm_ext/erase.hpp>
diff --git a/tests/unit/rest_api_httpd.cc b/tests/unit/rest_api_httpd.cc
index db29247f932..2edff75366a 100644
--- a/tests/unit/rest_api_httpd.cc
+++ b/tests/unit/rest_api_httpd.cc
@@ -27,6 +27,7 @@
 #include <seastar/http/function_handlers.hh>
 #include <seastar/http/file_handler.hh>
 #include <seastar/core/seastar.hh>
+#include <seastar/core/app-template.hh>
 #include <seastar/http/api_docs.hh>
 #include <seastar/core/thread.hh>
 #include <seastar/net/inet_address.hh>