From: Brad Hubbard <bhubbard@redhat.com>
Date: Mon, 8 May 2017 23:54:30 +0000 (+1000)
Subject: common: Remove redundant includes
X-Git-Tag: v12.0.3~45^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15003%2Fhead;p=ceph.git

common: Remove redundant includes

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

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/ceph_ver.c b/src/ceph_ver.c
index b983b552701..efa2268185c 100644
--- a/src/ceph_ver.c
+++ b/src/ceph_ver.c
@@ -1,5 +1,4 @@
 
-#include "acconfig.h"
 #include "ceph_ver.h"
 
 #define CONCAT_VER_SYMBOL(x) ceph_ver__##x
diff --git a/src/common/BackTrace.cc b/src/common/BackTrace.cc
index 5fc6311d528..d68f43bd21d 100644
--- a/src/common/BackTrace.cc
+++ b/src/common/BackTrace.cc
@@ -7,7 +7,6 @@
 #include "BackTrace.h"
 
 #include "common/version.h"
-#include "acconfig.h"
 
 #define _STR(x) #x
 #define STRINGIFY(x) _STR(x)
diff --git a/src/common/LogEntry.cc b/src/common/LogEntry.cc
index ece56951cf5..bc887e1b3ad 100644
--- a/src/common/LogEntry.cc
+++ b/src/common/LogEntry.cc
@@ -1,7 +1,7 @@
 
 #include <syslog.h>
 
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 
 #include "LogEntry.h"
 #include "Formatter.h"
diff --git a/src/common/PrebufferedStreambuf.h b/src/common/PrebufferedStreambuf.h
index 55012d12ea4..d56c9909fe8 100644
--- a/src/common/PrebufferedStreambuf.h
+++ b/src/common/PrebufferedStreambuf.h
@@ -1,7 +1,6 @@
 #ifndef CEPH_COMMON_PREBUFFEREDSTREAMBUF_H
 #define CEPH_COMMON_PREBUFFEREDSTREAMBUF_H
 
-#include <iosfwd>
 #include <string>
 #include <streambuf>
 
diff --git a/src/common/bloom_filter.cc b/src/common/bloom_filter.cc
index 5a7a3ac18c3..6bc54bc7762 100644
--- a/src/common/bloom_filter.cc
+++ b/src/common/bloom_filter.cc
@@ -1,8 +1,9 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include "include/types.h"
 #include "common/bloom_filter.hpp"
+#include "common/Formatter.h"
+#include "include/buffer.h"
 
 MEMPOOL_DEFINE_FACTORY(unsigned char, byte, bloom_filter);
 
@@ -66,7 +67,7 @@ void bloom_filter::dump(Formatter *f) const
   f->close_section();
 }
 
