diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51562e7d..87f7e261f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ endif()
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/server/include)
 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/paths.h.in ${CMAKE_BINARY_DIR}/include/maxscale/paths.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)
@@ -305,7 +305,7 @@ if(PACKAGE)
 endif()
 
 # NOTE: If you make changes here, ensure they are compatible with the
-#       situation in gwdirs.h.in.
+#       situation in paths.h.in.
 if (NOT PACKAGE)
   install(DIRECTORY DESTINATION var/cache/maxscale)
   install(DIRECTORY DESTINATION var/log/maxscale)
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index 749aa2a57..256fcca24 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -11,7 +11,7 @@ set(MAXSCALE_VARDIR /var CACHE PATH "Data file path (usually /var/)")
 set(MAXSCALE_CONFDIR /etc CACHE PATH "Configuration file installation path (/etc/)")
 
 # Default values for directories and subpaths where files are searched. These
-# are used in `server/include/gwdirs.h.in`.
+# are used in `include/maxscale/paths.h.in`.
 set(DEFAULT_PID_SUBPATH "run/maxscale" CACHE PATH "Default PID file subpath")
 set(DEFAULT_LOG_SUBPATH "log/maxscale" CACHE PATH "Default log subpath")
 set(DEFAULT_DATA_SUBPATH "lib/maxscale" CACHE PATH "Default datadir subpath")
diff --git a/include/maxscale/gw_authenticator.h b/include/maxscale/authenticator.h
similarity index 100%
rename from include/maxscale/gw_authenticator.h
rename to include/maxscale/authenticator.h
diff --git a/include/maxscale/gwbitmask.h b/include/maxscale/bitmask.h
similarity index 100%
rename from include/maxscale/gwbitmask.h
rename to include/maxscale/bitmask.h
diff --git a/include/maxscale/config.h b/include/maxscale/config.h
index 798b1dae9..ce4449d79 100644
--- a/include/maxscale/config.h
+++ b/include/maxscale/config.h
@@ -32,7 +32,7 @@
 #include <limits.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/modinfo.h>
 
 MXS_BEGIN_DECLS
diff --git a/include/maxscale/dcb.h b/include/maxscale/dcb.h
index 973db409f..907786351 100644
--- a/include/maxscale/dcb.h
+++ b/include/maxscale/dcb.h
@@ -49,10 +49,10 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/buffer.h>
 #include <maxscale/protocol.h>
-#include <maxscale/gw_authenticator.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/authenticator.h>
+#include <maxscale/ssl.h>
 #include <maxscale/modinfo.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <netinet/in.h>
 
 MXS_BEGIN_DECLS
diff --git a/include/maxscale/listener.h b/include/maxscale/listener.h
index 8f386f71e..b1393e378 100644
--- a/include/maxscale/listener.h
+++ b/include/maxscale/listener.h
@@ -28,7 +28,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/protocol.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/hashtable.h>
 
 MXS_BEGIN_DECLS
diff --git a/include/maxscale/gwdirs.h.in b/include/maxscale/paths.h.in
similarity index 100%
rename from include/maxscale/gwdirs.h.in
rename to include/maxscale/paths.h.in
diff --git a/include/maxscale/poll.h b/include/maxscale/poll.h
index 7eb0aeb63..791472f97 100644
--- a/include/maxscale/poll.h
+++ b/include/maxscale/poll.h
@@ -27,7 +27,7 @@
 
 #include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/resultset.h>
 #include <sys/epoll.h>
 
diff --git a/include/maxscale/gw_ssl.h b/include/maxscale/ssl.h
similarity index 100%
rename from include/maxscale/gw_ssl.h
rename to include/maxscale/ssl.h
diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index 595ebbe74..788b71e27 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -64,7 +64,7 @@
 #define MYSQL_COM_INIT_DB     COM_INIT_DB
 #define MYSQL_COM_CHANGE_USER COM_CHANGE_USER
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/utils.h>
 
 #include <stdio.h>
diff --git a/query_classifier/test/canonical_tests/canonizer.c b/query_classifier/test/canonical_tests/canonizer.c
index ee69f2e96..ec65b505e 100644
--- a/query_classifier/test/canonical_tests/canonizer.c
+++ b/query_classifier/test/canonical_tests/canonizer.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/utils.h>
 
 int main(int argc, char** argv)
diff --git a/query_classifier/test/classify.c b/query_classifier/test/classify.c
index 351b51fdc..359eed71c 100644
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@@ -20,7 +20,7 @@
 #include <maxscale/buffer.h>
 #include <mysql.h>
 #include <unistd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 
 char* append(char* types, const char* type_name, size_t* lenp)
diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index 59a70194f..115f47af6 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -23,7 +23,7 @@
 #define MYSQL_COM_QUIT        COM_QUIT
 #define MYSQL_COM_INIT_DB     COM_INIT_DB
 #define MYSQL_COM_CHANGE_USER COM_CHANGE_USER
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
diff --git a/query_classifier/test/crash_qc_sqlite.c b/query_classifier/test/crash_qc_sqlite.c
index dff7cbd3d..d07d05e24 100644
--- a/query_classifier/test/crash_qc_sqlite.c
+++ b/query_classifier/test/crash_qc_sqlite.c
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <maxscale/buffer.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/query_classifier.h>
 
 #define MYSQL_HEADER_LEN 4
diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 14ac55ce3..5ef2e0c1e 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -20,7 +20,7 @@
 #include <maxscale/users.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <sys/stat.h>
 
 /**
diff --git a/server/core/authenticator.c b/server/core/authenticator.c
index 98b1cd65e..059889bc7 100644
--- a/server/core/authenticator.c
+++ b/server/core/authenticator.c
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modutil.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/config.c b/server/core/config.c
index db36e649b..a97396904 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -62,7 +62,7 @@
 #include <maxscale/pcre2.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/utils.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 
 #include "maxscale/config.h"
 #include "maxscale/filter.h"
diff --git a/server/core/config_runtime.c b/server/core/config_runtime.c
index 0897366fc..8007c544b 100644
--- a/server/core/config_runtime.c
+++ b/server/core/config_runtime.c
@@ -14,7 +14,7 @@
 #include <strings.h>
 #include <maxscale/atomic.h>
 #include <maxscale/config_runtime.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/spinlock.h>
 
 #include "maxscale/config.h"
diff --git a/server/core/gateway.cc b/server/core/gateway.cc
index d1c946a38..5f937d3f0 100644
--- a/server/core/gateway.cc
+++ b/server/core/gateway.cc
@@ -55,7 +55,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/maxscale.h>
diff --git a/server/core/gwbitmask.c b/server/core/gwbitmask.c
index bfa78d5eb..0daf26e9b 100644
--- a/server/core/gwbitmask.c
+++ b/server/core/gwbitmask.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/alloc.h>
 
 /**
diff --git a/server/core/gwdirs.c b/server/core/gwdirs.c
index 8a0576baf..a0a9a5fcc 100644
--- a/server/core/gwdirs.c
+++ b/server/core/gwdirs.c
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
 
diff --git a/server/core/listener.c b/server/core/listener.c
index 39e09a5f4..8edeafeb1 100644
--- a/server/core/listener.c
+++ b/server/core/listener.c
@@ -32,8 +32,8 @@
 #include <string.h>
 #include <fcntl.h>
 #include <maxscale/listener.h>
-#include <maxscale/gwdirs.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/paths.h>
+#include <maxscale/ssl.h>
 #include <maxscale/protocol.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index 0b3312c97..262e3dd11 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -41,7 +41,7 @@
 #include <curl/curl.h>
 #include <sys/utsname.h>
 #include <openssl/sha.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 
 #include "maxscale/modules.h"
diff --git a/server/core/maxkeys.c b/server/core/maxkeys.c
index 86c91d642..7dd6cde14 100644
--- a/server/core/maxkeys.c
+++ b/server/core/maxkeys.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <maxscale/secrets.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 
 struct option options[] =
 {
diff --git a/server/core/maxpasswd.c b/server/core/maxpasswd.c
index 6fc98198d..47ffe88ae 100644
--- a/server/core/maxpasswd.c
+++ b/server/core/maxpasswd.c
@@ -23,7 +23,7 @@
  * @endverbatim
  */
 #include <stdio.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/secrets.h>
 
diff --git a/server/core/monitor.c b/server/core/monitor.c
index 65f4ed517..72ef9f264 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -36,7 +36,7 @@
 #include <maxscale/alloc.h>
 #include <mysqld_error.h>
 #include <maxscale/externcmd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/mysql_utils.h>
 #include <maxscale/pcre2.h>
diff --git a/server/core/poll.c b/server/core/poll.c
index 3f8cd69ce..2fc4e8e67 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -23,7 +23,7 @@
 #include <maxscale/poll.h>
 #include <maxscale/dcb.h>
 #include <maxscale/atomic.h>
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/config.h>
diff --git a/server/core/secrets.c b/server/core/secrets.c
index 60cc244b5..a095b7438 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -16,7 +16,7 @@
 #include <maxscale/log_manager.h>
 #include <ctype.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/random_jkiss.h>
 #include <maxscale/alloc.h>
 
diff --git a/server/core/server.c b/server/core/server.c
index 0c713325b..33d35fb18 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -45,9 +45,9 @@
 #include <maxscale/dcb.h>
 #include <maxscale/poll.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 
 #include "maxscale/monitor.h"
 
