diff --git a/include/maxscale/dcb.h b/include/maxscale/dcb.h
index f1f867cdf..444014203 100644
--- a/include/maxscale/dcb.h
+++ b/include/maxscale/dcb.h
@@ -48,7 +48,7 @@
 #include <maxscale/cdefs.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/gw_authenticator.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/modinfo.h>
diff --git a/include/maxscale/gw_ssl.h b/include/maxscale/gw_ssl.h
index db6be67c1..b228f6aca 100644
--- a/include/maxscale/gw_ssl.h
+++ b/include/maxscale/gw_ssl.h
@@ -27,7 +27,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <openssl/crypto.h>
 #include <openssl/ssl.h>
 #include <openssl/err.h>
diff --git a/include/maxscale/listener.h b/include/maxscale/listener.h
index f40a7b310..267d8cff8 100644
--- a/include/maxscale/listener.h
+++ b/include/maxscale/listener.h
@@ -27,7 +27,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/hashtable.h>
 
diff --git a/include/maxscale/gw_protocol.h b/include/maxscale/protocol.h
similarity index 100%
rename from include/maxscale/gw_protocol.h
rename to include/maxscale/protocol.h
diff --git a/include/maxscale/service.h b/include/maxscale/service.h
index 855700df9..9ec330a23 100644
--- a/include/maxscale/service.h
+++ b/include/maxscale/service.h
@@ -40,7 +40,7 @@
 
 #include <maxscale/cdefs.h>
 #include <time.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/server.h>
diff --git a/server/core/listener.c b/server/core/listener.c
index 1d811290b..dd281223b 100644
--- a/server/core/listener.c
+++ b/server/core/listener.c
@@ -34,7 +34,7 @@
 #include <maxscale/listener.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/gw_ssl.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 #include <maxscale/users.h>
diff --git a/server/core/service.c b/server/core/service.c
index d682eafa3..e492ec5dd 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -48,7 +48,7 @@
 #include <math.h>
 #include <fcntl.h>
 #include <maxscale/session.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/listener.h>
 #include <maxscale/server.h>
 #include <maxscale/router.h>
diff --git a/server/modules/protocol/CDC/cdc.c b/server/modules/protocol/CDC/cdc.c
index d9d1ce518..89c153dd7 100644
--- a/server/modules/protocol/CDC/cdc.c
+++ b/server/modules/protocol/CDC/cdc.c
@@ -34,7 +34,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/poll.h>
 
diff --git a/server/modules/protocol/HTTPD/httpd.c b/server/modules/protocol/HTTPD/httpd.c
index 7882b3148..d8fbe2838 100644
--- a/server/modules/protocol/HTTPD/httpd.c
+++ b/server/modules/protocol/HTTPD/httpd.c
@@ -35,7 +35,7 @@
 #include "httpd.h"
 #include <ctype.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index bc8da0203..83da73ccd 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -19,7 +19,7 @@
 #include <mysqld_error.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <mysql_auth.h>
 
 /*
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
index 9d0796c59..1ab47f8cd 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@@ -45,7 +45,7 @@
  * 07/02/2016   Martin Brampton         Split off authentication and SSL.
  * 31/05/2016   Martin Brampton         Implement connection throttling
  */
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/protocol/maxscaled/maxscaled.c b/server/modules/protocol/maxscaled/maxscaled.c
index f3687497f..4132f2887 100644
--- a/server/modules/protocol/maxscaled/maxscaled.c
+++ b/server/modules/protocol/maxscaled/maxscaled.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <maxscale/service.h>
 #include <maxscale/session.h>
 #include <sys/ioctl.h>
diff --git a/server/modules/protocol/telnetd/telnetd.c b/server/modules/protocol/telnetd/telnetd.c
index 772b9ba8f..197a5b648 100644
--- a/server/modules/protocol/telnetd/telnetd.c
+++ b/server/modules/protocol/telnetd/telnetd.c
@@ -19,7 +19,7 @@
 #include <maxscale/buffer.h>
 #include <maxscale/service.h>
 #include <maxscale/session.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <sys/socket.h>
diff --git a/server/modules/protocol/testprotocol/testprotocol.c b/server/modules/protocol/testprotocol/testprotocol.c
index 5895692a7..e2e9c17f7 100644
--- a/server/modules/protocol/testprotocol/testprotocol.c
+++ b/server/modules/protocol/testprotocol/testprotocol.c
@@ -28,7 +28,7 @@
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gw_protocol.h>
+#include <maxscale/protocol.h>
 
 static int test_read(DCB* dcb){ return 1;}
 static int test_write(DCB *dcb, GWBUF* buf){ return 1;}