MXS-2220 Move MxsDiskSpaceThreshold definition to SERVER

Reduces include-clutter a bit.

include/maxscale/config.hh

@@ -20,9 +20,6 @@
 
 #include <unordered_map>
 #include <string>
-// A mapping from a path to a percentage, e.g.: "/disk" -> 80.
-typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
-
 #include <limits.h>
 #include <openssl/sha.h>
 #include <sys/utsname.h>
@@ -32,6 +29,7 @@ typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
 #include <maxscale/modinfo.h>
 #include <maxscale/pcre2.h>
 #include <maxscale/query_classifier.h>
+#include <maxscale/server.hh>
 
 class SERVICE;
 

include/maxscale/server.hh

@@ -15,9 +15,11 @@
 #include <maxscale/ccdefs.hh>
 
 #include <string>
-#include <maxbase/jansson.h>
-#include <maxscale/config.hh>
-#include <maxscale/dcb.hh>
+#include <maxscale/ssl.h>
+#include <unordered_map>
+
+// A mapping from a path to a percentage, e.g.: "/disk" -> 80.
+typedef std::unordered_map<std::string, int32_t> MxsDiskSpaceThreshold;
 
 /**
  * Server configuration parameters names
@@ -37,6 +39,8 @@ const int MAINTENANCE_ON = 100;
 const int MAINTENANCE_FLAG_NOCHECK = 0;
 const int MAINTENANCE_FLAG_CHECK = -1;
 
+struct DCB;
+
 /* Custom server parameters. These can be used by modules for e.g. weighting routing decisions. */
 struct SERVER_PARAM
 {

server/core/internal/server.hh

@@ -19,11 +19,10 @@
 #include <maxbase/ccdefs.hh>
 
 #include <mutex>
-
 #include <maxbase/average.hh>
+#include <maxscale/config.hh>
 #include <maxscale/server.hh>
 #include <maxscale/resultset.hh>
-#include <maxscale/routingworker.hh>
 
 std::unique_ptr<ResultSet> serverGetList();
 

server/modules/filter/masking/maskingrules.hh

@@ -20,7 +20,7 @@
 
 #include <maxbase/jansson.h>
 #include <maxscale/pcre2.h>
-
+#include <maxscale/queryclassifier.hh>
 #include "mysql.hh"
 
 /**