From 2f3cd6085517d12699eef2a7ae0397116a9b195d Mon Sep 17 00:00:00 2001
From: Brad Hubbard <bhubbard@redhat.com>
Date: Wed, 10 May 2017 11:20:35 +1000
Subject: [PATCH] common: Remove redundant includes

Fixes: http://tracker.ceph.com/issues/19883 (Partially)

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---
 src/common/ConfUtils.cc                | 3 ---
 src/common/Formatter.cc                | 4 ----
 src/common/Formatter.h                 | 4 +++-
 src/common/HTMLFormatter.cc            | 9 +--------
 src/common/HTMLFormatter.h             | 8 --------
 src/common/SloppyCRCMap.cc             | 3 ++-
 src/common/SloppyCRCMap.h              | 5 +++--
 src/common/blkdev.cc                   | 1 -
 src/common/ceph_fs.cc                  | 2 --
 src/common/crc32c_intel_baseline.c     | 2 --
 src/common/mime.c                      | 1 -
 src/common/pipe.c                      | 2 ++
 src/common/run_cmd.cc                  | 1 -
 src/common/strtol.cc                   | 1 +
 src/common/strtol.h                    | 1 -
 src/common/utf8.c                      | 1 -
 src/common/version.cc                  | 1 -
 src/common/xattr.c                     | 1 -
 src/include/crc32c.h                   | 3 +--
 src/include/msgr.h                     | 2 ++
 src/include/str_list.h                 | 1 -
 src/test/common/test_sloppy_crc_map.cc | 4 ++++
 src/test/formatter.cc                  | 1 +
 23 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc
index b8e8edbce022e..135e7da17abf0 100644
--- a/src/common/ConfUtils.cc
+++ b/src/common/ConfUtils.cc
@@ -14,7 +14,6 @@
 
 #include <algorithm>
 #include <errno.h>
-#include <list>
 #include <map>
 #include <sstream>
 #include <stdio.h>
@@ -22,8 +21,6 @@
 #include <string.h>
 #include <string>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 #include <iostream>
 
 #include "include/buffer.h"
diff --git a/src/common/Formatter.cc b/src/common/Formatter.cc
index 0bbbdd361ec95..00a9b3849ca3e 100644
--- a/src/common/Formatter.cc
+++ b/src/common/Formatter.cc
@@ -14,8 +14,6 @@
 
 #define LARGE_SIZE 1024
 
-#include "include/int_types.h"
-
 #include "assert.h"
 #include "Formatter.h"
 #include "HTMLFormatter.h"
@@ -23,11 +21,9 @@
 #include "include/buffer.h"
 
 #include <algorithm>
-#include <iostream>
 #include <sstream>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <vector>
 #include <string>
 #include <set>
diff --git a/src/common/Formatter.h b/src/common/Formatter.h
index a4cf3e13cd58c..a23266ac4adf7 100644
--- a/src/common/Formatter.h
+++ b/src/common/Formatter.h
@@ -9,8 +9,10 @@
 #include <iosfwd>
 #include <list>
 #include <vector>
-#include <sstream>
 #include <stdarg.h>
+#include <stddef.h>
+#include <utility>
+#include <sstream>
 #include <string>
 #include <map>
 
diff --git a/src/common/HTMLFormatter.cc b/src/common/HTMLFormatter.cc
index 63474adbc1a32..11004cc4879e0 100644
--- a/src/common/HTMLFormatter.cc
+++ b/src/common/HTMLFormatter.cc
@@ -14,22 +14,15 @@
 
 #define LARGE_SIZE 1024
 
-#include "include/int_types.h"
-
-#include "assert.h"
 #include "Formatter.h"
 #include "HTMLFormatter.h"
-#include "common/escape.h"
 
-#include <iostream>
 #include <sstream>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <vector>
 #include <string>
