From 3a18b64bddc882fec6c92f2e7daa4bb7d5001fdc Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 13 Oct 2016 19:40:00 +0300
Subject: [PATCH] mysql_client_server_protocol.h moved.

Moved to include/maxscale/protocol/mysql.h
---
 .../maxscale/protocol/mysql.h                      |  4 ++--
 .../qc_mysqlembedded/qc_mysqlembedded.cc           |  2 +-
 query_classifier/qc_sqlite/qc_sqlite.c             |  2 +-
 query_classifier/test/compare.cc                   |  2 +-
 server/core/dbusers.c                              |  2 +-
 server/core/modutil.c                              |  2 +-
 server/core/secrets.c                              |  2 +-
 server/core/test/test_mysql_users.c                |  2 +-
 server/modules/authenticator/gssapi_auth.c         |  2 +-
 server/modules/authenticator/gssapi_backend_auth.c |  2 +-
 server/modules/authenticator/mysql_auth.c          | 14 +++++++-------
 server/modules/authenticator/mysql_backend_auth.c  |  2 +-
 server/modules/filter/cache/cache_storage_api.h    |  2 +-
 server/modules/filter/cache/rules.c                |  2 +-
 server/modules/filter/dbfwfilter/dbfwfilter.c      |  2 +-
 server/modules/filter/mqfilter/mqfilter.c          |  2 +-
 server/modules/filter/tee/tee.c                    |  2 +-
 server/modules/include/mysql_auth.h                |  2 +-
 .../protocol/MySQL/MySQLBackend/mysql_backend.c    |  2 +-
 .../protocol/MySQL/MySQLClient/mysql_client.c      |  4 ++--
 server/modules/protocol/MySQL/mysql_common.c       |  4 ++--
 server/modules/routing/avro/avro.c                 |  2 +-
 server/modules/routing/avro/avrorouter.h           |  2 +-
 server/modules/routing/binlog/blr.c                |  2 +-
 server/modules/routing/binlog/blr.h                |  2 +-
 server/modules/routing/binlog/blr_master.c         |  2 +-
 server/modules/routing/binlog/test/testbinlog.c    |  2 +-
 .../modules/routing/readconnroute/readconnroute.c  |  4 ++--
 .../routing/readwritesplit/rwsplit_internal.h      |  2 +-
 .../modules/routing/readwritesplit/rwsplit_mysql.c |  4 ++--
 server/modules/routing/schemarouter/schemarouter.c |  2 +-
 server/modules/routing/schemarouter/schemarouter.h |  2 +-
 .../modules/routing/schemarouter/sharding_common.h |  2 +-
 33 files changed, 44 insertions(+), 44 deletions(-)
 rename server/modules/include/mysql_client_server_protocol.h => include/maxscale/protocol/mysql.h (99%)

diff --git a/server/modules/include/mysql_client_server_protocol.h b/include/maxscale/protocol/mysql.h
similarity index 99%
rename from server/modules/include/mysql_client_server_protocol.h
rename to include/maxscale/protocol/mysql.h
index 1dbc435b7..f19230e89 100644
--- a/server/modules/include/mysql_client_server_protocol.h
+++ b/include/maxscale/protocol/mysql.h
@@ -1,5 +1,5 @@
-#ifndef _MYSQL_PROTOCOL_H
-#define _MYSQL_PROTOCOL_H
+#ifndef _MAXSCALE_PROTOCOL_MYSQL_H
+#define _MAXSCALE_PROTOCOL_MYSQL_H
 /*
  * Copyright (c) 2016 MariaDB Corporation Ab
  *
diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index e9fd30a36..23dd508fc 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -59,7 +59,7 @@
 #include <maxscale/skygw_debug.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gwdirs.h>
 
 #include <stdio.h>
diff --git a/query_classifier/qc_sqlite/qc_sqlite.c b/query_classifier/qc_sqlite/qc_sqlite.c
index 686b4821c..a5fbebd27 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.c
+++ b/query_classifier/qc_sqlite/qc_sqlite.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/platform.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/skygw_utils.h>
diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index b52d06a1f..964a41dd0 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <maxscale/gwdirs.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 using std::cerr;
 using std::cin;
diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index ab304107e..cd6491f77 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -46,7 +46,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysqld_error.h>
 #include <regex.h>
 #include <maxscale/mysql_utils.h>
diff --git a/server/core/modutil.c b/server/core/modutil.c
index 9a0daba9c..92d4d6bf6 100644
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@@ -26,7 +26,7 @@
  */
 #include <maxscale/buffer.h>
 #include <string.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <maxscale/modutil.h>
