Move headers from server/include to include/maxscale

- Headers now to be included as <maxscale/xyz.h>
- First step, no cleanup of headers has been made. Only moving
  from one place to another + necessary modifications.

server/modules/filter/cache/cache.c

@@ -13,13 +13,13 @@
 
 #define MXS_MODULE_NAME "cache"
 #include <maxscale/alloc.h>
-#include <filter.h>
-#include <gwdirs.h>
-#include <log_manager.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <mysql_utils.h>
-#include <query_classifier.h>
+#include <maxscale/filter.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/mysql_utils.h>
+#include <maxscale/query_classifier.h>
 #include "cache.h"
 #include "rules.h"
 #include "storage.h"

server/modules/filter/cache/cache_storage_api.h

@@ -15,9 +15,9 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <buffer.h>
+#include <maxscale/buffer.h>
 #include <mysql_client_server_protocol.h>
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN
 

server/modules/filter/cache/rules.c

@@ -16,10 +16,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <maxscale/alloc.h>
-#include <modutil.h>
+#include <maxscale/modutil.h>
 #include <mysql_client_server_protocol.h>
-#include <query_classifier.h>
-#include <session.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/session.h>
 #include "cache.h"
 
 static const char KEY_ATTRIBUTE[] = "attribute";

server/modules/filter/cache/rules.h

@@ -15,9 +15,9 @@
 
 #include <stdbool.h>
 #include <jansson.h>
-#include <buffer.h>
-#include <session.h>
-#include <maxscale_pcre2.h>
+#include <maxscale/buffer.h>
+#include <maxscale/session.h>
+#include <maxscale/maxscale_pcre2.h>
 
 
 typedef enum cache_rule_attribute

server/modules/filter/cache/storage.c

@@ -15,8 +15,8 @@
 #include <dlfcn.h>
 #include <sys/param.h>
 #include <maxscale/alloc.h>
