From 5bc0e3448a7760b560fd881182feff8d63ee922e Mon Sep 17 00:00:00 2001
From: Jos Collin <jcollin@redhat.com>
Date: Mon, 15 May 2017 17:22:01 +0530
Subject: [PATCH] common: Remove redundant includes

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

Signed-off-by: Jos Collin <jcollin@redhat.com>
---
 src/common/SubProcess.h         | 10 ----------
 src/common/TextTable.h          |  1 -
 src/common/Thread.cc            | 10 ----------
 src/common/Throttle.cc          |  5 -----
 src/common/Throttle.h           |  7 -------
 src/common/Timer.cc             |  8 --------
 src/common/Timer.h              |  3 ---
 src/common/TracepointProvider.h |  5 -----
 src/common/TrackedOp.cc         |  7 -------
 src/common/TrackedOp.h          |  8 --------
 src/common/WorkQueue.cc         | 10 +---------
 src/common/WorkQueue.h          |  3 ---
 src/common/str_map.cc           |  2 --
 src/common/strtol.cc            |  2 --
 src/common/tracked_int_ptr.hpp  |  6 ------
 src/common/util.cc              |  2 --
 src/common/version.cc           |  1 -
 src/common/zipkin_trace.h       |  1 -
 18 files changed, 1 insertion(+), 90 deletions(-)

diff --git a/src/common/SubProcess.h b/src/common/SubProcess.h
index 2295aade48a3..c35ae1fd31c5 100644
--- a/src/common/SubProcess.h
+++ b/src/common/SubProcess.h
@@ -17,21 +17,11 @@
 #ifndef SUB_PROCESS_H
 #define SUB_PROCESS_H
 
-#include <sys/types.h>
 #include <sys/wait.h>
-
-#include <signal.h>
-#include <errno.h>
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-
 #include <sstream>
 #include <vector>
 #include <iostream>
-
 #include <include/assert.h>
 #include <common/errno.h>
 
diff --git a/src/common/TextTable.h b/src/common/TextTable.h
index 88866d1e19d8..12e8ca1f5a4a 100644
--- a/src/common/TextTable.h
+++ b/src/common/TextTable.h
@@ -17,7 +17,6 @@
 
 #include <vector>
 #include <sstream>
-#include <string>
 #include "include/assert.h"
 
 /**
diff --git a/src/common/Thread.cc b/src/common/Thread.cc
index 3e8d3434624f..a58c7ba252cc 100644
--- a/src/common/Thread.cc
+++ b/src/common/Thread.cc
@@ -19,16 +19,6 @@
 #include "common/signal.h"
 #include "common/io_priority.h"
 
-#include <dirent.h>
-#include <errno.h>
-#include <iostream>
-#include <pthread.h>
-
-#include <signal.h>
-#include <sstream>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #ifdef HAVE_SCHED
 #include <sched.h>
 #endif
diff --git a/src/common/Throttle.cc b/src/common/Throttle.cc
index 56579ca8dd18..ca5701d8f732 100644
--- a/src/common/Throttle.cc
+++ b/src/common/Throttle.cc
@@ -1,12 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <errno.h>
-#include <thread>
-
 #include "common/Throttle.h"
-#include "common/dout.h"
-#include "common/ceph_context.h"
 #include "common/perf_counters.h"
 
 #define dout_subsys ceph_subsys_throttle
diff --git a/src/common/Throttle.h b/src/common/Throttle.h
index e4119a3b97c8..f6bcd078b45b 100644
--- a/src/common/Throttle.h
+++ b/src/common/Throttle.h
@@ -4,15 +4,8 @@
 #ifndef CEPH_THROTTLE_H
 #define CEPH_THROTTLE_H
 
-#include "Mutex.h"
 #include "Cond.h"
-#include <list>
-#include <map>
-#include <iostream>
 #include <condition_variable>
-#include <chrono>
-#include "include/atomic.h"
-#include "include/Context.h"
 
 class CephContext;
 class PerfCounters;
diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index fb7a1bfbc036..ef76a9e41b7d 100644
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -13,21 +13,13 @@
  */
 
 #include "Cond.h"
-#include "Mutex.h"
-#include "Thread.h"
 #include "Timer.h"
 
-#include "common/config.h"
-#include "include/Context.h"
 
 #define dout_subsys ceph_subsys_timer
 #undef dout_prefix
 #define dout_prefix *_dout << "timer(" << this << ")."
 
