From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 15 Dec 2014 09:16:06 +0000 (+0100)
Subject: Remove unnecessary includes
X-Git-Tag: v2.3.0~489
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55b7f003824e7bcbe2e99ccf060271df3ba0ad7a;p=icinga2

Remove unnecessary includes
---

diff --git a/lib/base/debuginfo.hpp b/lib/base/debuginfo.hpp
index 3937c78da..cd8e2a579 100644
--- 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 1896f6c92..1807ee296 100644
--- 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 62f37aa28..2c8c78a4f 100644
--- 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 ab47dac54..e0a5e64bc 100644
--- 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 ddcf23fcd..9ffa689cd 100644
--- 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 429b7f24e..8fd25d9a3 100644
--- 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 29add7b8f..17f9d95a2 100644
--- 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 b4d96ecfd..faea22b3f 100644
--- 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 a38bd3aa7..5fa121e99 100644
--- 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 304ceaa6c..80a38b060 100644
--- 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 da55f2471..5588f62ae 100644
--- 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 0478bfb02..23c80e1d5 100644
--- 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 bbab345eb..4aa80e911 100644
--- 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 478fdd8c2..dca48a268 100644
--- 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 d688f87e1..ad6bd1925 100644
--- 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 8c793f862..04352d3c4 100644
--- 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 94abac435..a3cf3bc0d 100644
--- 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 97286f103..8d019fc4a 100644
--- 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 807adbf2e..a494991fb 100644
--- 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;