-#include <gwdirs.h>
-#include <log_manager.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/log_manager.h>
 
 CACHE_STORAGE_MODULE* cache_storage_open(const char *name)
 {

server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc

@@ -19,13 +19,13 @@
 #include <set>
 #include <rocksdb/env.h>
 #include <maxscale/alloc.h>
-#include <gwdirs.h>
+#include <maxscale/gwdirs.h>
 extern "C"
 {
 // TODO: Add extern "C" to modutil.h
-#include <modutil.h>
+#include <maxscale/modutil.h>
 }
-#include <query_classifier.h>
+#include <maxscale/query_classifier.h>
 #include "rocksdbinternals.h"
 
 using std::for_each;

server/modules/filter/cache/storage/storage_rocksdb/storage_rocksdb.h

@@ -14,6 +14,6 @@
  */
 
 #define MXS_MODULE_NAME "storage_rocksdb"
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 
 #endif

server/modules/filter/cache/test/testrules.c

@@ -13,11 +13,11 @@
 
 #include <stdlib.h>
 #include "rules.h"
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 #if !defined(SS_DEBUG)
 #define SS_DEBUG
 #endif
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 struct test_case
 {

server/modules/filter/ccrfilter/ccrfilter.c

@@ -11,14 +11,14 @@
  * Public License.
  */
 #include <stdio.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <string.h>
-#include <hint.h>
-#include <query_classifier.h>
+#include <maxscale/hint.h>
+#include <maxscale/query_classifier.h>
 #include <regex.h>
 #include <maxscale/alloc.h>
 

server/modules/filter/dbfwfilter/dbfwfilter.c

@@ -62,20 +62,20 @@
 
 #include <my_config.h>
 #include <stdio.h>
-#include <filter.h>
+#include <maxscale/filter.h>
 #include <string.h>
-#include <atomic.h>
-#include <modutil.h>
-#include <log_manager.h>
-#include <query_classifier.h>
+#include <maxscale/atomic.h>
+#include <maxscale/modutil.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/query_classifier.h>
 #include <mysql_client_server_protocol.h>
-#include <spinlock.h>
-#include <skygw_types.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/skygw_types.h>
 #include <time.h>
 #include <assert.h>
 #include <regex.h>
-#include <maxscale_pcre2.h>
-#include <dbfwfilter.h>
+#include <maxscale/maxscale_pcre2.h>
+#include "dbfwfilter.h"
 #include <ruleparser.yy.h>
 #include <lex.yy.h>
 #include <stdlib.h>

server/modules/filter/dbfwfilter/ruleparser.y

@@ -19,8 +19,8 @@
 
 %{
 #include <lex.yy.h>
-#include <dbfwfilter.h>
-#include <log_manager.h>
+#include "dbfwfilter.h"
+#include <maxscale/log_manager.h>
 %}
 
 /** We need a reentrant scanner so no global variables are used */

server/modules/filter/gatekeeper/gatekeeper.c

@@ -12,13 +12,13 @@
  */
 
 #include <stdio.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <atomic.h>
-#include <query_classifier.h>
-#include <hashtable.h>
-#include <gwdirs.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/atomic.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/hashtable.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
 #define GK_DEFAULT_HASHTABLE_SIZE 1000

server/modules/filter/hintfilter/hintfilter.c

@@ -11,10 +11,10 @@
  * Public License.
  */
 #include <stdio.h>
-#include <filter.h>
+#include <maxscale/filter.h>
 #include <maxscale/alloc.h>
-#include <modinfo.h>
-#include <modutil.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
 #include <mysqlhint.h>
 
 /**

server/modules/filter/hintfilter/hintparser.c

@@ -13,11 +13,11 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
 #include <mysqlhint.h>
 #include <maxscale/alloc.h>
 

server/modules/filter/luafilter/luafilter.c

@@ -36,14 +36,14 @@
  * or diagnostic being made for the session script.
  */
 
-#include <skygw_types.h>
-#include <spinlock.h>
-#include <skygw_debug.h>
-#include <log_manager.h>
-#include <string.h>
-#include <filter.h>
-#include <session.h>
-#include <modutil.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/string.h>
+#include <maxscale/filter.h>
+#include <maxscale/session.h>
+#include <maxscale/modutil.h>
 #include "lua.h"
 #include "lualib.h"
 #include "lauxlib.h"

server/modules/filter/mqfilter/mqfilter.c

@@ -59,23 +59,23 @@
 #include <my_config.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 #include <amqp.h>
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
 #include <mysql_client_server_protocol.h>
-#include <log_manager.h>
-#include <query_classifier.h>
-#include <spinlock.h>
-#include <session.h>
-#include <housekeeper.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/session.h>
+#include <maxscale/housekeeper.h>
 #include <maxscale/alloc.h>
 
 MODULE_INFO info =

server/modules/filter/namedserverfilter/namedserverfilter.c

@@ -13,14 +13,14 @@
 
 #include <stdio.h>
 #include <maxscale/alloc.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <string.h>
 #include <regex.h>
-#include <hint.h>
+#include <maxscale/hint.h>
 #include <maxscale/alloc.h>
 
 /**

server/modules/filter/qlafilter/qlafilter.c

@@ -37,16 +37,16 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <time.h>
 #include <sys/time.h>
 #include <regex.h>
 #include <string.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 #include <maxscale/alloc.h>
 
 MODULE_INFO info =

server/modules/filter/regexfilter/regexfilter.c

@@ -13,16 +13,16 @@
 
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <stdio.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <string.h>
 #include <pcre2.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 #include <maxscale/alloc.h>
-#include "maxconfig.h"
+#include <maxscale/maxconfig.h>
 
 /**
  * @file regexfilter.c - a very simple regular expression rewrite filter.

server/modules/filter/tee/tee.c

@@ -43,23 +43,23 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <sys/time.h>
 #include <regex.h>
 #include <string.h>
-#include <service.h>
-#include <router.h>
-#include <dcb.h>
+#include <maxscale/service.h>
+#include <maxscale/router.h>
+#include <maxscale/dcb.h>
 #include <sys/time.h>
 #include <maxscale/poll.h>
 #include <mysql_client_server_protocol.h>
-#include <housekeeper.h>
+#include <maxscale/housekeeper.h>
 #include <maxscale/alloc.h>
-#include <listmanager.h>
+#include <maxscale/listmanager.h>
 
 #define MYSQL_COM_QUIT                  0x01
 #define MYSQL_COM_INITDB                0x02

server/modules/filter/testfilter/testfilter.c

@@ -11,11 +11,11 @@
  * Public License.
  */
 #include <stdio.h>
-#include <filter.h>
+#include <maxscale/filter.h>
 #include <maxscale/alloc.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <atomic.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/atomic.h>
 
 /**
  * @file testfilter.c - a very simple test filter.

server/modules/filter/topfilter/topfilter.c

@@ -34,16 +34,16 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
 #include <regex.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 #include <maxscale/alloc.h>
 
 MODULE_INFO info =

server/modules/filter/tpmfilter/tpmfilter.c

@@ -41,16 +41,16 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <filter.h>
-#include <modinfo.h>
-#include <modutil.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/modutil.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
 #include <regex.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;