diff --git a/include/maxscale/gw.h b/include/maxscale/gw.h
deleted file mode 100644
index 3bcd8763f..000000000
--- a/include/maxscale/gw.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-#ifndef _MAXSCALE_GW_HG
-#define _MAXSCALE_GW_HG
-/*
- * Copyright (c) 2016 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl.
- *
- * Change Date: 2019-07-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-
-#include <maxscale/cdefs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <pwd.h>
-#include <sys/types.h>
-#include <sys/epoll.h>
-#include <signal.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdbool.h>
-#include <maxscale/gwdirs.h>
-
-MXS_BEGIN_DECLS
-
-MXS_END_DECLS
-
-#endif
diff --git a/include/maxscale/protocol/mysql.h b/include/maxscale/protocol/mysql.h
index 7a1c0af06..254478e21 100644
--- a/include/maxscale/protocol/mysql.h
+++ b/include/maxscale/protocol/mysql.h
@@ -63,7 +63,6 @@
 #include <maxscale/version.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/utils.h>
-#include <maxscale/gw.h>
 #include <mysql.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/core/config.c b/server/core/config.c
index 4b9bbab2f..ce3fbf2f9 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -73,7 +73,6 @@
 #include <string.h>
 #include <sys/utsname.h>
 #include <maxscale/dbusers.h>
-#include <maxscale/gw.h>
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>
 #define PCRE2_CODE_UNIT_WIDTH 8
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 085eeb7f5..9d3c5cb87 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -78,7 +78,6 @@
 #include <maxscale/modules.h>
 #include <maxscale/router.h>
 #include <errno.h>
-#include <maxscale/gw.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
 #include <maxscale/log_manager.h>
@@ -86,6 +85,8 @@
 #include <maxscale/listener.h>
 #include <maxscale/hk_heartbeat.h>
 #include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
diff --git a/server/core/gateway.c b/server/core/gateway.c
index 64688565f..107e68635 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -48,10 +48,10 @@
 #include <ftw.h>
 #include <string.h>
 #include <strings.h>
-#include <maxscale/gw.h>
 #include <unistd.h>
 #include <time.h>
 #include <getopt.h>
+#include <pwd.h>
 #include <maxscale/service.h>
 #include <maxscale/server.h>
 #include <maxscale/dcb.h>
@@ -86,6 +86,7 @@
 #include <sys/file.h>
 #include <maxscale/statistics.h>
 #include <maxscale/alloc.h>
+#include <maxscale/gwdirs.h>
 
 #define STRING_BUFFER_SIZE 1024
 #define PIDFD_CLOSED -1
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index c995ef085..1c7e241bc 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -42,7 +42,6 @@
 #include <curl/curl.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <maxscale/gw.h>
 #include <maxscale/gwdirs.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/poll.c b/server/core/poll.c
index c32661f68..e6abc9856 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -25,7 +25,6 @@
 #include <maxscale/atomic.h>
 #include <maxscale/gwbitmask.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gw.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/config.h>
 #include <mysql.h>
diff --git a/server/core/secrets.c b/server/core/secrets.c
index 30570044d..b197ff1e0 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -20,8 +20,6 @@
 #include <maxscale/random_jkiss.h>
 #include <maxscale/alloc.h>
 
-#include <maxscale/gw.h>
-
 /**
  * Generate a random printable character
  *
diff --git a/server/core/service.c b/server/core/service.c
index 643011a31..c6d7b871d 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -60,7 +60,6 @@
 #include <sys/types.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/resultset.h>
-#include <maxscale/gw.h>
 #include <maxscale/gwdirs.h>
 #include <math.h>
 #include <maxscale/version.h>
diff --git a/server/modules/authenticator/cdc_plain_auth.c b/server/modules/authenticator/cdc_plain_auth.c
index 541d22441..1b19d9b20 100644
--- a/server/modules/authenticator/cdc_plain_auth.c
+++ b/server/modules/authenticator/cdc_plain_auth.c
@@ -26,11 +26,12 @@
  */
 
 #include <maxscale/gw_authenticator.h>
+#include <sys/stat.h>
 #include <cdc.h>
+#include <maxscale/alloc.h>
+#include <maxscale/gwdirs.h>
 #include <maxscale/modutil.h>
 #include <maxscale/users.h>
-#include <sys/stat.h>
-#include <maxscale/alloc.h>
 
 /* Allowed time interval (in seconds) after last update*/
 #define CDC_USERS_REFRESH_TIME 30