-void bloom_filter::generate_test_instances(list<bloom_filter*>& ls)
+void bloom_filter::generate_test_instances(std::list<bloom_filter*>& ls)
 {
   ls.push_back(new bloom_filter(10, .5, 1));
   ls.push_back(new bloom_filter(10, .5, 1));
@@ -88,7 +89,7 @@ void compressible_bloom_filter::encode(bufferlist& bl) const
 
   uint32_t s = size_list.size();
   ::encode(s, bl);
-  for (vector<size_t>::const_iterator p = size_list.begin();
+  for (std::vector<size_t>::const_iterator p = size_list.begin();
        p != size_list.end(); ++p)
     ::encode((uint64_t)*p, bl);
 
@@ -117,13 +118,13 @@ void compressible_bloom_filter::dump(Formatter *f) const
   bloom_filter::dump(f);
 
   f->open_array_section("table_sizes");
-  for (vector<size_t>::const_iterator p = size_list.begin();
+  for (std::vector<size_t>::const_iterator p = size_list.begin();
        p != size_list.end(); ++p)
     f->dump_unsigned("size", (uint64_t)*p);
   f->close_section();
 }
 
-void compressible_bloom_filter::generate_test_instances(list<compressible_bloom_filter*>& ls)
+void compressible_bloom_filter::generate_test_instances(std::list<compressible_bloom_filter*>& ls)
 {
   ls.push_back(new compressible_bloom_filter(10, .5, 1));
   ls.push_back(new compressible_bloom_filter(10, .5, 1));
diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp
index 286a96589c6..9007f111cd7 100644
--- a/src/common/bloom_filter.hpp
+++ b/src/common/bloom_filter.hpp
@@ -32,7 +32,6 @@
 
 #include "include/mempool.h"
 #include "include/encoding.h"
-#include "common/Formatter.h"
 
 static const std::size_t bits_per_char = 0x08;    // 8 bits in 1 char(unsigned)
 static const unsigned char bit_mask[bits_per_char] = {
diff --git a/src/common/io_priority.cc b/src/common/io_priority.cc
index 579307f4071..687faa3bd7f 100644
--- a/src/common/io_priority.cc
+++ b/src/common/io_priority.cc
@@ -12,7 +12,6 @@
  *
  */
 
-#include <sys/types.h>
 #include <unistd.h>
 #ifdef __linux__
 #include <sys/syscall.h>   /* For SYS_xxx definitions */
@@ -20,7 +19,6 @@
 #include <algorithm>
 #include <errno.h>
 
-#include "common/errno.h"
 #include "io_priority.h"
 
 pid_t ceph_gettid(void)
diff --git a/src/common/perf_histogram.h b/src/common/perf_histogram.h
index bcd51a48ed4..ee726d394e4 100644
--- a/src/common/perf_histogram.h
+++ b/src/common/perf_histogram.h
@@ -17,7 +17,6 @@
 
 #include "common/Formatter.h"
 #include "include/atomic.h"
-#include "include/int_types.h"
 
 #include <array>
 #include <memory>
diff --git a/src/common/sctp_crc32.c b/src/common/sctp_crc32.c
index 2fa26afecc5..646a401eba6 100644
--- a/src/common/sctp_crc32.c
+++ b/src/common/sctp_crc32.c
@@ -43,8 +43,6 @@ __FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.c,v 1.8 2007/05/08 17:01:10 rrs E
 
 #include <stdint.h>
 
-#include "include/byteorder.h"
-
 #ifndef SCTP_USE_ADLER32
 
 
diff --git a/src/common/utf8.c b/src/common/utf8.c
index 3bc77c32cde..5a8592f1cc5 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/include/mempool.h b/src/include/mempool.h
index 6753291fc68..b995905b545 100644
--- a/src/include/mempool.h
+++ b/src/include/mempool.h
@@ -14,19 +14,15 @@
 
 #ifndef _CEPH_INCLUDE_MEMPOOL_H
 #define _CEPH_INCLUDE_MEMPOOL_H
-#include <iostream>
-#include <fstream>
 
 #include <cstddef>
 #include <map>
 #include <unordered_map>
 #include <set>
 #include <vector>
-#include <assert.h>
 #include <list>
 #include <mutex>
 #include <atomic>
-#include <climits>
 #include <typeinfo>
 
 #include <common/Formatter.h>
diff --git a/src/mount/mount.ceph.c b/src/mount/mount.ceph.c
index 5ead9313b7d..e8fdfcd5496 100644
--- a/src/mount/mount.ceph.c
+++ b/src/mount/mount.ceph.c
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/wait.h>
 
 #include "common/module.h"
 #include "common/secret.h"
diff --git a/src/tools/rbd_nbd/rbd-nbd.cc b/src/tools/rbd_nbd/rbd-nbd.cc
index 8ba83208b2e..ef1f97c91be 100644
--- a/src/tools/rbd_nbd/rbd-nbd.cc
+++ b/src/tools/rbd_nbd/rbd-nbd.cc
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 
 #include <iostream>
+#include <fstream>
 #include <boost/regex.hpp>
 
 #include "mon/MonClient.h"