From c1b493726795d6475dbb9839dcd9d5da66cb8ac1 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@ionos.com>
Date: Mon, 7 Oct 2024 20:51:12 +0200
Subject: [PATCH] common/admin_socket: add missing includes

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
 src/common/admin_finisher.h       | 2 +-
 src/common/admin_socket.cc        | 9 ++++++++-
 src/common/admin_socket.h         | 6 ++++++
 src/common/admin_socket_client.cc | 5 ++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/common/admin_finisher.h b/src/common/admin_finisher.h
index f087b5edf47..c4d921b830c 100644
--- a/src/common/admin_finisher.h
+++ b/src/common/admin_finisher.h
@@ -16,6 +16,6 @@
 #include <functional>
 #include <string_view>
 
-#include "include/buffer.h"
+#include "include/buffer_fwd.h"
 
 typedef std::function<void(int,std::string_view,ceph::buffer::list&)> asok_finisher;
diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index 55b87de3207..b345d7cfb2c 100644
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -11,6 +11,9 @@
  * Foundation.  See file COPYING.
  *
  */
+
+#include "common/admin_socket.h"
+
 #include <poll.h>
 #include <signal.h>
 #include <sys/un.h>
@@ -19,11 +22,11 @@
 #include <sys/wait.h>
 #endif
 
+#include <iomanip>
 #include <optional>
 
 #include <stdlib.h>
 
-#include "common/admin_socket.h"
 #include "common/admin_socket_client.h"
 #include "common/dout.h"
 #include "common/errno.h"
@@ -47,6 +50,10 @@
 #include "include/sock_compat.h"
 #include "fmt/format.h"
 
+#ifdef _WIN32
+#include "include/util.h" // for get_windows_version()
+#endif
+
 #define dout_subsys ceph_subsys_asok
 #undef dout_prefix
 #define dout_prefix *_dout << "asok(" << (void*)m_cct << ") "
diff --git a/src/common/admin_socket.h b/src/common/admin_socket.h
index 4e2f2683466..9f7f8339577 100644
--- a/src/common/admin_socket.h
+++ b/src/common/admin_socket.h
@@ -20,7 +20,9 @@
 #else
 
 #include <condition_variable>
+#include <list>
 #include <mutex>
+#include <sstream>
 #include <string>
 #include <string_view>
 #include <thread>
@@ -31,6 +33,10 @@
 #include "common/ref.h"
 #include "common/cmdparse.h"
 
+#ifdef WIN32
+#include "include/win32/fs_compat.h" // for uid_t, gid_t
+#endif
+
 class MCommand;
 class MMonCommand;
 
diff --git a/src/common/admin_socket_client.cc b/src/common/admin_socket_client.cc
index aeddc100fc0..1bd2c8822a3 100644
--- a/src/common/admin_socket_client.cc
+++ b/src/common/admin_socket_client.cc
@@ -12,6 +12,8 @@
  *
  */
 
+#include "common/admin_socket_client.h"
+
 #include <arpa/inet.h>
 #include <fcntl.h>
 #include <sys/socket.h>
@@ -21,11 +23,12 @@
 #include "common/admin_socket.h"
 #include "common/errno.h"
 #include "common/safe_io.h"
-#include "common/admin_socket_client.h"
 
 #include "include/compat.h"
 #include "include/sock_compat.h"
 
+#include <sstream>
+
 using std::ostringstream;
 
 const char* get_rand_socket_path()
-- 
2.47.3