diff --git a/server/modules/authenticator/mysql_auth.c b/server/modules/authenticator/mysql_auth.c
index 90ac2aa7b..e4cc3ffba 100644
--- a/server/modules/authenticator/mysql_auth.c
+++ b/server/modules/authenticator/mysql_auth.c
@@ -32,7 +32,6 @@
 #include <maxscale/poll.h>
 #include <maxscale/dbusers.h>
 #include <maxscale/gwdirs.h>
-#include <maxscale/gw.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
 
diff --git a/server/modules/include/cdc.h b/server/modules/include/cdc.h
index 0785ccbd0..19a8ff477 100644
--- a/server/modules/include/cdc.h
+++ b/server/modules/include/cdc.h
@@ -37,7 +37,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/modules/protocol/CDC/cdc.c b/server/modules/protocol/CDC/cdc.c
index 43471caad..e4612780e 100644
--- a/server/modules/protocol/CDC/cdc.c
+++ b/server/modules/protocol/CDC/cdc.c
@@ -32,7 +32,6 @@
 
 #include <cdc.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/gw_protocol.h>
diff --git a/server/modules/protocol/HTTPD/httpd.c b/server/modules/protocol/HTTPD/httpd.c
index d3ae66ff9..fc8220ec1 100644
--- a/server/modules/protocol/HTTPD/httpd.c
+++ b/server/modules/protocol/HTTPD/httpd.c
@@ -33,9 +33,9 @@
  */
 
 #include "httpd.h"
+#include <ctype.h>
 #include <maxscale/alloc.h>
 #include <maxscale/gw_protocol.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/resultset.h>
diff --git a/server/modules/protocol/HTTPD/httpd.h b/server/modules/protocol/HTTPD/httpd.h
index 4131f3ccf..c8ded44c4 100644
--- a/server/modules/protocol/HTTPD/httpd.h
+++ b/server/modules/protocol/HTTPD/httpd.h
@@ -37,7 +37,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index c9ba4d89e..5cdf7e7eb 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -16,7 +16,6 @@
 #include <maxscale/modutil.h>
 #include <maxscale/utils.h>
 #include <netinet/tcp.h>
-#include <maxscale/gw.h>
 #include <mysqld_error.h>
 
 /*
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
index 519da671b..066179748 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@@ -52,7 +52,6 @@
 #include <mysql_auth.h>
 #include <maxscale/gw_ssl.h>
 #include <maxscale/poll.h>
-#include <maxscale/gw.h>
 #include <maxscale/modinfo.h>
 #include <sys/stat.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/protocol/MySQL/mysql_common.c b/server/modules/protocol/MySQL/mysql_common.c
index 7d6958571..9e3636579 100644
--- a/server/modules/protocol/MySQL/mysql_common.c
+++ b/server/modules/protocol/MySQL/mysql_common.c
@@ -42,7 +42,6 @@
  *
  */
 
-#include <maxscale/gw.h>
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/protocol/maxscaled/maxscaled.c b/server/modules/protocol/maxscaled/maxscaled.c
index d6758604c..d3a7a7eeb 100644
--- a/server/modules/protocol/maxscaled/maxscaled.c
+++ b/server/modules/protocol/maxscaled/maxscaled.c
@@ -21,14 +21,15 @@
 #include <maxscale/session.h>
 #include <sys/ioctl.h>
 #include <errno.h>
+#include <pwd.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
diff --git a/server/modules/protocol/telnetd/telnetd.c b/server/modules/protocol/telnetd/telnetd.c
index 95a3f96ea..df802bf8e 100644
--- a/server/modules/protocol/telnetd/telnetd.c
+++ b/server/modules/protocol/telnetd/telnetd.c
@@ -28,7 +28,6 @@
 #include <maxscale/router.h>
 #include <maxscale/poll.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gw.h>
 #include <telnetd.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/routing/avro/avrorouter.h b/server/modules/routing/avro/avrorouter.h
index 062e18450..1b9accbe9 100644
--- a/server/modules/routing/avro/avrorouter.h
+++ b/server/modules/routing/avro/avrorouter.h
@@ -22,7 +22,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <blr_constants.h>
-#include <maxscale/gw.h>
 #include <maxscale/dcb.h>
 #include <maxscale/service.h>
 #include <maxscale/spinlock.h>
diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index 6d542e9a1..5a978e925 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -78,7 +78,6 @@
 #include <sys/stat.h>
 #include <uuid/uuid.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 
 static char *version_str = "V2.1.0";
 
diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index b41583c24..b3fce8ec2 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -83,7 +83,6 @@
 #include <maxscale/version.h>
 #include <zlib.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gw.h>
 
 extern int load_mysql_users(SERV_LISTENER *listener);
 extern void blr_master_close(ROUTER_INSTANCE* router);