From ba842403ce95ef3e992e3eb906d1094c7d08bed1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Mon, 1 Apr 2019 18:54:13 +0200
Subject: [PATCH] Fix circular #include

refs #6985
---
 lib/base/exception.cpp               | 1 +
 lib/base/exception.hpp               | 1 -
 lib/base/scriptglobal.cpp            | 1 +
 lib/base/socketevents-epoll.cpp      | 1 +
 lib/base/socketevents-poll.cpp       | 1 +
 lib/base/socketevents.cpp            | 1 +
 lib/cli/apisetuputility.cpp          | 1 +
 lib/config/configcompilercontext.cpp | 1 +
 lib/config/configitem.cpp            | 1 +
 lib/remote/apilistener-filesync.cpp  | 1 +
 lib/remote/configfileshandler.cpp    | 1 +
 lib/remote/configobjectutility.cpp   | 1 +
 lib/remote/consolehandler.cpp        | 1 +
 lib/remote/filterutility.cpp         | 1 +
 plugins/check_nscp_api.cpp           | 1 +
 15 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index d0e363e61..ade4702b3 100644
--- a/lib/base/exception.cpp
+++ b/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>
diff --git a/lib/base/exception.hpp b/lib/base/exception.hpp
index 47e53dac5..5daa0c85c 100644
--- a/lib/base/exception.hpp
+++ b/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"
diff --git a/lib/base/scriptglobal.cpp b/lib/base/scriptglobal.cpp
index d4ac81e9f..4b5caa444 100644
--- a/lib/base/scriptglobal.cpp
+++ b/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;
diff --git a/lib/base/socketevents-epoll.cpp b/lib/base/socketevents-epoll.cpp
index f241b54af..0e75ee5e8 100644
--- a/lib/base/socketevents-epoll.cpp
+++ b/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__
diff --git a/lib/base/socketevents-poll.cpp b/lib/base/socketevents-poll.cpp
index 4b12316b2..f8200d435 100644
--- a/lib/base/socketevents-poll.cpp
+++ b/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>
 
diff --git a/lib/base/socketevents.cpp b/lib/base/socketevents.cpp
index 1d31b4662..f79d4218d 100644
--- a/lib/base/socketevents.cpp
+++ b/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__
diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index cee4e1ee3..448069d5e 100644
--- a/lib/cli/apisetuputility.cpp
+++ b/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>
diff --git a/lib/config/configcompilercontext.cpp b/lib/config/configcompilercontext.cpp
index 4a04b258b..77aa3f065 100644
--- a/lib/config/configcompilercontext.cpp
+++ b/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;
 
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 1c3b950d7..a7c960c9b 100644
--- a/lib/config/configitem.cpp
+++ b/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>
diff --git a/lib/remote/apilistener-filesync.cpp b/lib/remote/apilistener-filesync.cpp
index 9e73c9bb8..87aae6104 100644
--- a/lib/remote/apilistener-filesync.cpp
+++ b/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>
 
diff --git a/lib/remote/configfileshandler.cpp b/lib/remote/configfileshandler.cpp
index d4c761c7b..d714f4d86 100644
--- a/lib/remote/configfileshandler.cpp
+++ b/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>
 
diff --git a/lib/remote/configobjectutility.cpp b/lib/remote/configobjectutility.cpp
index d16f887a7..e1d52d8da 100644
--- a/lib/remote/configobjectutility.cpp
+++ b/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>
 
diff --git a/lib/remote/consolehandler.cpp b/lib/remote/consolehandler.cpp
index 0f0fddc8f..e836f8844 100644
--- a/lib/remote/consolehandler.cpp
+++ b/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>
 
diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index f7bfa1e99..c4579cf95 100644
--- a/lib/remote/filterutility.cpp
+++ b/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;
diff --git a/plugins/check_nscp_api.cpp b/plugins/check_nscp_api.cpp
index 6619b960e..f800fccd8 100644
--- a/plugins/check_nscp_api.cpp
+++ b/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>
-- 
2.40.0