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.

CMakeLists.txt

@@ -113,10 +113,10 @@ if(${MAXSCALE_VERSION} MATCHES "-stable")
 endif()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/server/include)
-configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_BINARY_DIR}/server/include/version.h @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/server/include/gwdirs.h.in ${CMAKE_BINARY_DIR}/server/include/gwdirs.h @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/server/include/adminusers.h.in ${CMAKE_BINARY_DIR}/server/include/adminusers.h @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/server/include/maxscale_test.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/version.h.in ${CMAKE_BINARY_DIR}/include/maxscale/version.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/gwdirs.h.in ${CMAKE_BINARY_DIR}/include/maxscale/gwdirs.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/include/maxscale/adminusers.h.in ${CMAKE_BINARY_DIR}/include/maxscale/adminusers.h @ONLY)
+configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.h.in ${CMAKE_BINARY_DIR}/include/maxscale/maxscale_test.h @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/etc/postinst.in ${CMAKE_BINARY_DIR}/postinst @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/etc/postrm.in ${CMAKE_BINARY_DIR}/postrm @ONLY)
 configure_file(${CMAKE_SOURCE_DIR}/server/test/maxscale_test.cnf ${CMAKE_BINARY_DIR}/maxscale.cnf @ONLY)
@@ -177,10 +177,10 @@ set(CMAKE_CXX_FLAGS_RELEASE "")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb")
 
 include_directories(avro)
-include_directories(server/include)
+include_directories(include)
 include_directories(server/inih)
 include_directories(server/modules/include)
