Remove unnecessary includes

diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp
index 3937c78da6e297cd684df19ff70c81a0f71d6f28..cd8e2a57966782f52eabfdeb9a486cd165bee801 100644 (file)
--- a/lib/base/debuginfo.hpp
+++ b/lib/base/debuginfo.hpp
@@ -22,7 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/string.hpp"
-#include "base/exception.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/dynamictype.hpp b/lib/base/dynamictype.hpp
index 1896f6c92f97613256eb89868d9b040119287cc3..1807ee296031cf4aca4fd71a836d2372eddfc3df 100644 (file)
--- a/lib/base/dynamictype.hpp
+++ b/lib/base/dynamictype.hpp
@@ -22,7 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/dynamicobject.hpp"
-#include "base/debug.hpp"
 #include "base/objectlock.hpp"
 #include <map>
 # include <boost/iterator/iterator_facade.hpp>

diff --git a/lib/base/json.hpp b/lib/base/json.hpp
index 62f37aa283c64bd9d26fb6d07366f08a0d61c148..2c8c78a4fd2d5a20e9598c889587ce7c815f780b 100644 (file)
--- a/lib/base/json.hpp
+++ b/lib/base/json.hpp
@@ -21,11 +21,13 @@
 #define JSON_H
 
 #include "base/i2-base.hpp"
