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/routing/binlog/binlog_common.c

@@ -18,7 +18,7 @@
 #include <unistd.h>
 #include <binlog_common.h>
 #include <blr_constants.h>
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 
 /**
  * @file binlog_common.c - Common binary log code shared between multiple modules

server/modules/routing/binlog/blr.c

@@ -58,29 +58,29 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <utils.h>
-#include <secrets.h>
-#include <spinlock.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/utils.h>
+#include <maxscale/secrets.h>
+#include <maxscale/spinlock.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
-#include <housekeeper.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/housekeeper.h>
 #include <time.h>
 
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 
 #include <mysql_client_server_protocol.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <uuid/uuid.h>
 #include <maxscale/alloc.h>
-#include <gw.h>
+#include <maxscale/gw.h>
 
 static char *version_str = "V2.1.0";
 

server/modules/routing/binlog/blr_cache.c

@@ -34,18 +34,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <spinlock.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/spinlock.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
 
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 
 
 /**

server/modules/routing/binlog/blr_file.c

@@ -47,18 +47,18 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <spinlock.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/spinlock.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
-#include <gwdirs.h>
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/gwdirs.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 
 static int  blr_file_create(ROUTER_INSTANCE *router, char *file);

server/modules/routing/binlog/blr_master.c

@@ -55,26 +55,26 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <session.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/session.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
-#include <housekeeper.h>
-#include <buffer.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/housekeeper.h>
+#include <maxscale/buffer.h>
 
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
 
-#include <rdtsc.h>
-#include <thread.h>
+#include <maxscale/rdtsc.h>
+#include <maxscale/thread.h>
 
 /* Temporary requirement for auth data */
 #include <mysql_client_server_protocol.h>

server/modules/routing/binlog/blr_slave.c

@@ -68,24 +68,24 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <maxscale.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <spinlock.h>
+#include <maxscale/maxscale.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/spinlock.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
-#include <housekeeper.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/housekeeper.h>
 #include <sys/stat.h>
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <version.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/version.h>
 #include <zlib.h>
 #include <maxscale/alloc.h>
-#include <gw.h>
+#include <maxscale/gw.h>
 
 extern int load_mysql_users(SERV_LISTENER *listener);
 extern void blr_master_close(ROUTER_INSTANCE* router);

server/modules/routing/binlog/maxbinlogcheck.c

@@ -38,7 +38,7 @@
 #include <sys/stat.h>
 
 #include <maxscale/alloc.h>
-#include <log_manager.h>
+#include <maxscale/log_manager.h>
 #include <blr.h>
 
 

server/modules/routing/binlog/test/testbinlog.c

@@ -26,20 +26,20 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#include <service.h>
-#include <server.h>
-#include <router.h>
-#include <atomic.h>
-#include <spinlock.h>
+#include <maxscale/service.h>
+#include <maxscale/server.h>
+#include <maxscale/router.h>
+#include <maxscale/atomic.h>
+#include <maxscale/spinlock.h>
 #include <blr.h>
-#include <dcb.h>
-#include <spinlock.h>
-#include <housekeeper.h>
+#include <maxscale/dcb.h>
+#include <maxscale/spinlock.h>
+#include <maxscale/housekeeper.h>
 #include <time.h>
-#include <skygw_types.h>
-#include <skygw_utils.h>
-#include <log_manager.h>
-#include <gwdirs.h>
+#include <maxscale/skygw_types.h>
+#include <maxscale/skygw_utils.h>
+#include <maxscale/log_manager.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
 #include <mysql_client_server_protocol.h>
@@ -47,7 +47,7 @@
 #include <sys/stat.h>
 #include <getopt.h>
 
-#include <version.h>
+#include <maxscale/version.h>
 
 static void printVersion(const char *progname);
 static void printUsage(const char *progname);