-#include <set>
-#include <boost/format.hpp>
+#include <string.h>     // for strdup
 
 // -----------------------
 namespace ceph {
diff --git a/src/common/HTMLFormatter.h b/src/common/HTMLFormatter.h
index 23fc8765599ae..19d056f76af88 100644
--- a/src/common/HTMLFormatter.h
+++ b/src/common/HTMLFormatter.h
@@ -3,18 +3,10 @@
 #ifndef CEPH_HTML_FORMATTER_H
 #define CEPH_HTML_FORMATTER_H
 
-#include "include/int_types.h"
-
-#include <deque>
 #include <iosfwd>
-#include <list>
-#include <vector>
-#include <sstream>
 #include <stdarg.h>
 #include <string>
-#include <map>
 
-#include "include/buffer.h"
 #include "Formatter.h"
 
 namespace ceph {
diff --git a/src/common/SloppyCRCMap.cc b/src/common/SloppyCRCMap.cc
index 7924ae6e8a7e6..c637f7a257ac2 100644
--- a/src/common/SloppyCRCMap.cc
+++ b/src/common/SloppyCRCMap.cc
@@ -2,7 +2,8 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "common/SloppyCRCMap.h"
-#include "common/Formatter.h"
+
+using namespace std;
 
 void SloppyCRCMap::write(uint64_t offset, uint64_t len, const bufferlist& bl,
 			 std::ostream *out)
diff --git a/src/common/SloppyCRCMap.h b/src/common/SloppyCRCMap.h
index 34642a325394d..78c470c1887b2 100644
--- a/src/common/SloppyCRCMap.h
+++ b/src/common/SloppyCRCMap.h
@@ -4,9 +4,10 @@
 #ifndef CEPH_COMMON_SLOPPYCRCMAP_H
 #define CEPH_COMMON_SLOPPYCRCMAP_H
 
-#include "include/types.h"
 #include "include/encoding.h"
+#include "common/Formatter.h"
 
+#include <list>
 #include <map>
 #include <ostream>
 
@@ -69,7 +70,7 @@ public:
   void encode(bufferlist& bl) const;
   void decode(bufferlist::iterator& bl);
   void dump(Formatter *f) const;
-  static void generate_test_instances(list<SloppyCRCMap*>& ls);
+  static void generate_test_instances(std::list<SloppyCRCMap*>& ls);
 };
 WRITE_CLASS_ENCODER(SloppyCRCMap)
 
diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
index 361a7738bd452..11bd954103b92 100644
--- a/src/common/blkdev.cc
+++ b/src/common/blkdev.cc
@@ -18,7 +18,6 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <stdlib.h>
-#include "include/int_types.h"
 #include "include/uuid.h"
 
 #ifdef __linux__
diff --git a/src/common/ceph_fs.cc b/src/common/ceph_fs.cc
index 923e38b59d004..ce9873121c2cf 100644
--- a/src/common/ceph_fs.cc
+++ b/src/common/ceph_fs.cc
@@ -4,8 +4,6 @@
  *
  */
 
-#include <errno.h>
-
 /*
  * Some non-inline ceph helpers
  */
diff --git a/src/common/crc32c_intel_baseline.c b/src/common/crc32c_intel_baseline.c
index 390898171df6a..2862f627246e3 100644
--- a/src/common/crc32c_intel_baseline.c
+++ b/src/common/crc32c_intel_baseline.c
@@ -36,8 +36,6 @@
 
 #include "include/int_types.h"
 
-#include <stdlib.h>
-
 #define MAX_ITER	8
 
 unsigned long crc32_table_iscsi_base[256] = {
diff --git a/src/common/mime.c b/src/common/mime.c
index 90c19a7684e6f..fe45123ccc94c 100644
--- a/src/common/mime.c
+++ b/src/common/mime.c
@@ -15,7 +15,6 @@
 
 #include <errno.h>
 #include <stdio.h>
-#include <string.h>
 
 int mime_encode_as_qp(const char *input, char *output, int outlen)
 {
diff --git a/src/common/pipe.c b/src/common/pipe.c
index 4d22f2458dc3b..913aa4fe89ab4 100644
--- a/src/common/pipe.c
+++ b/src/common/pipe.c
@@ -18,6 +18,8 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <stdint.h>
 #include <unistd.h>
 
 int pipe_cloexec(int pipefd[2])
diff --git a/src/common/run_cmd.cc b/src/common/run_cmd.cc
index 81e41712b9b38..396676d7b45cd 100644
--- a/src/common/run_cmd.cc
+++ b/src/common/run_cmd.cc
@@ -18,7 +18,6 @@
 #include <sstream>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <vector>
diff --git a/src/common/strtol.cc b/src/common/strtol.cc
index 863ef08cf46d9..a8ddafe70b529 100644
--- a/src/common/strtol.cc
+++ b/src/common/strtol.cc
@@ -17,6 +17,7 @@
 #include <cerrno>
 #include <climits>
 #include <cstdlib>
+#include <limits>
 #include <sstream>
 
 using std::ostringstream;
diff --git a/src/common/strtol.h b/src/common/strtol.h
index 2f4c4ce2756d8..810273ebd2325 100644
--- a/src/common/strtol.h
+++ b/src/common/strtol.h
@@ -16,7 +16,6 @@
 #define CEPH_COMMON_STRTOL_H
 
 #include <string>
-#include <limits>
 extern "C" {
 #include <stdint.h>
 }
diff --git a/src/common/utf8.c b/src/common/utf8.c
index 3bc77c32cded5..5a8592f1cc5e2 100644
--- a/src/common/utf8.c
+++ b/src/common/utf8.c
@@ -13,7 +13,6 @@
  */
 #include "common/utf8.h"
 
-#include <stdio.h>
 #include <string.h>
 
 static int high_bits_set(int c)
diff --git a/src/common/version.cc b/src/common/version.cc
index 0ca569e9c5691..99c9d58ed86cc 100644
--- a/src/common/version.cc
+++ b/src/common/version.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#include "acconfig.h"
 #include "ceph_ver.h"
 #include "common/version.h"
 
diff --git a/src/common/xattr.c b/src/common/xattr.c
index caa31d5270456..080bebcaafd81 100644
--- a/src/common/xattr.c
+++ b/src/common/xattr.c
@@ -9,7 +9,6 @@
  * Foundation.  See file COPYING.
  */
 
-#include "acconfig.h"
 #if defined(__FreeBSD__)
 #include <errno.h>
 #include <stdint.h>
diff --git a/src/include/crc32c.h b/src/include/crc32c.h
index a568edabe1914..35b6cafcc3a58 100644
--- a/src/include/crc32c.h
+++ b/src/include/crc32c.h
@@ -1,8 +1,7 @@
 #ifndef CEPH_CRC32C_H
 #define CEPH_CRC32C_H
 
-#include <inttypes.h>
-#include <string.h>
+#include <stdint.h>
 
 typedef uint32_t (*ceph_crc32c_func_t)(uint32_t crc, unsigned char const *data, unsigned length);
 
diff --git a/src/include/msgr.h b/src/include/msgr.h
index f60c9dfa4938a..1953eb28b40b4 100644
--- a/src/include/msgr.h
+++ b/src/include/msgr.h
@@ -5,6 +5,8 @@
 #include <sys/socket.h> // for struct sockaddr_storage
 #endif
 
+#include "include/int_types.h"
+
 /*
  * Data types for message passing layer used by Ceph.
  */
diff --git a/src/include/str_list.h b/src/include/str_list.h
index 7f4dce535368d..8ca07f3d31bb6 100644
--- a/src/include/str_list.h
+++ b/src/include/str_list.h
@@ -3,7 +3,6 @@
 
 #include <list>
 #include <set>
-#include <sstream>
 #include <string>
 #include <vector>
 
diff --git a/src/test/common/test_sloppy_crc_map.cc b/src/test/common/test_sloppy_crc_map.cc
index 1cdb6e459ded0..3eb855130aabd 100644
--- a/src/test/common/test_sloppy_crc_map.cc
+++ b/src/test/common/test_sloppy_crc_map.cc
@@ -1,10 +1,14 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <iostream>
+
 #include "common/SloppyCRCMap.h"
 #include "common/Formatter.h"
 #include <gtest/gtest.h>
 
+using namespace std;
+
 void dump(const SloppyCRCMap& scm)
 {
   Formatter *f = Formatter::create("json-pretty");
diff --git a/src/test/formatter.cc b/src/test/formatter.cc
index 35ec1d652b296..da8cc937e7124 100644
--- a/src/test/formatter.cc
+++ b/src/test/formatter.cc
@@ -19,6 +19,7 @@
 #include <sstream>
 #include <string>
 
+using namespace ceph;
 using std::ostringstream;
 
 TEST(JsonFormatter, Simple1) {
-- 
2.39.5