-#include "base/value.hpp"
 
 namespace icinga
 {
 
+class String;
+class Value;
+
 I2_BASE_API String JsonEncode(const Value& value);
 I2_BASE_API Value JsonDecode(const String& data);
 

diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp
index ab47dac54eebb955953f276137c42d301577d1fd..e0a5e64bcef4a5d879cc581f8c5bd9ed6358a52e 100644 (file)
--- a/lib/base/netstring.hpp
+++ b/lib/base/netstring.hpp
@@ -21,12 +21,13 @@
 #define NETSTRING_H
 
 #include "base/i2-base.hpp"
-#include "base/string.hpp"
 #include "base/stream.hpp"
 
 namespace icinga
 {
 
+class String;
+
 /**
  * Helper functions for reading/writing messages in the netstring format.
  *

diff --git a/lib/base/scriptglobal.cpp b/lib/base/scriptglobal.cpp
index ddcf23fcdfc86ac87a26a28be4b2b771b1e8025e..9ffa689cdab05819726aba7fbaa2bd1a9418dd31 100644 (file)
--- a/lib/base/scriptglobal.cpp
+++ b/lib/base/scriptglobal.cpp
@@ -25,6 +25,7 @@
 #include "base/json.hpp"
 #include "base/convert.hpp"
 #include "base/objectlock.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <fstream>
 

diff --git a/lib/base/socket.hpp b/lib/base/socket.hpp
index 429b7f24ebba9f2a100c446dc9af304b32c4f6c5..8fd25d9a3971dc9c9ee9c5dd48dd151114c78b8b 100644 (file)
--- a/lib/base/socket.hpp
+++ b/lib/base/socket.hpp
@@ -21,7 +21,7 @@
 #define SOCKET_H
 
 #include "base/i2-base.hpp"
-#include "base/stream.hpp"
+#include "base/object.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>

diff --git a/lib/base/stream.hpp b/lib/base/stream.hpp
index 29add7b8f0c55532043b77a48dbc11b188935c3e..17f9d95a2a8c4047788a63853a0ada0669f3c506 100644 (file)
--- a/lib/base/stream.hpp
+++ b/lib/base/stream.hpp
@@ -22,7 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
-#include "base/string.hpp"
 
 namespace icinga
 {

diff --git a/lib/base/tlsutility.cpp b/lib/base/tlsutility.cpp
index b4d96ecfd55fcd39998c5d5b90f231d11dd54ce9..faea22b3fd344f216805ed54cd11d759e23c16a5 100644 (file)
--- a/lib/base/tlsutility.cpp
+++ b/lib/base/tlsutility.cpp
@@ -22,6 +22,7 @@
 #include "base/logger.hpp"
 #include "base/context.hpp"
 #include "base/application.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 
 namespace icinga

diff --git a/lib/base/tlsutility.hpp b/lib/base/tlsutility.hpp
index a38bd3aa7cf4b053ff4a1ead0759e4d0f5ace0ef..5fa121e99cf89d10f3681a486f520942e4a76825 100644 (file)
--- a/lib/base/tlsutility.hpp
+++ b/lib/base/tlsutility.hpp
@@ -23,7 +23,6 @@
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
 #include "base/string.hpp"
-#include "base/exception.hpp"
 #include <openssl/ssl.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
@@ -33,6 +32,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/exception/info.hpp>
 
 namespace icinga
 {

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index 304ceaa6c98764488a0a93e6c1945c3f787ddfc5..80a38b060a87b5bba0c925b8827a36bacb0b401c 100644 (file)
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -26,6 +26,7 @@
 #include "base/application.hpp"
 #include "base/tlsutility.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/nodeutility.cpp b/lib/cli/nodeutility.cpp
index da55f24717c9b38b97616154a7688fba20b617d1..5588f62aeef1fd6ed9c0d6c17b86b0968fbc48da 100644 (file)
--- a/lib/cli/nodeutility.cpp
+++ b/lib/cli/nodeutility.cpp
@@ -31,6 +31,7 @@
 #include "base/debug.hpp"
 #include "base/objectlock.hpp"
 #include "base/console.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/join.hpp>

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index 0478bfb02c27f8dcf6dd5e23c7fa70e88ee213bb..23c80e1d5e8f3a9cc1869414644751baf96f3ded 100644 (file)
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -26,6 +26,7 @@
 #include "base/application.hpp"
 #include "base/tlsutility.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>

diff --git a/lib/cli/objectlistcommand.cpp b/lib/cli/objectlistcommand.cpp
index bbab345eba307a3cb7e50f918ab8d6cc75daec14..4aa80e911ead814559d0db8c79e13c23c0235f3c 100644 (file)
--- a/lib/cli/objectlistcommand.cpp
+++ b/lib/cli/objectlistcommand.cpp
@@ -34,6 +34,7 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <fstream>
 #include <iostream>
+#include <iomanip>
 
 using namespace icinga;
 namespace po = boost::program_options;

diff --git a/lib/cli/pkiutility.cpp b/lib/cli/pkiutility.cpp
index 478fdd8c232168c52ca64bf4935102afa0c6f553..dca48a268e8ebc68743594466474bb1e2d1be0ec 100644 (file)
--- a/lib/cli/pkiutility.cpp
+++ b/lib/cli/pkiutility.cpp
@@ -26,6 +26,7 @@
 #include "base/tcpsocket.hpp"
 #include "base/json.hpp"
 #include "base/utility.hpp"
+#include "base/exception.hpp"
 #include "remote/jsonrpc.hpp"
 #include <fstream>
 #include <iostream>

diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index d688f87e119b0b91830a0a9299050eee9701786b..ad6bd19258278b3971c905c9e335498dabcf5309 100644 (file)
--- a/lib/config/configcompilercontext.cpp
+++ b/lib/config/configcompilercontext.cpp
@@ -21,6 +21,7 @@
 #include "base/singleton.hpp"
 #include "base/json.hpp"
 #include "base/netstring.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <fstream>
 

diff --git a/lib/icinga/dependency.hpp b/lib/icinga/dependency.hpp
index 8c793f862e4c803a85b81251a04c4d504ba1bfc1..04352d3c4a431af5853f3978793846e78abdbe79 100644 (file)
--- a/lib/icinga/dependency.hpp
+++ b/lib/icinga/dependency.hpp
@@ -22,7 +22,6 @@
 
 #include "icinga/i2-icinga.hpp"
 #include "icinga/dependency.thpp"
-#include "base/dictionary.hpp"
 
 namespace icinga
 {

diff --git a/lib/perfdata/gelfwriter.cpp b/lib/perfdata/gelfwriter.cpp
index 94abac435a3709916df7cd482639fd1bb5d3dbfe..a3cf3bc0d80f4563a3c3fcecef45c1be32a2e7a3 100644 (file)
--- a/lib/perfdata/gelfwriter.cpp
+++ b/lib/perfdata/gelfwriter.cpp
@@ -31,6 +31,7 @@
 #include "base/stream.hpp"
 #include "base/networkstream.hpp"
 #include "base/json.hpp"
+#include "base/context.hpp"
 
 using namespace icinga;
 

diff --git a/lib/remote/apilistener-sync.cpp b/lib/remote/apilistener-sync.cpp
index 97286f103ac73fe1f8f048298e2032209fd7bd46..8d019fc4a4e4106ad9a1014d587f7e3d86a73a16 100644 (file)
--- a/lib/remote/apilistener-sync.cpp
+++ b/lib/remote/apilistener-sync.cpp
@@ -22,6 +22,7 @@
 #include "base/dynamictype.hpp"
 #include "base/logger.hpp"
 #include "base/convert.hpp"
+#include "base/exception.hpp"
 #include <boost/foreach.hpp>
 #include <fstream>
 

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index 807adbf2e1b9e928606e51695e60e2c3061eccdc..a494991fb026df109eb20a5ac11feac65e8f9058 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -30,6 +30,7 @@
 #include "base/application.hpp"
 #include "base/context.hpp"
 #include "base/statsfunction.hpp"
+#include "base/exception.hpp"
 #include <fstream>
 
 using namespace icinga;