diff --git a/server/core/service.c b/server/core/service.c
index 6b1959304..8857825ae 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -50,7 +50,7 @@
 #include <fcntl.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/listener.h>
 #include <maxscale/log_manager.h>
diff --git a/server/core/test/testadminusers.c b/server/core/test/testadminusers.c
index 6fe85266e..4922941c7 100644
--- a/server/core/test/testadminusers.c
+++ b/server/core/test/testadminusers.c
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/adminusers.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
diff --git a/server/core/test/testgwbitmask.c b/server/core/test/testgwbitmask.c
index 78bc51cbf..c1134cd67 100644
--- a/server/core/test/testgwbitmask.c
+++ b/server/core/test/testgwbitmask.c
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <maxscale/gwbitmask.h>
+#include <maxscale/bitmask.h>
 
 #include <maxscale/debug.h>
 
diff --git a/server/core/test/testmodulecmd.c b/server/core/test/testmodulecmd.c
index f0d7e9863..ae15b42cc 100644
--- a/server/core/test/testmodulecmd.c
+++ b/server/core/test/testmodulecmd.c
@@ -17,7 +17,7 @@
 
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include <maxscale/session.h>
 
diff --git a/server/core/test/testserver.c b/server/core/test/testserver.c
index c36c61b78..d005e45dd 100644
--- a/server/core/test/testserver.c
+++ b/server/core/test/testserver.c
@@ -36,7 +36,7 @@
 #include <maxscale/alloc.h>
 #include <maxscale/server.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 
 // This is pretty ugly but it's required to test internal functions
 #include "../config.c"
diff --git a/server/core/test/testservice.c b/server/core/test/testservice.c
index 77a2aae14..063295156 100644
--- a/server/core/test/testservice.c
+++ b/server/core/test/testservice.c
@@ -34,7 +34,7 @@
 #include <string.h>
 #include <maxscale/maxscale_test.h>
 #include "../maxscale/service.h"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 #include "test_utils.h"
 
diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
index 5cf62eaca..681547831 100644
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <cdc.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modutil.h>
 #include <maxscale/users.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/authenticator/HTTPAuth/http_auth.c b/server/modules/authenticator/HTTPAuth/http_auth.c
index a6a66618c..24fcb6839 100644
--- a/server/modules/authenticator/HTTPAuth/http_auth.c
+++ b/server/modules/authenticator/HTTPAuth/http_auth.c
@@ -26,7 +26,7 @@
 
 #define MXS_MODULE_NAME "HTTPAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
index 2ec54299f..e1e402549 100644
--- a/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
+++ b/server/modules/authenticator/MaxAdminAuth/max_admin_auth.c
@@ -28,7 +28,7 @@
 
 #define MXS_MODULE_NAME "MaxAdminAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
diff --git a/server/modules/authenticator/MySQLAuth/mysql_auth.c b/server/modules/authenticator/MySQLAuth/mysql_auth.c
index c6762b57b..d06d5643c 100644
--- a/server/modules/authenticator/MySQLAuth/mysql_auth.c
+++ b/server/modules/authenticator/MySQLAuth/mysql_auth.c
@@ -29,11 +29,11 @@
 
 #include <mysql_auth.h>
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/poll.h>
 #include "dbusers.h"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/secrets.h>
 #include <maxscale/utils.h>
 
diff --git a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
index 96b8acbc5..b1cef66a4 100644
--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
@@ -31,7 +31,7 @@
 
 #define MXS_MODULE_NAME "MySQLBackendAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
 #include <maxscale/utils.h>
diff --git a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
index e3d6d5058..08b9b100f 100644
--- a/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
+++ b/server/modules/authenticator/NullAuthAllow/null_auth_allow.c
@@ -29,7 +29,7 @@
 
 #define MXS_MODULE_NAME "NullAuthAllow"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
diff --git a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
index 9ad1dc6e7..5e36c45f9 100644
--- a/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
+++ b/server/modules/authenticator/NullAuthDeny/null_auth_deny.c
@@ -29,7 +29,7 @@
 
 #define MXS_MODULE_NAME "NullAuthDeny"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
diff --git a/server/modules/filter/cache/cache.cc b/server/modules/filter/cache/cache.cc
index 7d7ae5139..9bf1850ce 100644
--- a/server/modules/filter/cache/cache.cc
+++ b/server/modules/filter/cache/cache.cc
@@ -15,7 +15,7 @@
 #include "cache.hh"
 #include <new>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include "storagefactory.hh"
 #include "storage.hh"
 
diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc
index ef317d7b4..7b22e356e 100644
--- a/server/modules/filter/cache/cachefilter.cc
+++ b/server/modules/filter/cache/cachefilter.cc
@@ -14,7 +14,7 @@
 #define MXS_MODULE_NAME "cache"
 #include "cachefilter.hh"
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include "cachemt.hh"
 #include "cachept.hh"