-include_directories(${CMAKE_BINARY_DIR}/server/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
 include_directories(${CURL_INCLUDE_DIRS})
 
 if (BUILD_AVRO)

avro/maxavro.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro.h"
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 #include <errno.h>
 
 /** Maximum byte size of an integer value */

avro/maxavro.h

@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <jansson.h>
-#include <buffer.h>
+#include <maxscale/buffer.h>
 
 /** File magic and sync marker sizes block sizes */
 #define AVRO_MAGIC_SIZE 4

avro/maxavro_file.c

@@ -14,7 +14,7 @@
 #include "maxavro.h"
 #include <errno.h>
 #include <string.h>
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 
 
 static bool maxavro_read_sync(FILE *file, uint8_t* sync)

avro/maxavro_record.c

@@ -12,10 +12,10 @@
  */
 
 #include "maxavro.h"
-#include "skygw_utils.h"
+#include <maxscale/skygw_utils.h>
 #include <string.h>
-#include <skygw_debug.h>
-#include <log_manager.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/log_manager.h>
 #include <errno.h>
 
 bool maxavro_read_datablock_start(MAXAVRO_FILE *file);

avro/maxavro_schema.c

@@ -14,8 +14,8 @@
 #include "maxavro.h"
 #include <jansson.h>
 #include <string.h>
-#include <skygw_debug.h>
-#include <log_manager.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/log_manager.h>
 
 static const MAXAVRO_SCHEMA_FIELD types[MAXAVRO_TYPE_MAX] =
 {

avro/maxavro_write.c

@@ -15,7 +15,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include "maxavro.h"
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 #include <errno.h>
 
 /**

avro/maxavrocheck.c

@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <getopt.h>
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 static int verbose = 0;
 static uint64_t seekto = 0;

client/maxadmin.c

@@ -48,7 +48,7 @@
 #include <getopt.h>
 #include <stdbool.h>
 
-#include <version.h>
+#include <maxscale/version.h>
 
 #ifdef HISTORY
 #include <histedit.h>

include/maxscale/adminusers.h.in

@@ -24,7 +24,7 @@
  *
  * @endverbatim
  */
-#include <dcb.h>
+#include <maxscale/dcb.h>
 
 #define ADMIN_SALT "$1$MXS"
 

include/maxscale/alloc.h

@@ -15,7 +15,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/buffer.h

@@ -43,9 +43,9 @@
  * @endverbatim
  */
 #include <string.h>
-#include <skygw_debug.h>
-#include <hint.h>
-#include <spinlock.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/hint.h>
+#include <maxscale/spinlock.h>
 #include <stdint.h>
 
 EXTERN_C_BLOCK_BEGIN

include/maxscale/dbusers.h

@@ -13,7 +13,7 @@
  * Public License.
  */
 
-#include <service.h>
+#include <maxscale/service.h>
 #include <arpa/inet.h>
 
 

include/maxscale/dcb.h

@@ -12,15 +12,15 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <spinlock.h>
-#include <buffer.h>
-#include <listmanager.h>
-#include <gw_protocol.h>
-#include <gw_authenticator.h>
-#include <gw_ssl.h>
-#include <modinfo.h>
-#include <gwbitmask.h>
-#include <skygw_utils.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/buffer.h>
+#include <maxscale/listmanager.h>
+#include <maxscale/gw_protocol.h>
+#include <maxscale/gw_authenticator.h>
+#include <maxscale/gw_ssl.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/gwbitmask.h>
+#include <maxscale/skygw_utils.h>
 #include <netinet/in.h>
 
 #define ERRHANDLE

include/maxscale/externcmd.h

@@ -16,9 +16,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <maxscale_pcre2.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/maxscale_pcre2.h>
 
 #define MAXSCALE_EXTCMD_ARG_MAX 256
 

include/maxscale/filter.h

@@ -22,9 +22,9 @@
  * 27/05/2014   Mark Riddoch            Initial implementation
  *
  */
-#include <dcb.h>
-#include <session.h>
-#include <buffer.h>
+#include <maxscale/dcb.h>
+#include <maxscale/session.h>
+#include <maxscale/buffer.h>
 #include <stdint.h>
 
 /**

include/maxscale/gw.h

@@ -33,7 +33,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <stdbool.h>
-#include <gwdirs.h>
+#include <maxscale/gwdirs.h>
 
 #define EXIT_FAILURE 1
 

include/maxscale/gw_authenticator.h

@@ -27,7 +27,7 @@
  * @endverbatim
  */
 
-#include <buffer.h>
+#include <maxscale/buffer.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>

include/maxscale/gw_protocol.h

@@ -28,7 +28,7 @@
  * @endverbatim
  */
 
-#include <buffer.h>
+#include <maxscale/buffer.h>
 
 struct dcb;
 struct server;

include/maxscale/gw_ssl.h

@@ -27,7 +27,7 @@
  * @endverbatim
  */
 
-#include <gw_protocol.h>
+#include <maxscale/gw_protocol.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>

include/maxscale/gwbitmask.h

@@ -13,7 +13,7 @@
  * Public License.
  */
 
-#include <spinlock.h>
+#include <maxscale/spinlock.h>
 #include <maxscale/limits.h>
 
 /**

include/maxscale/gwdirs.h.in

@@ -17,7 +17,7 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
-#include <skygw_utils.h>
+#include <maxscale/skygw_utils.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/hashtable.h

@@ -28,8 +28,8 @@
  *
  * @endverbatim
  */
-#include <skygw_debug.h>
-#include <spinlock.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/spinlock.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/hint.h

@@ -25,7 +25,7 @@
  * @endverbatim
  */
 
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 
 /**

include/maxscale/housekeeper.h

@@ -13,8 +13,8 @@
  * Public License.
  */
 #include <time.h>
-#include <dcb.h>
-#include <hk_heartbeat.h>
+#include <maxscale/dcb.h>
+#include <maxscale/hk_heartbeat.h>
 /**
  * @file housekeeper.h A mechanism to have task run periodically
  *

include/maxscale/listener.h

@@ -27,9 +27,9 @@
  * @endverbatim
  */
 
-#include <gw_protocol.h>
-#include <gw_ssl.h>
-#include <hashtable.h>
+#include <maxscale/gw_protocol.h>
+#include <maxscale/gw_ssl.h>
+#include <maxscale/hashtable.h>
 
 struct dcb;
 struct service;

include/maxscale/listmanager.h

@@ -26,8 +26,8 @@
  * @endverbatim
  */
 
-#include <spinlock.h>
-#include <skygw_debug.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/skygw_debug.h>
 
 struct dcb;
 

include/maxscale/maxconfig.h

@@ -12,11 +12,11 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <skygw_utils.h>
+#include <maxscale/skygw_utils.h>
 #include <sys/utsname.h>
 #include <stdint.h>
 #include <openssl/sha.h>
-#include <spinlock.h>
+#include <maxscale/spinlock.h>
 /**
  * @file config.h The configuration handling elements
  *

include/maxscale/memlog.h

@@ -24,7 +24,7 @@
  *
  * @endverbatim
  */
-#include <spinlock.h>
+#include <maxscale/spinlock.h>
 
 typedef enum { ML_INT, ML_LONG, ML_LONGLONG, ML_STRING } MEMLOGTYPE;
 

include/maxscale/mlist.h

@@ -13,7 +13,7 @@
  * Public License.
  */
 
-#include <skygw_utils.h>
+#include <maxscale/skygw_utils.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/modules.h

@@ -12,10 +12,10 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <dcb.h>
-#include <modinfo.h>
-#include <resultset.h>
-#include <skygw_debug.h>
+#include <maxscale/dcb.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/resultset.h>
+#include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/modutil.h

@@ -26,10 +26,10 @@
  *
  * @endverbatim
  */
-#include <buffer.h>
-#include <dcb.h>
+#include <maxscale/buffer.h>
+#include <maxscale/dcb.h>
 #include <string.h>
-#include <maxscale_pcre2.h>
+#include <maxscale/maxscale_pcre2.h>
 
 #define PTR_IS_RESULTSET(b) (b[0] == 0x01 && b[1] == 0x0 && b[2] == 0x0 && b[3] == 0x01)
 #define PTR_IS_EOF(b) (b[0] == 0x05 && b[1] == 0x0 && b[2] == 0x0 && b[4] == 0xfe)

include/maxscale/monitor.h

@@ -13,13 +13,13 @@
  * Public License.
  */
 #include <mysql.h>
-#include <server.h>
-#include <dcb.h>
-#include <log_manager.h>
-#include <resultset.h>
-#include <maxconfig.h>
-#include <externcmd.h>
-#include <secrets.h>
+#include <maxscale/server.h>
+#include <maxscale/dcb.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/resultset.h>
+#include <maxscale/maxconfig.h>
+#include <maxscale/externcmd.h>
+#include <maxscale/secrets.h>
 
 /**
  * @file monitor.h      The interface to the monitor module

include/maxscale/mysql_utils.h

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <mysql.h>
-#include <server.h>
+#include <maxscale/server.h>
 
 /** Length-encoded integers */
 size_t leint_bytes(uint8_t* ptr);

include/maxscale/poll.h

@@ -12,9 +12,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <dcb.h>
-#include <gwbitmask.h>
-#include <resultset.h>
+#include <maxscale/dcb.h>
+#include <maxscale/gwbitmask.h>
+#include <maxscale/resultset.h>
 #include <sys/epoll.h>
 
 /**

include/maxscale/query_classifier.h

@@ -13,8 +13,8 @@
  * Public License.
  */
 
-#include <skygw_utils.h>
-#include <buffer.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/buffer.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/queuemanager.h

@@ -27,7 +27,7 @@
  */
 
 #include <stdbool.h>
-#include <spinlock.h>
+#include <maxscale/spinlock.h>
 
 #define CONNECTION_QUEUE_LIMIT 1000
 

include/maxscale/resultset.h

@@ -24,7 +24,7 @@
  *
  * @endverbatim
  */
-#include <dcb.h>
+#include <maxscale/dcb.h>
 
 
 /**

include/maxscale/router.h

@@ -27,9 +27,9 @@
  * 27/10/2015   Martin Brampton     Add RCAP_TYPE_NO_RSESSION
  *
  */
-#include <service.h>
-#include <session.h>
-#include <buffer.h>
+#include <maxscale/service.h>
+#include <maxscale/session.h>
+#include <maxscale/buffer.h>
 #include <stdint.h>
 
 /**

include/maxscale/server.h

@@ -12,8 +12,8 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <dcb.h>
-#include <resultset.h>
+#include <maxscale/dcb.h>
+#include <maxscale/resultset.h>
 
 /**
  * @file service.h

include/maxscale/service.h

@@ -14,16 +14,16 @@
  */
 
 #include <time.h>
-#include <gw_protocol.h>
-#include <spinlock.h>
-#include <dcb.h>
-#include <server.h>
-#include <listener.h>
-#include <filter.h>
-#include <hashtable.h>
-#include <resultset.h>
-#include <maxconfig.h>
-#include <queuemanager.h>
+#include <maxscale/gw_protocol.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/dcb.h>
+#include <maxscale/server.h>
+#include <maxscale/listener.h>
+#include <maxscale/filter.h>
+#include <maxscale/hashtable.h>
+#include <maxscale/resultset.h>
+#include <maxscale/maxconfig.h>
+#include <maxscale/queuemanager.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>

include/maxscale/session.h

@@ -34,13 +34,13 @@
  * @endverbatim
  */
 #include <time.h>
-#include <atomic.h>
-#include <buffer.h>
-#include <listmanager.h>
-#include <spinlock.h>
-#include <resultset.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/atomic.h>
+#include <maxscale/buffer.h>
+#include <maxscale/listmanager.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/resultset.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 
 struct dcb;
 struct service;

include/maxscale/skygw_debug.h

@@ -46,7 +46,7 @@
 #endif /* SS_DEBUG || SS_PROF */
 
 #if defined(SS_DEBUG) && defined(LOG_ASSERT)
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 # define ss_dassert(exp) do { if(!(exp)){\
         MXS_ERROR("debug assert %s:%d\n", (char*)__FILE__, __LINE__);\
         mxs_log_flush_sync(); assert(exp);} } while (false)

