From bfec53faa538243c43b54e047379da282b562873 Mon Sep 17 00:00:00 2001
From: Brad Hubbard <bhubbard@redhat.com>
Date: Thu, 11 May 2017 13:12:16 +1000
Subject: [PATCH] common: Remove redundant includes

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

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---
 src/auth/AuthServiceHandler.h       |  7 +++++--
 src/cls/journal/cls_journal_types.h |  1 -
 src/cls/lua/cls_lua_client.cc       |  5 +----
 src/cls/lua/cls_lua_client.h        |  8 ++++++--
 src/cls/lua/cls_lua_ops.h           |  4 ++--
 src/common/Graylog.cc               |  3 ---
 src/common/TextTable.h              |  1 -
 src/common/addr_parsing.c           |  1 -
 src/common/buffer.cc                |  4 ----
 src/common/entity_name.h            |  2 ++
 src/common/ipaddr.cc                |  7 +++++--
 src/common/module.c                 |  2 --
 src/common/pick_address.cc          |  1 +
 src/common/secret.c                 |  2 --
 src/crush/builder.c                 |  5 +----
 src/crush/builder.h                 |  7 ++++++-
 src/include/fs_types.h              |  1 -
 src/include/ipaddr.h                |  4 ----
 src/librados/RadosXattrIter.h       |  2 +-
 src/os/filestore/chain_xattr.cc     | 24 ++++++------------------
 src/os/filestore/chain_xattr.h      |  9 +++------
 src/test/test_ipaddr.cc             |  1 +
 22 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h
index 6bd8bd97634..4d8a649374f 100644
--- a/src/auth/AuthServiceHandler.h
+++ b/src/auth/AuthServiceHandler.h
@@ -15,11 +15,14 @@
 #ifndef CEPH_AUTHSERVICEHANDLER_H
 #define CEPH_AUTHSERVICEHANDLER_H
 
-#include "include/types.h"
-#include "Auth.h"
+#include <stddef.h>              // for NULL
+#include <stdint.h>              // for uint64_t
+#include "common/entity_name.h"  // for EntityName
+#include "include/buffer_fwd.h"  // for bufferlist
 
 class CephContext;
 class KeyServer;