diff --git a/server/core/secrets.c b/server/core/secrets.c
index f9716bc3a..4ab38da52 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -16,7 +16,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <ctype.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/random_jkiss.h>
 #include <maxscale/alloc.h>
diff --git a/server/core/test/test_mysql_users.c b/server/core/test/test_mysql_users.c
index 0defa3ff6..c25b16205 100644
--- a/server/core/test/test_mysql_users.c
+++ b/server/core/test/test_mysql_users.c
@@ -35,7 +35,7 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
 #include <maxscale/dbusers.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
 #include <maxscale/listener.h>
 #include <arpa/inet.h>
diff --git a/server/modules/authenticator/gssapi_auth.c b/server/modules/authenticator/gssapi_auth.c
index 6b94c1b94..5f57d642a 100644
--- a/server/modules/authenticator/gssapi_auth.c
+++ b/server/modules/authenticator/gssapi_auth.c
@@ -15,7 +15,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include "gssapi_auth.h"
 
 typedef struct gssapi_instance
diff --git a/server/modules/authenticator/gssapi_backend_auth.c b/server/modules/authenticator/gssapi_backend_auth.c
index cd1a0a6e1..d047b80f8 100644
--- a/server/modules/authenticator/gssapi_backend_auth.c
+++ b/server/modules/authenticator/gssapi_backend_auth.c
@@ -15,7 +15,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include "gssapi_auth.h"
 
 /**
diff --git a/server/modules/authenticator/mysql_auth.c b/server/modules/authenticator/mysql_auth.c
index e92088f3c..90ac2aa7b 100644
--- a/server/modules/authenticator/mysql_auth.c
+++ b/server/modules/authenticator/mysql_auth.c
@@ -26,7 +26,7 @@
  */
 
 #include <mysql_auth.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
@@ -133,7 +133,7 @@ GWAUTHENTICATOR* GetModuleObject()
  *
  * @param dcb Request handler DCB connected to the client
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static int
 mysql_auth_authenticate(DCB *dcb)
@@ -233,7 +233,7 @@ mysql_auth_authenticate(DCB *dcb)
  * @param dcb Request handler DCB connected to the client
  * @param buffer Pointer to pointer to buffer containing data from client
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  * @see https://dev.mysql.com/doc/internals/en/client-server-protocol.html
  */
 static int
@@ -286,7 +286,7 @@ mysql_auth_set_protocol_data(DCB *dcb, GWBUF *buf)
  * @param client_auth_packet The data from the buffer received from client
  * @param client_auth_packet size An integer giving the size of the data
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  * @see https://dev.mysql.com/doc/internals/en/client-server-protocol.html
  */
 static int
@@ -581,7 +581,7 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
  * @param username      The current username in the authentication request
  * @param stage1_hash   The SHA1(candidate_password) decoded by this routine
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  *
  */
 int
