Remove unused #includes

diff --git a/lib/base/dynamicobject.hpp b/lib/base/dynamicobject.hpp
index 7ea7f4fa17fd7bc3e0a359886e4e6e4333b96be7..881bd525d05edab5fb9067034f09e6a705330c34 100644 (file)
--- 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 a774adb34f32285120d8df5d1d6c197671588930..f4c11bb0a9c0cdba18b938d7c5b973beacba4a0c 100644 (file)
--- 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 59d093fa4dc3c717023a4b1597099b4600110a6a..433ab65af8ddbc0d2014309cf642f41e82383e56 100644 (file)
--- 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 e94a69f32f076e354b382202ac316ac9a3f1e1bc..8e976c9b274d615d80b14a829f6620aadf50cc2c 100644 (file)
--- 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 a26e7e2f90a0a87361e4c748e13cb86a92b17fd9..73a67d24859aa3d83bf6225d5a468e51feaaad0f 100644 (file)
--- 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 ed4bc9c6c1b2c183a69ef232b36d28a3ff8a2c8b..9ee9ea307212cda530e41a9f48f6987c678742d4 100644 (file)
--- 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 0869aef3ea4a5c3dfed0e38667faf4ea31fad5d1..04c76313d41b602897fb44e2165c4954dde9236f 100644 (file)
--- 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 b636ecc7f9871cf9103485495b82cfb29ee133eb..b825b440d6ec089b19e67610374c70253c48765a 100644 (file)
--- 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 7c0e7db189264a57bf1072fe1ad653bc819043a5..5633d8290eff71ba1b9b1d0f412107c348fb7d0e 100644 (file)
--- 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 5d5de74655362fa76006e00a199f68cfaa0ed2ee..ac314131ac784788358a9ccfed413f66455667e2 100644 (file)
--- 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
 {