+struct AuthCapsInfo;
 
 struct AuthServiceHandler {
 protected:
diff --git a/src/cls/journal/cls_journal_types.h b/src/cls/journal/cls_journal_types.h
index 4e1f2d7fd6e..f2cb841973f 100644
--- a/src/cls/journal/cls_journal_types.h
+++ b/src/cls/journal/cls_journal_types.h
@@ -9,7 +9,6 @@
 #include "include/encoding.h"
 #include <iosfwd>
 #include <list>
-#include <set>
 #include <string>
 
 namespace ceph {
diff --git a/src/cls/lua/cls_lua_client.cc b/src/cls/lua/cls_lua_client.cc
index 95dd2bb6043..44348270c80 100644
--- a/src/cls/lua/cls_lua_client.cc
+++ b/src/cls/lua/cls_lua_client.cc
@@ -1,10 +1,7 @@
-#include <errno.h>
 #include <string>
 #include <vector>
 #include "include/encoding.h"
-#include "include/rados.h"
-#include "include/rados/librados.h"
-#include "include/types.h"
+#include "include/rados/librados.hpp"  // for IoCtx
 #include "cls_lua_client.h"
 #include "cls_lua_ops.h"
 
diff --git a/src/cls/lua/cls_lua_client.h b/src/cls/lua/cls_lua_client.h
index fd049247add..e37906993c9 100644
--- a/src/cls/lua/cls_lua_client.h
+++ b/src/cls/lua/cls_lua_client.h
@@ -1,8 +1,12 @@
 #ifndef CLS_LUA_CLIENT_HPP
 #define CLS_LUA_CLIENT_HPP
 #include <string>
-#include <vector>
-#include "include/rados/librados.hpp"
+
+#include "include/buffer_fwd.h"  // for bufferlist
+
+namespace librados {
+  class IoCtx;
+}
 
 namespace cls_lua_client {
   int exec(librados::IoCtx& ioctx, const std::string& oid,
diff --git a/src/cls/lua/cls_lua_ops.h b/src/cls/lua/cls_lua_ops.h
index ed297922044..2bf95051d34 100644
--- a/src/cls/lua/cls_lua_ops.h
+++ b/src/cls/lua/cls_lua_ops.h
@@ -2,8 +2,8 @@
 #define CEPH_CLS_LUA_OPS_H
 
 struct cls_lua_eval_op {
-  string script;
-  string handler;
+  std::string script;
+  std::string handler;
   bufferlist input;
 
   void encode(bufferlist &bl) const {
diff --git a/src/common/Graylog.cc b/src/common/Graylog.cc
index ff2935151a3..a8fd8a99d29 100644
--- a/src/common/Graylog.cc
+++ b/src/common/Graylog.cc
@@ -4,9 +4,6 @@
 #include "Graylog.h"
 
 #include <iostream>
-#include <sstream>
-
-#include <arpa/inet.h>
 
 #include "common/Formatter.h"
 #include "common/LogEntry.h"
diff --git a/src/common/TextTable.h b/src/common/TextTable.h
index 60c982a7e5f..88866d1e19d 100644
--- a/src/common/TextTable.h
+++ b/src/common/TextTable.h
@@ -17,7 +17,6 @@
 
 #include <vector>
 #include <sstream>
-#include <iomanip>
 #include <string>
 #include "include/assert.h"
 
diff --git a/src/common/addr_parsing.c b/src/common/addr_parsing.c
index ae755576500..50694402980 100644
--- a/src/common/addr_parsing.c
+++ b/src/common/addr_parsing.c
@@ -12,7 +12,6 @@
  *
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 957f5da8c56..caf08729f20 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -26,7 +26,6 @@
 #include "include/atomic.h"
 #include "common/RWLock.h"
 #include "include/types.h"
-#include "include/compat.h"
 #include "include/inline_memory.h"
 #include "include/scope_guard.h"
 #if defined(HAVE_XIO)
@@ -34,13 +33,10 @@
 #endif
 
 #include <errno.h>
-#include <fstream>
-#include <sstream>
 #include <sys/uio.h>
 #include <limits.h>
 
 #include <atomic>
-#include <ostream>
 
 #define CEPH_BUFFER_ALLOC_UNIT  (MIN(CEPH_PAGE_SIZE, 4096))
 #define CEPH_BUFFER_APPEND_SIZE (CEPH_BUFFER_ALLOC_UNIT - sizeof(raw_combined))
diff --git a/src/common/entity_name.h b/src/common/entity_name.h
index d1c6cbcdd7b..66576cc1af2 100644
--- a/src/common/entity_name.h
+++ b/src/common/entity_name.h
@@ -15,6 +15,8 @@
 #ifndef CEPH_COMMON_ENTITY_NAME_H
 #define CEPH_COMMON_ENTITY_NAME_H
 
+#include <ifaddrs.h>
+#include <netinet/in.h>
 #include <iosfwd>
 #include <stdint.h>
 #include <string>
diff --git a/src/common/ipaddr.cc b/src/common/ipaddr.cc
index a7dedf25709..55ac722d666 100644
--- a/src/common/ipaddr.cc
+++ b/src/common/ipaddr.cc
@@ -1,10 +1,13 @@
 #include "include/ipaddr.h"
 
-#include <sys/socket.h>
+#include <alloca.h>
 #include <arpa/inet.h>
+#include <ifaddrs.h>
+#include <netinet/in.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <sys/socket.h>
 
 static void netmask_ipv4(const struct in_addr *addr,
 			 unsigned int prefix_len,
diff --git a/src/common/module.c b/src/common/module.c
index b251274a5f1..06b32ed7d3e 100644
--- a/src/common/module.c
+++ b/src/common/module.c
@@ -15,8 +15,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
 
 /*
  * TODO: Switch to libkmod when we abandon older platforms.  The APIs
diff --git a/src/common/pick_address.cc b/src/common/pick_address.cc
index 5f910d541e6..4291cce8cbc 100644
--- a/src/common/pick_address.cc
+++ b/src/common/pick_address.cc
@@ -16,6 +16,7 @@
 
 #include <netdb.h>
 #include <errno.h>
+#include <ifaddrs.h>
 
 #include "include/ipaddr.h"
 #include "include/str_list.h"
diff --git a/src/common/secret.c b/src/common/secret.c
index 82150930eab..b6f26ec3ece 100644
--- a/src/common/secret.c
+++ b/src/common/secret.c
@@ -14,12 +14,10 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <keyutils.h>
-#include <sys/types.h>
 
 #include "common/armor.h"
 #include "common/safe_io.h"
diff --git a/src/crush/builder.c b/src/crush/builder.c
index ec11d6c1f9d..dc342d28a01 100644
--- a/src/crush/builder.c
+++ b/src/crush/builder.c
@@ -1,15 +1,12 @@
 #include <string.h>
-#include <limits.h>
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 #include <errno.h>
 
-#include "include/int_types.h"
-
+#include "crush/crush.h"
 #include "builder.h"
-#include "hash.h"
 
 #define dprintk(args...) /* printf(args) */
 
diff --git a/src/crush/builder.h b/src/crush/builder.h
index e1db9a5a069..ffb5eaf22db 100644
--- a/src/crush/builder.h
+++ b/src/crush/builder.h
@@ -1,7 +1,12 @@
 #ifndef CEPH_CRUSH_BUILDER_H
 #define CEPH_CRUSH_BUILDER_H
 
-#include "crush.h"
+#include "include/int_types.h"
+
+struct crush_bucket;
+struct crush_choose_arg;
+struct crush_map;
+struct crush_rule;
 
 /** @ingroup API
  *
diff --git a/src/include/fs_types.h b/src/include/fs_types.h
index 161d44104ec..5513fcefd79 100644
--- a/src/include/fs_types.h
+++ b/src/include/fs_types.h
@@ -4,7 +4,6 @@
 #define CEPH_INCLUDE_FS_TYPES_H
 
 #include "types.h"
-#include "utime.h"
 
 // --------------------------------------
 // ino
diff --git a/src/include/ipaddr.h b/src/include/ipaddr.h
index bf1a0830899..ac0dc620fac 100644
--- a/src/include/ipaddr.h
+++ b/src/include/ipaddr.h
@@ -1,10 +1,6 @@
 #ifndef CEPH_IPADDR_H
 #define CEPH_IPADDR_H
 
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <ifaddrs.h>
-
 /*
   Find an IP address that is in the wanted subnet.
 
diff --git a/src/librados/RadosXattrIter.h b/src/librados/RadosXattrIter.h
index 35c87043840..6b232bd5873 100644
--- a/src/librados/RadosXattrIter.h
+++ b/src/librados/RadosXattrIter.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <map>
 
-#include "include/buffer.h"
+#include "include/buffer.h"  // for bufferlist
 
 namespace librados {
 
diff --git a/src/os/filestore/chain_xattr.cc b/src/os/filestore/chain_xattr.cc
index 0461c1953db..97c547e1426 100644
--- a/src/os/filestore/chain_xattr.cc
+++ b/src/os/filestore/chain_xattr.cc
@@ -2,29 +2,17 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "chain_xattr.h"
-
-#include "include/int_types.h"
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/file.h>
-#include <errno.h>
-#include <dirent.h>
-#include <sys/ioctl.h>
-#include <string.h>
-#include <stdio.h>
-#include "include/assert.h"
+#include <errno.h>           // for ERANGE, ENODATA, ENOMEM
+#include <stdio.h>           // for size_t, snprintf
+#include <stdlib.h>          // for free, malloc
+#include <string.h>          // for strcpy, strlen
+#include "include/assert.h"  // for assert
+#include "include/buffer.h"
 
 #if defined(__linux__)
 #include <linux/fs.h>
 #endif
 
-#include "common/xattr.h"
-#include "include/compat.h"
-
 /*
  * chaining xattrs
  *
diff --git a/src/os/filestore/chain_xattr.h b/src/os/filestore/chain_xattr.h
index 9764c347751..8f78643f276 100644
--- a/src/os/filestore/chain_xattr.h
+++ b/src/os/filestore/chain_xattr.h
@@ -4,14 +4,11 @@
 #ifndef __CEPH_OSD_CHAIN_XATTR_H
 #define __CEPH_OSD_CHAIN_XATTR_H
 
-#include "include/compat.h"
+#include <errno.h>
+#include <stdio.h>
 #include "common/xattr.h"
 #include "include/assert.h"
-#include "include/buffer.h"
-#include <string.h>
-#include <stdio.h>
-
-#include <errno.h>
+#include "include/buffer_fwd.h"
 
 #if defined(__linux__)
 #include <linux/limits.h>
diff --git a/src/test/test_ipaddr.cc b/src/test/test_ipaddr.cc
index ab43407ec5e..f6ecd2de51f 100644
--- a/src/test/test_ipaddr.cc
+++ b/src/test/test_ipaddr.cc
@@ -6,6 +6,7 @@
 #include <sys/socket.h>
 #endif
 #include <arpa/inet.h>
+#include <ifaddrs.h>
 
 static void ipv4(struct sockaddr_in *addr, const char *s) {
   int err;
-- 
2.39.5