@@ -707,7 +707,7 @@ gw_check_mysql_scramble_data(DCB *dcb,
  * @param database A string containing the database name
  * @param auth_ret The authentication status prior to calling this function.
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 int
 check_db_name_after_auth(DCB *dcb, char *database, int auth_ret)
@@ -764,7 +764,7 @@ check_db_name_after_auth(DCB *dcb, char *database, int auth_ret)
  * @param stage1_hash A password hash for authentication
  * @param database A string containing the name for the default database
  * @return Authentication status
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static int combined_auth_check(
     DCB             *dcb,
diff --git a/server/modules/authenticator/mysql_backend_auth.c b/server/modules/authenticator/mysql_backend_auth.c
index ff7b37c69..137692476 100644
--- a/server/modules/authenticator/mysql_backend_auth.c
+++ b/server/modules/authenticator/mysql_backend_auth.c
@@ -30,7 +30,7 @@
  */
 
 #include <maxscale/gw_authenticator.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
 
diff --git a/server/modules/filter/cache/cache_storage_api.h b/server/modules/filter/cache/cache_storage_api.h
index 320e25f00..3755d58ec 100644
--- a/server/modules/filter/cache/cache_storage_api.h
+++ b/server/modules/filter/cache/cache_storage_api.h
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <maxscale/buffer.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/skygw_debug.h>
 
 EXTERN_C_BLOCK_BEGIN
diff --git a/server/modules/filter/cache/rules.c b/server/modules/filter/cache/rules.c
index e66ae84c1..8e5c0179a 100644
--- a/server/modules/filter/cache/rules.c
+++ b/server/modules/filter/cache/rules.c
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/session.h>
 #include "cache.h"
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index 1510af39c..72b30917f 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -68,7 +68,7 @@
 #include <maxscale/modutil.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/skygw_types.h>
 #include <time.h>
diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c
index 71faca490..3642eb3f3 100644
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@@ -70,7 +70,7 @@
 #include <amqp_framing.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_ssl_socket.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/spinlock.h>
diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c
index 481cd0559..6ac656f49 100644
--- a/server/modules/filter/tee/tee.c
+++ b/server/modules/filter/tee/tee.c
@@ -56,7 +56,7 @@
 #include <maxscale/dcb.h>
 #include <sys/time.h>
 #include <maxscale/poll.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/alloc.h>
 #include <maxscale/listmanager.h>
diff --git a/server/modules/include/mysql_auth.h b/server/modules/include/mysql_auth.h
index bd02dea59..761fe530c 100644
--- a/server/modules/include/mysql_auth.h
+++ b/server/modules/include/mysql_auth.h
@@ -26,7 +26,7 @@
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
 #include <stdint.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 int gw_check_mysql_scramble_data(DCB *dcb,
                                  uint8_t *token,
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index 598f71330..30d763a12 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
index 10e76bf0d..53e240687 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@@ -49,7 +49,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/poll.h>
@@ -874,7 +874,7 @@ gw_read_finish_processing(DCB *dcb, GWBUF *read_buffer, uint8_t capabilities)
  *
  * @param dcb Request handler DCB connected to the client
  * @param auth_val The type of authentication failure
- * @note Authentication status codes are defined in mysql_client_server_protocol.h
+ * @note Authentication status codes are defined in maxscale/protocol/mysql.h
  */
 static void
 mysql_client_auth_error_handling(DCB *dcb, int auth_val)
diff --git a/server/modules/protocol/MySQL/mysql_common.c b/server/modules/protocol/MySQL/mysql_common.c
index 0e16ef927..08fb31b6e 100644
--- a/server/modules/protocol/MySQL/mysql_common.c
+++ b/server/modules/protocol/MySQL/mysql_common.c
@@ -44,7 +44,7 @@
 
 #include <maxscale/gw.h>
 #include <maxscale/utils.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
@@ -1273,7 +1273,7 @@ load_hashed_password(uint8_t *scramble, uint8_t *payload, uint8_t *passwd)
  * @param db_specified Whether the connection request specified a database
  * @param compress Whether compression is requested - NOT SUPPORTED
  * @return Bit mask (32 bits)
- * @note Capability bits are defined in mysql_client_server_protocol.h
+ * @note Capability bits are defined in maxscale/protocol/mysql.h
  */
 static uint32_t
 create_capabilities(MySQLProtocol *conn, bool db_specified, bool compress)
diff --git a/server/modules/routing/avro/avro.c b/server/modules/routing/avro/avro.c
index a4e5c5581..8c6cb1807 100644
--- a/server/modules/routing/avro/avro.c
+++ b/server/modules/routing/avro/avro.c
@@ -43,7 +43,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 
diff --git a/server/modules/routing/avro/avrorouter.h b/server/modules/routing/avro/avrorouter.h
index 83e018f7c..2180327cc 100644
--- a/server/modules/routing/avro/avrorouter.h
+++ b/server/modules/routing/avro/avrorouter.h
@@ -33,7 +33,7 @@
 #include <maxavro.h>
 #include <binlog_common.h>
 #include <sqlite3.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 /** SQLite3 version 3.7.14 introduced the new v2 close interface */
 #if SQLITE_VERSION_NUMBER < 3007014
diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index b8dc3d202..d4161b759 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -75,7 +75,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <uuid/uuid.h>
diff --git a/server/modules/routing/binlog/blr.h b/server/modules/routing/binlog/blr.h
index 7f423da0a..5f95f957a 100644
--- a/server/modules/routing/binlog/blr.h
+++ b/server/modules/routing/binlog/blr.h
@@ -44,7 +44,7 @@
 #include <maxscale/memlog.h>
 #include <maxscale/thread.h>
 #include <zlib.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 #define BINLOG_FNAMELEN         255
 #define BLR_PROTOCOL            "MySQLBackend"
diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index de9589879..c96c30a70 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -77,7 +77,7 @@
 #include <maxscale/thread.h>
 
 /* Temporary requirement for auth data */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 
 
diff --git a/server/modules/routing/binlog/test/testbinlog.c b/server/modules/routing/binlog/test/testbinlog.c
index 844dd2ba2..a9e3e2373 100644
--- a/server/modules/routing/binlog/test/testbinlog.c
+++ b/server/modules/routing/binlog/test/testbinlog.c
@@ -42,7 +42,7 @@
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <ini.h>
 #include <sys/stat.h>
 #include <getopt.h>
diff --git a/server/modules/routing/readconnroute/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c
index 04df306c4..c55a82fe8 100644
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@@ -47,7 +47,7 @@
  *					and necessary headers.
  * 17/07/2013	Massimiliano Pinto	Added clientReply routine:
  *					called by backend server to send data to client
- *					Included mysql_client_server_protocol.h
+ *					Included maxscale/protocol/mysql.h
  *					with macros and MySQL commands with MYSQL_ prefix
  *					avoiding any conflict with the standard ones
  *					in mysql.h
@@ -88,7 +88,7 @@
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 
 #include <maxscale/modutil.h>
 
diff --git a/server/modules/routing/readwritesplit/rwsplit_internal.h b/server/modules/routing/readwritesplit/rwsplit_internal.h
index c090914a9..b17048eae 100644
--- a/server/modules/routing/readwritesplit/rwsplit_internal.h
+++ b/server/modules/routing/readwritesplit/rwsplit_internal.h
@@ -30,7 +30,7 @@ extern "C" {
 /* This needs to be removed along with dependency on it - see the 
  * rwsplit_tmp_table_multi functions
  */
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
     
 /*
  * The following are implemented in rwsplit_mysql.c
diff --git a/server/modules/routing/readwritesplit/rwsplit_mysql.c b/server/modules/routing/readwritesplit/rwsplit_mysql.c
index d7ff0ca95..4397f9a11 100644
--- a/server/modules/routing/readwritesplit/rwsplit_mysql.c
+++ b/server/modules/routing/readwritesplit/rwsplit_mysql.c
@@ -29,12 +29,12 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
 
 #if defined(SS_DEBUG)
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #endif
 
 #define RWSPLIT_TRACE_MSG_LEN 1000
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index 895dd0388..3ed3ba191 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -28,7 +28,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include <pcre.h>
diff --git a/server/modules/routing/schemarouter/schemarouter.h b/server/modules/routing/schemarouter/schemarouter.h
index 914d11960..17a30729d 100644
--- a/server/modules/routing/schemarouter/schemarouter.h
+++ b/server/modules/routing/schemarouter/schemarouter.h
@@ -29,7 +29,7 @@
 
 #include <maxscale/dcb.h>
 #include <maxscale/hashtable.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <pcre2.h>
 /**
  * Bitmask values for the router session's initialization. These values are used
diff --git a/server/modules/routing/schemarouter/sharding_common.h b/server/modules/routing/schemarouter/sharding_common.h
index 0952f6a30..f4fb06307 100644
--- a/server/modules/routing/schemarouter/sharding_common.h
+++ b/server/modules/routing/schemarouter/sharding_common.h
@@ -18,7 +18,7 @@
 #include <poll.h>
 #include <maxscale/buffer.h>
 #include <maxscale/modutil.h>
-#include <mysql_client_server_protocol.h>
+#include <maxscale/protocol/mysql.h>
 #include <maxscale/hashtable.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>