common/cmdparse: include cleanup

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc
index 009e6678c9861ab5da7d21679e04f86910cb5b5a..d1128fcfc3528425c08e45b28d5cef6a69c02551 100644 (file)
--- a/src/common/cmdparse.cc
+++ b/src/common/cmdparse.cc
@@ -13,12 +13,18 @@
  */
 
 #include "include/common_fwd.h"
+#include "common/BackTrace.h"
 #include "common/cmdparse.h"
 #include "common/Formatter.h"
 #include "common/debug.h"
 #include "common/strtol.h"
+#include "include/ceph_assert.h"       // boost clobbers this
+#include "include/types.h" // for operator<<(std::vector)
 #include "json_spirit/json_spirit.h"
 
+#include <ostream>
+#include <sstream>
+
 using std::is_same_v;
 using std::ostringstream;
 using std::string;

diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h
index fb7fb77f7b7ad939ef4caf79046db3e084e36f94..d4a5c11398f05b5633a2a9cd2665601fba7858c0 100644 (file)
--- a/src/common/cmdparse.h
+++ b/src/common/cmdparse.h
@@ -4,14 +4,15 @@
 #define CEPH_COMMON_CMDPARSE_H
 
 #include <vector>
-#include <stdexcept>
+#include <exception>
+#include <map>
+#include <string>
 #include <optional>
-#include <ostream>
+#include <iosfwd>
 #include <boost/variant.hpp>
-#include "include/ceph_assert.h"       // boost clobbers this
 #include "include/common_fwd.h"
-#include "common/Formatter.h"
-#include "common/BackTrace.h"
+
+namespace ceph { class Formatter; }
 
 typedef boost::variant<std::string,
                       bool,