Remove unnecessary includes

lib/base/debuginfo.hpp

@@ -22,7 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/string.hpp"
-#include "base/exception.hpp"
 
 namespace icinga
 {

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>

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);
 

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.
  *

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>
 

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>

lib/base/stream.hpp

@@ -22,7 +22,6 @@
 
 #include "base/i2-base.hpp"
 #include "base/object.hpp"
-#include "base/string.hpp"
 
 namespace icinga
 {

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

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
 {

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>

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>

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>

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;

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>

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>
 

lib/icinga/dependency.hpp

@@ -22,7 +22,6 @@
 
 #include "icinga/i2-icinga.hpp"
 #include "icinga/dependency.thpp"
-#include "base/dictionary.hpp"
 
 namespace icinga
 {

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;
 

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>
 

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;