include/maxscale/skygw_utils.h

@@ -28,8 +28,8 @@
 #endif
 #define FSYNCLIMIT 10
 
-#include "skygw_types.h"
-#include "skygw_debug.h"
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_debug.h>
 
 #define DISKWRITE_LATENCY (5*MSEC_USEC)
 

include/maxscale/slist.h

@@ -13,7 +13,7 @@
  * Public License.
  */
 
-#include <skygw_utils.h>
+#include <maxscale/skygw_utils.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/spinlock.h

@@ -23,7 +23,7 @@
  * for the lock to be released. However they are useful in that they do not involve
  * system calls and are light weight when the expected wait time for a lock is low.
  */
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN
 

include/maxscale/test_utils.h

@@ -15,11 +15,11 @@
  */
 
 #include <maxscale/poll.h>
-#include <dcb.h>
-#include <housekeeper.h>
-#include <maxscale_test.h>
-#include <log_manager.h>
-#include <statistics.h>
+#include <maxscale/dcb.h>
+#include <maxscale/housekeeper.h>
+#include <maxscale/maxscale_test.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/statistics.h>
 
 void init_test_env(char *path)
 {

include/maxscale/users.h

@@ -12,9 +12,9 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <hashtable.h>
-#include <dcb.h>
-#include <listener.h>
+#include <maxscale/hashtable.h>
+#include <maxscale/dcb.h>
+#include <maxscale/listener.h>
 #include <openssl/sha.h>
 
 /**

query_classifier/qc_dummy/qc_dummy.cc

@@ -11,8 +11,8 @@
  * Public License.
  */
 
-#include <modules.h>
-#include <query_classifier.h>
+#include <maxscale/modules.h>
+#include <maxscale/query_classifier.h>
 
 qc_parse_result_t qc_parse(GWBUF* querybuf)
 {

query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc

@@ -55,12 +55,12 @@
 #include <strfunc.h>
 #include <item_func.h>
 
-#include <skygw_types.h>
-#include <skygw_debug.h>
-#include <log_manager.h>
-#include <query_classifier.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/query_classifier.h>
 #include <mysql_client_server_protocol.h>
-#include <gwdirs.h>
+#include <maxscale/gwdirs.h>
 
 #include <stdio.h>
 #include <stdlib.h>

query_classifier/qc_sqlite/builtin_functions.c

@@ -5,7 +5,7 @@
 #include "builtin_functions.h"
 #include <stdlib.h>
 #include <string.h>
-#include <skygw_debug.h>
+#include <maxscale/skygw_debug.h>
 
 static struct
 {

query_classifier/qc_sqlite/qc_sqlite.c

@@ -15,13 +15,13 @@
 
 #include <signal.h>
 #include <string.h>
-#include <log_manager.h>
-#include <modinfo.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/modinfo.h>
 #include <mysql_client_server_protocol.h>
-#include <platform.h>
-#include <query_classifier.h>
-#include <skygw_utils.h>
-#include <modutil.h>
+#include <maxscale/platform.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/modutil.h>
 #include <maxscale/alloc.h>
 #include "builtin_functions.h"
 

query_classifier/test/canonical_tests/canonizer.c

@@ -15,9 +15,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <query_classifier.h>
-#include <buffer.h>
-#include <gwdirs.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/buffer.h>
+#include <maxscale/gwdirs.h>
 
 int main(int argc, char** argv)
 {

query_classifier/test/classify.c

@@ -16,12 +16,12 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
-#include <query_classifier.h>
-#include <buffer.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/buffer.h>
 #include <mysql.h>
 #include <unistd.h>
-#include <gwdirs.h>
-#include <log_manager.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/log_manager.h>
 
 char* append(char* types, const char* type_name, size_t* lenp)
 {

query_classifier/test/compare.cc

@@ -20,10 +20,10 @@
 #include <set>
 #include <string>
 #include <sstream>
-#include <gwdirs.h>
-#include <log_manager.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/log_manager.h>
 #include <mysql_client_server_protocol.h>
-#include <query_classifier.h>
+#include <maxscale/query_classifier.h>
 using std::cerr;
 using std::cin;
 using std::cout;

server/core/adminusers.c

@@ -19,11 +19,11 @@
 #endif
 #include <unistd.h>
 #include <crypt.h>
-#include <users.h>
-#include <adminusers.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <gwdirs.h>
+#include <maxscale/users.h>
+#include <maxscale/adminusers.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/gwdirs.h>
 #include <sys/stat.h>
 
 /**

server/core/alloc.c

@@ -13,7 +13,7 @@
 
 #include <maxscale/alloc.h>
 #include <stdlib.h>
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 
 /**
  * @brief Allocates memory; behaves exactly like `malloc`.

server/core/authenticator.c

@@ -11,9 +11,9 @@
  * Public License.
  */
 
-#include <gw_authenticator.h>
-#include <modutil.h>
-#include <modules.h>
+#include <maxscale/gw_authenticator.h>
+#include <maxscale/modutil.h>
+#include <maxscale/modules.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/buffer.c

@@ -37,19 +37,19 @@
  *
  * @endverbatim
  */
-#include <buffer.h>
+#include <maxscale/buffer.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <maxscale/alloc.h>
-#include <atomic.h>
-#include <skygw_debug.h>
-#include <skygw_utils.h>
-#include <spinlock.h>
-#include <hint.h>
-#include <log_manager.h>
+#include <maxscale/atomic.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/hint.h>
+#include <maxscale/log_manager.h>
 
 #if defined(BUFFER_TRACE)
-#include <hashtable.h>
+#include <maxscale/hashtable.h>
 #include <execinfo.h>
 
 static HASHTABLE *buffer_hashtable = NULL;

server/core/config.c

@@ -50,30 +50,30 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <ini.h>
-#include <maxconfig.h>
-#include <dcb.h>
-#include <session.h>
-#include <service.h>
-#include <server.h>
-#include <users.h>
-#include <monitor.h>
-#include <modules.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/maxconfig.h>
+#include <maxscale/dcb.h>
+#include <maxscale/session.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/users.h>
+#include <maxscale/monitor.h>
+#include <maxscale/modules.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <mysql.h>
 #include <sys/utsname.h>
 #include <sys/fcntl.h>
 #include <glob.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <housekeeper.h>
-#include <notification.h>
+#include <maxscale/housekeeper.h>
+#include <maxscale/notification.h>
 #include <unistd.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <sys/utsname.h>
-#include <dbusers.h>
-#include <gw.h>
+#include <maxscale/dbusers.h>
+#include <maxscale/gw.h>
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>
 #define PCRE2_CODE_UNIT_WIDTH 8

server/core/dbusers.c

@@ -39,17 +39,17 @@
 #include <ctype.h>
 #include <mysql.h>
 
-#include <dcb.h>
-#include <service.h>
-#include <users.h>
-#include <dbusers.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <secrets.h>
+#include <maxscale/dcb.h>
+#include <maxscale/service.h>
+#include <maxscale/users.h>
+#include <maxscale/dbusers.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/secrets.h>
 #include <mysql_client_server_protocol.h>
 #include <mysqld_error.h>
 #include <regex.h>
-#include <mysql_utils.h>
+#include <maxscale/mysql_utils.h>
 #include <maxscale/alloc.h>
 
 /** Don't include the root user */

server/core/dcb.c

@@ -69,23 +69,23 @@
 #include <string.h>
 #include <time.h>
 #include <signal.h>
-#include <dcb.h>
-#include <listmanager.h>
-#include <spinlock.h>
-#include <server.h>
-#include <session.h>
-#include <service.h>
-#include <modules.h>
-#include <router.h>
+#include <maxscale/dcb.h>
+#include <maxscale/listmanager.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/server.h>
+#include <maxscale/session.h>
+#include <maxscale/service.h>
+#include <maxscale/modules.h>
+#include <maxscale/router.h>
 #include <errno.h>
-#include <gw.h>
+#include <maxscale/gw.h>
 #include <maxscale/poll.h>
-#include <atomic.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <hashtable.h>
-#include <listener.h>
-#include <hk_heartbeat.h>
+#include <maxscale/atomic.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/hashtable.h>
+#include <maxscale/listener.h>
+#include <maxscale/hk_heartbeat.h>
 #include <netinet/tcp.h>
 #include <sys/stat.h>
 #include <sys/socket.h>

server/core/externcmd.c

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <externcmd.h>
+#include <maxscale/externcmd.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/filter.c

@@ -26,12 +26,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <filter.h>
-#include <session.h>
-#include <modules.h>
-#include <spinlock.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/filter.h>
+#include <maxscale/session.h>
+#include <maxscale/modules.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 
 static SPINLOCK filter_spin = SPINLOCK_INIT;    /**< Protects the list of all filters */

server/core/gateway.c

@@ -48,35 +48,35 @@
 #include <ftw.h>
 #include <string.h>
 #include <strings.h>
-#include <gw.h>
+#include <maxscale/gw.h>
 #include <unistd.h>
 #include <time.h>
 #include <getopt.h>
-#include <service.h>
-#include <server.h>
-#include <dcb.h>
-#include <session.h>
-#include <modules.h>
-#include <maxconfig.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/dcb.h>
+#include <maxscale/session.h>
+#include <maxscale/modules.h>
+#include <maxscale/maxconfig.h>
 #include <maxscale/poll.h>
-#include <housekeeper.h>
-#include <service.h>
-#include <thread.h>
-#include <memlog.h>
+#include <maxscale/housekeeper.h>
+#include <maxscale/service.h>
+#include <maxscale/thread.h>
+#include <maxscale/memlog.h>
 
 #include <stdlib.h>
 #include <unistd.h>
 #include <mysql.h>
-#include <monitor.h>
-#include <version.h>
-#include <maxscale.h>
+#include <maxscale/monitor.h>
+#include <maxscale/version.h>
+#include <maxscale/maxscale.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <query_classifier.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/query_classifier.h>
 
 #include <execinfo.h>
 
@@ -84,7 +84,7 @@
 #include <sys/wait.h>
 #include <sys/prctl.h>
 #include <sys/file.h>
-#include <statistics.h>
+#include <maxscale/statistics.h>
 #include <maxscale/alloc.h>
 
 #define STRING_BUFFER_SIZE 1024

server/core/gw_ssl.c

@@ -29,9 +29,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include <dcb.h>
-#include <service.h>
-#include <log_manager.h>
+#include <maxscale/dcb.h>
+#include <maxscale/service.h>
+#include <maxscale/log_manager.h>
 #include <sys/ioctl.h>
 
 /**

server/core/gw_utils.c

@@ -34,12 +34,12 @@
  *@endverbatim
  */
 
-#include <gw.h>
-#include <dcb.h>
-#include <session.h>
+#include <maxscale/gw.h>
+#include <maxscale/dcb.h>
+#include <maxscale/session.h>
 
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 
 SPINLOCK tmplock = SPINLOCK_INIT;
 

server/core/gwbitmask.c

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <gwbitmask.h>
+#include <maxscale/gwbitmask.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/gwdirs.c

@@ -11,9 +11,9 @@
  * Public License.
  */
 
-#include <gwdirs.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
-#include <gw.h>
+#include <maxscale/gw.h>
 
 /**
  * Set the configuration file directory

server/core/hashtable.c

@@ -18,8 +18,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <maxscale/alloc.h>
-#include <atomic.h>
-#include <hashtable.h>
+#include <maxscale/atomic.h>
+#include <maxscale/hashtable.h>
 
 /**
  * @file hashtable.c General purpose hashtable routines

server/core/hint.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <hint.h>
+#include <maxscale/hint.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/housekeeper.c

@@ -13,10 +13,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <maxscale/alloc.h>
-#include <housekeeper.h>
-#include <thread.h>
-#include <spinlock.h>
-#include <log_manager.h>
+#include <maxscale/housekeeper.h>
+#include <maxscale/thread.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/log_manager.h>
 
 /**
  * @file housekeeper.c  Provide a mechanism to run periodic tasks

server/core/listener.c

@@ -30,13 +30,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <listener.h>
-#include <gw_ssl.h>
-#include <gw_protocol.h>
-#include <log_manager.h>
+#include <maxscale/listener.h>
+#include <maxscale/gw_ssl.h>
+#include <maxscale/gw_protocol.h>
+#include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
-#include <users.h>
-#include <modules.h>
+#include <maxscale/users.h>
+#include <maxscale/modules.h>
 
 static RSA *rsa_512 = NULL;
 static RSA *rsa_1024 = NULL;

server/core/listmanager.c

@@ -31,10 +31,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
-#include <listmanager.h>
-#include <spinlock.h>
-#include <dcb.h>
-#include <log_manager.h>
+#include <maxscale/listmanager.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/dcb.h>
+#include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/load_utils.c

@@ -34,17 +34,17 @@
 #include <unistd.h>
 #include <string.h>
 #include <dlfcn.h>
-#include <modules.h>
-#include <modinfo.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <version.h>
-#include <notification.h>
+#include <maxscale/modules.h>
+#include <maxscale/modinfo.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/version.h>
+#include <maxscale/notification.h>
 #include <curl/curl.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <gw.h>
-#include <gwdirs.h>
+#include <maxscale/gw.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
 static MODULES *registered = NULL;

server/core/log_manager.cc

@@ -10,7 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -23,14 +23,14 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <syslog.h>
-#include <atomic.h>
+#include <maxscale/atomic.h>
 
-#include <hashtable.h>
-#include <mlist.h>
-#include <spinlock.h>
-#include <skygw_debug.h>
-#include <skygw_types.h>
-#include <skygw_utils.h>
+#include <maxscale/hashtable.h>
+#include <maxscale/mlist.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/skygw_debug.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>
 
 #define MAX_PREFIXLEN 250

server/core/maxkeys.c

@@ -24,10 +24,10 @@
  */
 #include <getopt.h>
 #include <stdio.h>
-#include <secrets.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <gwdirs.h>
+#include <maxscale/secrets.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/gwdirs.h>
 
 struct option options[] =
 {

server/core/maxpasswd.c

@@ -23,10 +23,10 @@
  * @endverbatim
  */
 #include <stdio.h>
-#include <gwdirs.h>
-#include <log_manager.h>
-#include <secrets.h>
-#include <skygw_utils.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/secrets.h>
+#include <maxscale/skygw_utils.h>
 
 struct option options[] =
 {

server/core/maxscale_pcre2.c

@@ -24,7 +24,7 @@
  * @endverbatim
  */
 
-#include <maxscale_pcre2.h>
+#include <maxscale/maxscale_pcre2.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/memlog.c

@@ -22,13 +22,13 @@
  *
  * @endverbatim
  */
-#include <memlog.h>
+#include <maxscale/memlog.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
 #include <maxscale/alloc.h>
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 
 static MEMLOG *memlogs = NULL;
 static SPINLOCK memlock = SPINLOCK_INIT;

server/core/misc.c

@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale.h>
+#include <maxscale/maxscale.h>
 #include <time.h>
 
 static time_t started;