From 8f257a51fec1534a3c25ad0731dc73bbe249dc69 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 17 Aug 2018 13:46:33 +0300
Subject: [PATCH] MXS-2008 Remove unused headers from worker.hh

Add corresponding headers to files that depended on those headers.
---
 include/maxscale/worker.hh                                | 6 +++---
 server/modules/monitor/mariadbmon/cluster_discovery.cc    | 1 +
 server/modules/monitor/mariadbmon/cluster_manipulation.cc | 1 +
 server/modules/monitor/mariadbmon/mariadbmon.cc           | 2 +-
 server/modules/routing/avrorouter/avro.cc                 | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/maxscale/worker.hh b/include/maxscale/worker.hh
index 80541ed23..5e5e7a92c 100644
--- a/include/maxscale/worker.hh
+++ b/include/maxscale/worker.hh
@@ -14,15 +14,15 @@
 
 #include <maxscale/ccdefs.hh>
 
+#include <cstring>
 #include <functional>
 #include <map>
 #include <memory>
 #include <thread>
-#include <unordered_set>
+#include <unordered_map>
 
+#include <maxbase/atomic.h>
 #include <maxbase/semaphore.hh>
-#include <maxscale/session.h>
-#include <maxscale/utils.hh>
 #include <maxscale/worker.h>
 #include <maxscale/workertask.hh>
 
diff --git a/server/modules/monitor/mariadbmon/cluster_discovery.cc b/server/modules/monitor/mariadbmon/cluster_discovery.cc
index 0d4e3ca82..e315a4703 100644
--- a/server/modules/monitor/mariadbmon/cluster_discovery.cc
+++ b/server/modules/monitor/mariadbmon/cluster_discovery.cc
@@ -18,6 +18,7 @@
 #include <queue>
 #include <maxscale/modutil.h>
 #include <maxscale/mysql_utils.h>
+#include <maxscale/utils.hh>
 
 
 using std::string;
diff --git a/server/modules/monitor/mariadbmon/cluster_manipulation.cc b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
index feedb410a..f655c6f05 100644
--- a/server/modules/monitor/mariadbmon/cluster_manipulation.cc
+++ b/server/modules/monitor/mariadbmon/cluster_manipulation.cc
@@ -17,6 +17,7 @@
 #include <sstream>
 #include <maxscale/clock.h>
 #include <maxscale/mysql_utils.h>
+#include <maxscale/utils.hh>
 
 using std::string;
 using maxscale::string_printf;
diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc
index 4d3c97d3e..ec73acf88 100644
--- a/server/modules/monitor/mariadbmon/mariadbmon.cc
+++ b/server/modules/monitor/mariadbmon/mariadbmon.cc
@@ -25,7 +25,7 @@
 #include <maxscale/mysql_utils.h>
 #include <maxscale/routingworker.h>
 #include <maxscale/secrets.h>
-#include <maxscale/utils.h>
+#include <maxscale/utils.hh>
 // TODO: For monitor_add_parameters
 #include "../../../core/internal/monitor.h"
 
diff --git a/server/modules/routing/avrorouter/avro.cc b/server/modules/routing/avrorouter/avro.cc
index 0d1331f09..d8d492e37 100644
--- a/server/modules/routing/avrorouter/avro.cc
+++ b/server/modules/routing/avrorouter/avro.cc
@@ -40,7 +40,7 @@
 #include <maxscale/server.h>
 #include <maxscale/service.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/utils.h>
+#include <maxscale/utils.hh>
 #include <maxscale/routingworker.h>
 #include <maxscale/worker.hh>
 #include <binlog_common.h>