-#include <sstream>
-#include <signal.h>
-#include <sys/time.h>
-#include <math.h>
 
 
 class SafeTimerThread : public Thread {
diff --git a/src/common/Timer.h b/src/common/Timer.h
index 6ac916d9e2ef..078a172b25b1 100644
--- a/src/common/Timer.h
+++ b/src/common/Timer.h
@@ -17,9 +17,6 @@
 
 #include "Cond.h"
 #include "Mutex.h"
-#include "RWLock.h"
-
-#include <map>
 
 class CephContext;
 class Context;
diff --git a/src/common/TracepointProvider.h b/src/common/TracepointProvider.h
index 9efc482c6ef8..97d3a0f76372 100644
--- a/src/common/TracepointProvider.h
+++ b/src/common/TracepointProvider.h
@@ -4,14 +4,9 @@
 #ifndef CEPH_TRACEPOINT_PROVIDER_H
 #define CEPH_TRACEPOINT_PROVIDER_H
 
-#include "include/int_types.h"
-#include "common/ceph_context.h"
 #include "common/config_obs.h"
 #include "common/Mutex.h"
 #include <dlfcn.h>
-#include <set>
-#include <string>
-#include <boost/noncopyable.hpp>
 
 struct md_config_t;
 
diff --git a/src/common/TrackedOp.cc b/src/common/TrackedOp.cc
index 58df253262d2..3181fe1fc22f 100644
--- a/src/common/TrackedOp.cc
+++ b/src/common/TrackedOp.cc
@@ -11,13 +11,6 @@
  */
 
 #include "TrackedOp.h"
-#include "common/Formatter.h"
-#include <iostream>
-#include <vector>
-#include "common/debug.h"
-#include "common/config.h"
-#include "msg/Message.h"
-#include "include/assert.h"
 
 #define dout_context cct
 #define dout_subsys ceph_subsys_optracker
diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 899e0b6fec91..621831da9175 100644
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -13,17 +13,9 @@
 
 #ifndef TRACKEDREQUEST_H_
 #define TRACKEDREQUEST_H_
-#include <sstream>
-#include <stdint.h>
-#include <boost/intrusive/list.hpp>
-#include <atomic>
 
-#include "include/utime.h"
-#include "common/Mutex.h"
 #include "common/histogram.h"
-#include "common/zipkin_trace.h"
 #include "msg/Message.h"
-#include "include/memory.h"
 #include "common/RWLock.h"
 
 #define OPTRACKER_PREALLOC_EVENTS 20
diff --git a/src/common/WorkQueue.cc b/src/common/WorkQueue.cc
index ec5f8a1476d1..b077b813cc3f 100644
--- a/src/common/WorkQueue.cc
+++ b/src/common/WorkQueue.cc
@@ -12,17 +12,9 @@
  * 
  */
 
+#include "WorkQueue.h"
 #include "include/compat.h"
-
-#include <sstream>
-
-#include "include/types.h"
-#include "include/utime.h"
 #include "common/errno.h"
-#include "WorkQueue.h"
-
-#include "common/config.h"
-#include "common/HeartbeatMap.h"
 
 #define dout_subsys ceph_subsys_tp
 #undef dout_prefix
diff --git a/src/common/WorkQueue.h b/src/common/WorkQueue.h
index 6e29da6fd380..33c6c780d352 100644
--- a/src/common/WorkQueue.h
+++ b/src/common/WorkQueue.h
@@ -15,11 +15,8 @@
 #ifndef CEPH_WORKQUEUE_H
 #define CEPH_WORKQUEUE_H
 
-#include "Mutex.h"
 #include "Cond.h"
-#include "Thread.h"
 #include "include/unordered_map.h"
-#include "common/config_obs.h"
 #include "common/HeartbeatMap.h"
 
 class CephContext;
diff --git a/src/common/str_map.cc b/src/common/str_map.cc
index 4605302e53af..c3f6a2b6519e 100644
--- a/src/common/str_map.cc
+++ b/src/common/str_map.cc
@@ -14,8 +14,6 @@
  * 
  */
 
-#include <errno.h>
-
 #include "include/str_map.h"
 #include "include/str_list.h"
 
diff --git a/src/common/strtol.cc b/src/common/strtol.cc
index a8ddafe70b52..4997a1242af1 100644
--- a/src/common/strtol.cc
+++ b/src/common/strtol.cc
@@ -14,9 +14,7 @@
 
 #include "strtol.h"
 
-#include <cerrno>
 #include <climits>
-#include <cstdlib>
 #include <limits>
 #include <sstream>
 
diff --git a/src/common/tracked_int_ptr.hpp b/src/common/tracked_int_ptr.hpp
index e0e423835e7a..dfc749347245 100644
--- a/src/common/tracked_int_ptr.hpp
+++ b/src/common/tracked_int_ptr.hpp
@@ -15,12 +15,6 @@
 #ifndef CEPH_TRACKEDINTPTR_H
 #define CEPH_TRACKEDINTPTR_H
 
-#include <map>
-#include <list>
-#include <memory>
-#include <utility>
-#include "common/Mutex.h"
-#include "common/Cond.h"
 
 template <class T>
 class TrackedIntPtr {
diff --git a/src/common/util.cc b/src/common/util.cc
index 3cc1c49e78bb..762fe374bb57 100644
--- a/src/common/util.cc
+++ b/src/common/util.cc
@@ -12,7 +12,6 @@
  * 
  */
 
-#include <errno.h>
 #include <sys/utsname.h>
 #include <boost/lexical_cast.hpp>
 
@@ -20,7 +19,6 @@
 #include "include/util.h"
 #include "common/debug.h"
 #include "common/errno.h"
-#include "common/strtol.h"
 #include "common/version.h"
 
 #ifdef HAVE_SYS_VFS_H
diff --git a/src/common/version.cc b/src/common/version.cc
index 99c9d58ed86c..d5ce748ddd90 100644
--- a/src/common/version.cc
+++ b/src/common/version.cc
@@ -16,7 +16,6 @@
 #include "common/version.h"
 
 #include <sstream>
-#include <string>
 
 #define _STR(x) #x
 #define STRINGIFY(x) _STR(x)
diff --git a/src/common/zipkin_trace.h b/src/common/zipkin_trace.h
index 6d3f02b43e25..6c1125402661 100644
--- a/src/common/zipkin_trace.h
+++ b/src/common/zipkin_trace.h
@@ -3,7 +3,6 @@
 #ifndef COMMON_ZIPKIN_TRACE_H
 #define COMMON_ZIPKIN_TRACE_H
 
-#include <string>
 #include "acconfig.h"
 
 #ifdef WITH_BLKIN
-- 
2.47.3