Fix circular #include

refs #6985

lib/base/exception.cpp

@@ -1,6 +1,7 @@
 /* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #include "base/exception.hpp"
+#include <boost/thread/tss.hpp>
 
 #ifdef HAVE_CXXABI_H
 #	include <cxxabi.h>

lib/base/exception.hpp

@@ -7,7 +7,6 @@
 #include "base/string.hpp"
 #include "base/stacktrace.hpp"
 #include "base/context.hpp"
-#include "base/utility.hpp"
 #include "base/debuginfo.hpp"
 #include "base/dictionary.hpp"
 #include "base/configobject.hpp"

lib/base/scriptglobal.cpp

@@ -10,6 +10,7 @@
 #include "base/objectlock.hpp"
 #include "base/exception.hpp"
 #include "base/namespace.hpp"
+#include "base/utility.hpp"
 #include <fstream>
 
 using namespace icinga;

lib/base/socketevents-epoll.cpp

@@ -3,6 +3,7 @@
 #include "base/socketevents.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 #ifdef __linux__

lib/base/socketevents-poll.cpp

@@ -3,6 +3,7 @@
 #include "base/socketevents.hpp"
 #include "base/exception.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 

lib/base/socketevents.cpp

@@ -5,6 +5,7 @@
 #include "base/logger.hpp"
 #include "base/application.hpp"
 #include "base/scriptglobal.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <map>
 #ifdef __linux__

lib/cli/apisetuputility.cpp

@@ -11,6 +11,7 @@
 #include "base/tlsutility.hpp"
 #include "base/scriptglobal.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/case_conv.hpp>

lib/config/configcompilercontext.cpp

@@ -6,6 +6,7 @@
 #include "base/netstring.hpp"
 #include "base/exception.hpp"
 #include "base/application.hpp"
+#include "base/utility.hpp"
 
 using namespace icinga;
 

lib/config/configitem.cpp

@@ -19,6 +19,7 @@
 #include "base/json.hpp"
 #include "base/exception.hpp"
 #include "base/function.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <sstream>
 #include <fstream>

lib/remote/apilistener-filesync.cpp

@@ -7,6 +7,7 @@
 #include "base/logger.hpp"
 #include "base/convert.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <fstream>
 #include <iomanip>
 

lib/remote/configfileshandler.cpp

@@ -5,6 +5,7 @@
 #include "remote/httputility.hpp"
 #include "remote/filterutility.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/join.hpp>
 #include <fstream>
 

lib/remote/configobjectutility.cpp

@@ -8,6 +8,7 @@
 #include "base/configwriter.hpp"
 #include "base/exception.hpp"
 #include "base/dependencygraph.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 #include <fstream>
 

lib/remote/consolehandler.cpp

@@ -12,6 +12,7 @@
 #include "base/timer.hpp"
 #include "base/namespace.hpp"
 #include "base/initialize.hpp"
+#include "base/utility.hpp"
 #include <boost/thread/once.hpp>
 #include <set>
 

lib/remote/filterutility.cpp

@@ -8,6 +8,7 @@
 #include "base/json.hpp"
 #include "base/configtype.hpp"
 #include "base/logger.hpp"
+#include "base/utility.hpp"
 #include <boost/algorithm/string/case_conv.hpp>
 
 using namespace icinga;

plugins/check_nscp_api.cpp

@@ -10,6 +10,7 @@
 #include "base/string.hpp"
 #include "base/logger.hpp"
 #include "base/exception.hpp"
+#include "base/utility.hpp"
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <iostream>