From 111b154a6d957b2a766a771899df74c5158e62b0 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 29 Mar 2015 00:03:47 +0100
Subject: [PATCH] Remove unused #includes

---
 lib/base/dynamicobject.hpp | 2 --
 lib/base/i2-base.hpp       | 2 +-
 lib/base/object.hpp        | 3 ++-
 lib/base/scriptframe.cpp   | 3 ++-
 lib/base/scriptframe.hpp   | 1 -
 lib/base/socket.hpp        | 4 ----
 lib/base/string.hpp        | 2 +-
 lib/base/type.hpp          | 1 -
 lib/base/utility.hpp       | 4 ++--
 lib/base/workqueue.hpp     | 2 +-
 10 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/lib/base/dynamicobject.hpp b/lib/base/dynamicobject.hpp
index 7ea7f4fa1..881bd525d 100644
--- a/lib/base/dynamicobject.hpp
+++ b/lib/base/dynamicobject.hpp
@@ -25,9 +25,7 @@
 #include "base/object.hpp"
 #include "base/type.hpp"
 #include "base/dictionary.hpp"
-#include "base/debuginfo.hpp"
 #include <boost/signals2.hpp>
-#include <map>
 
 namespace icinga
 {
diff --git a/lib/base/i2-base.hpp b/lib/base/i2-base.hpp
index a774adb34..f4c11bb0a 100644
--- a/lib/base/i2-base.hpp
+++ b/lib/base/i2-base.hpp
@@ -83,7 +83,7 @@
 #	pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
-#include "visibility.hpp"
+#include "base/visibility.hpp"
 
 #ifdef I2_BASE_BUILD
 #	define I2_BASE_API I2_EXPORT
diff --git a/lib/base/object.hpp b/lib/base/object.hpp
index 59d093fa4..433ab65af 100644
--- a/lib/base/object.hpp
+++ b/lib/base/object.hpp
@@ -23,7 +23,6 @@
 #include "base/i2-base.hpp"
 #include "base/debug.hpp"
 #include "base/thinmutex.hpp"
-#include <boost/thread/thread.hpp>
 
 #ifndef I2_DEBUG
 #include <boost/thread/mutex.hpp>
@@ -31,6 +30,8 @@
 #include <boost/thread/recursive_mutex.hpp>
 #endif /* I2_DEBUG */
 
+#include <boost/thread/condition_variable.hpp>
+
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 using boost::intrusive_ptr;
diff --git a/lib/base/scriptframe.cpp b/lib/base/scriptframe.cpp
index e94a69f32..8e976c9b2 100644
--- a/lib/base/scriptframe.cpp
+++ b/lib/base/scriptframe.cpp
@@ -18,6 +18,7 @@
  ******************************************************************************/
 
 #include "base/scriptframe.hpp"
+#include "base/scriptglobal.hpp"
 
 using namespace icinga;
 
@@ -56,4 +57,4 @@ ScriptFrame *ScriptFrame::GetCurrentFrame(void)
 void ScriptFrame::SetCurrentFrame(ScriptFrame *frame)
 {
 	m_CurrentFrame.reset(new ScriptFrame *(frame));
-}
\ No newline at end of file
+}
diff --git a/lib/base/scriptframe.hpp b/lib/base/scriptframe.hpp
index a26e7e2f9..73a67d248 100644
--- a/lib/base/scriptframe.hpp
+++ b/lib/base/scriptframe.hpp
@@ -22,7 +22,6 @@
 
 #include "config/i2-config.hpp"
 #include "base/dictionary.hpp"
-#include "base/scriptglobal.hpp"
 #include <boost/thread/tss.hpp>
 
 namespace icinga
diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp
index ed4bc9c6c..9ee9ea307 100644
--- a/lib/base/socket.hpp
+++ b/lib/base/socket.hpp
@@ -22,10 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition_variable.hpp>
-#include <boost/signals2.hpp>
 
 namespace icinga
 {
diff --git a/lib/base/string.hpp b/lib/base/string.hpp
index 0869aef3e..04c76313d 100644
--- a/lib/base/string.hpp
+++ b/lib/base/string.hpp
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <functional>
 #include <string>
-#include <istream>
+#include <iosfwd>
 
 namespace icinga {
 
diff --git a/lib/base/type.hpp b/lib/base/type.hpp
index b636ecc7f..b825b440d 100644
--- a/lib/base/type.hpp
+++ b/lib/base/type.hpp
@@ -24,7 +24,6 @@
 #include "base/string.hpp"
 #include "base/object.hpp"
 #include "base/initialize.hpp"
-#include <boost/function.hpp>
 #include <vector>
 
 namespace icinga
diff --git a/lib/base/utility.hpp b/lib/base/utility.hpp
index 7c0e7db18..5633d8290 100644
--- a/lib/base/utility.hpp
+++ b/lib/base/utility.hpp
@@ -23,11 +23,11 @@
 #include "base/i2-base.hpp"
 #include "base/string.hpp"
 #include "base/array.hpp"
-#include <typeinfo>
+#include "base/threadpool.hpp"
 #include <boost/function.hpp>
 #include <boost/thread/tss.hpp>
+#include <typeinfo>
 #include <vector>
-#include "base/threadpool.hpp"
 
 namespace icinga
 {
diff --git a/lib/base/workqueue.hpp b/lib/base/workqueue.hpp
index 5d5de7465..ac314131a 100644
--- a/lib/base/workqueue.hpp
+++ b/lib/base/workqueue.hpp
@@ -22,12 +22,12 @@
 
 #include "base/i2-base.hpp"
 #include "base/timer.hpp"
-#include <deque>
 #include <boost/function.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 #include <boost/exception_ptr.hpp>
+#include <deque>
 
 namespace icinga
 {