diff --git a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
index 843350433..dd1ef15b1 100644
--- a/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
+++ b/server/modules/filter/cache/storage/storage_rocksdb/rocksdbstorage.cc
@@ -22,7 +22,7 @@
 #include <rocksdb/env.h>
 #include <rocksdb/statistics.h>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modutil.h>
 #include <maxscale/query_classifier.h>
 #include "rocksdbinternals.hh"
diff --git a/server/modules/filter/cache/storagefactory.cc b/server/modules/filter/cache/storagefactory.cc
index 2336339cf..9dba56ce0 100644
--- a/server/modules/filter/cache/storagefactory.cc
+++ b/server/modules/filter/cache/storagefactory.cc
@@ -17,7 +17,7 @@
 #include <sys/param.h>
 #include <new>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include "cachefilter.h"
 #include "lrustoragest.hh"
diff --git a/server/modules/filter/cache/test/testrules.cc b/server/modules/filter/cache/test/testrules.cc
index c73157a79..c1757a514 100644
--- a/server/modules/filter/cache/test/testrules.cc
+++ b/server/modules/filter/cache/test/testrules.cc
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include "rules.h"
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
diff --git a/server/modules/filter/cache/test/teststorage.cc b/server/modules/filter/cache/test/teststorage.cc
index d6cffc687..18b7f96e9 100644
--- a/server/modules/filter/cache/test/teststorage.cc
+++ b/server/modules/filter/cache/test/teststorage.cc
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <iostream>
 #include <maxscale/alloc.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
 #include "storagefactory.hh"
diff --git a/server/modules/filter/masking/maskingfilter.cc b/server/modules/filter/masking/maskingfilter.cc
index ae1a5c9f6..d74b3df7e 100644
--- a/server/modules/filter/masking/maskingfilter.cc
+++ b/server/modules/filter/masking/maskingfilter.cc
@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "masking"
 #include "maskingfilter.hh"
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/modulecmd.h>
 #include "maskingrules.hh"
 
diff --git a/server/modules/filter/maxrows/maxrows.c b/server/modules/filter/maxrows/maxrows.c
index 4a63cca2a..58b169156 100644
--- a/server/modules/filter/maxrows/maxrows.c
+++ b/server/modules/filter/maxrows/maxrows.c
@@ -33,7 +33,7 @@
 #define MXS_MODULE_NAME "maxrows"
 #include <maxscale/alloc.h>
 #include <maxscale/filter.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modinfo.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
index ae7ff1256..6e4acc368 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
+++ b/server/modules/protocol/MySQL/MySQLClient/mysql_client.c
@@ -53,14 +53,14 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <mysql_auth.h>
-#include <maxscale/gw_ssl.h>
+#include <maxscale/ssl.h>
 #include <maxscale/poll.h>
 #include <maxscale/modinfo.h>
 #include <sys/stat.h>
 #include <maxscale/modutil.h>
 #include <netinet/tcp.h>
 #include <maxscale/query_classifier.h>
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/session.h>
 
 static int process_init(void);
diff --git a/server/modules/routing/avrorouter/avro.c b/server/modules/routing/avrorouter/avro.c
index ae3c984eb..320cfd439 100644
--- a/server/modules/routing/avrorouter/avro.c
+++ b/server/modules/routing/avrorouter/avro.c
@@ -52,7 +52,7 @@
 #include <avro/errors.h>
 #include <maxscale/alloc.h>
 #include <maxscale/modulecmd.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 
 #ifndef BINLOG_NAMEFMT
 #define BINLOG_NAMEFMT      "%s.%06d"
diff --git a/server/modules/routing/binlogrouter/blr_file.c b/server/modules/routing/binlogrouter/blr_file.c
index 2fb2c4067..4e8f2231a 100644
--- a/server/modules/routing/binlogrouter/blr_file.c
+++ b/server/modules/routing/binlogrouter/blr_file.c
@@ -67,7 +67,7 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
 #include <inttypes.h>
diff --git a/server/modules/routing/binlogrouter/test/testbinlog.c b/server/modules/routing/binlogrouter/test/testbinlog.c
index c9b936ae0..74d6d30b5 100644
--- a/server/modules/routing/binlogrouter/test/testbinlog.c
+++ b/server/modules/routing/binlogrouter/test/testbinlog.c
@@ -38,7 +38,7 @@
 #include <maxscale/housekeeper.h>
 #include <time.h>
 #include <maxscale/log_manager.h>
-#include <maxscale/gwdirs.h>
+#include <maxscale/paths.h>
 #include <maxscale/alloc.h>
 
 #include <maxscale/protocol/mysql.h>